diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java index 6a5ac46ac..7a0ee2d3f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java @@ -7,7 +7,6 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.Date; import java.util.List; -import org.apache.commons.collections.set.CompositeSet.SetMutator; import org.apache.commons.lang.math.NumberUtils; import org.hibernate.Criteria; import org.hibernate.Query; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java index 2dff54a51..431ecd274 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java @@ -4,7 +4,6 @@ */ package com.rjconsultores.ventaboletos.dao.hibernate; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java b/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java index 5e74b6d6a..86acd5271 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java +++ b/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java @@ -83,6 +83,9 @@ public class CajaDetPago implements java.io.Serializable { @OneToOne(mappedBy = "cajaDetPago") private CajaTarjeta cajaTarjetas; + @Column(name = "SERIESUBSERIE", length = 30) + private String serieSubSerie; + public Long getCajaDetPagoId() { return cajaDetPagoId; } @@ -235,4 +238,12 @@ public class CajaDetPago implements java.io.Serializable { this.cajaTarjetas = cajaTarjetas; } + public String getSerieSubSerie() { + return serieSubSerie; + } + + public void setSerieSubSerie(String serieSubSerie) { + this.serieSubSerie = serieSubSerie; + } + } diff --git a/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java b/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java index f9c3ce06d..e1b417d78 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java +++ b/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java @@ -27,99 +27,103 @@ import javax.persistence.TemporalType; @SequenceGenerator(name = "CUPON_SECRETARIA_SEQ", sequenceName = "CUPON_SECRETARIA_SEQ", allocationSize = 1) public class CuponSecretaria implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CUPON_SECRETARIA_SEQ") - @Column(name = "CUPONSECRETARIA_ID") - private Integer cuponsecretariaId; - @Column(name = "NUMFOLIOINICIO") - private Long numfolioinicio; - @Column(name = "NUMFOLIOFINAL") - private Long numfoliofinal; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "PORCDESCUENTO") - private BigDecimal porcdescuento; + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CUPON_SECRETARIA_SEQ") + @Column(name = "CUPONSECRETARIA_ID") + private Integer cuponsecretariaId; + @Column(name = "NUMFOLIOINICIO") + private Long numfolioinicio; + @Column(name = "NUMFOLIOFINAL") + private Long numfoliofinal; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "PORCDESCUENTO") + private BigDecimal porcdescuento; - @Column(name = "PORCDESCUENTOOUTROS") - private BigDecimal porcdescuentooutros; - @Column(name = "PORCDESCUENTOPEDAGIO") - private BigDecimal porcdescuentopedagio; - @Column(name = "PORCDESCUENTOSEGURO") - private BigDecimal porcdescuentoseguro; - @Column(name = "PORCDESCUENTOTAXAEMBARQUE") - private BigDecimal porcdescuentotaxaembarque; - - public CuponSecretaria() { - } + @Column(name = "PORCDESCUENTOOUTROS") + private BigDecimal porcdescuentooutros; + @Column(name = "PORCDESCUENTOPEDAGIO") + private BigDecimal porcdescuentopedagio; + @Column(name = "PORCDESCUENTOSEGURO") + private BigDecimal porcdescuentoseguro; + @Column(name = "PORCDESCUENTOTAXAEMBARQUE") + private BigDecimal porcdescuentotaxaembarque; + @Column(name = "SERIE") + private String serie; + @Column(name = "SUBSERIE") + private String subserie; - public CuponSecretaria(Integer cuponsecretariaId) { - this.cuponsecretariaId = cuponsecretariaId; - } + public CuponSecretaria() { + } - public Integer getCuponsecretariaId() { - return cuponsecretariaId; - } + public CuponSecretaria(Integer cuponsecretariaId) { + this.cuponsecretariaId = cuponsecretariaId; + } - public void setCuponsecretariaId(Integer cuponsecretariaId) { - this.cuponsecretariaId = cuponsecretariaId; - } + public Integer getCuponsecretariaId() { + return cuponsecretariaId; + } - public Long getNumfolioinicio() { - return numfolioinicio; - } + public void setCuponsecretariaId(Integer cuponsecretariaId) { + this.cuponsecretariaId = cuponsecretariaId; + } - public void setNumfolioinicio(Long numfolioinicio) { - this.numfolioinicio = numfolioinicio; - } + public Long getNumfolioinicio() { + return numfolioinicio; + } - public Long getNumfoliofinal() { - return numfoliofinal; - } + public void setNumfolioinicio(Long numfolioinicio) { + this.numfolioinicio = numfolioinicio; + } - public void setNumfoliofinal(Long numfoliofinal) { - this.numfoliofinal = numfoliofinal; - } + public Long getNumfoliofinal() { + return numfoliofinal; + } - public Boolean getActivo() { - return activo; - } + public void setNumfoliofinal(Long numfoliofinal) { + this.numfoliofinal = numfoliofinal; + } - public void setActivo(Boolean activo) { - this.activo = activo; - } + public Boolean getActivo() { + return activo; + } - public Date getFecmodif() { - return fecmodif; - } + public void setActivo(Boolean activo) { + this.activo = activo; + } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } + public Date getFecmodif() { + return fecmodif; + } - public Integer getUsuarioId() { - return usuarioId; - } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } + public Integer getUsuarioId() { + return usuarioId; + } - public BigDecimal getPorcdescuento() { - return porcdescuento; - } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } - public void setPorcdescuento(BigDecimal porcdescuento) { - this.porcdescuento = porcdescuento; - } + public BigDecimal getPorcdescuento() { + return porcdescuento; + } - public BigDecimal getPorcdescuentooutros() { + public void setPorcdescuento(BigDecimal porcdescuento) { + this.porcdescuento = porcdescuento; + } + + public BigDecimal getPorcdescuentooutros() { return porcdescuentooutros; } @@ -151,28 +155,44 @@ public class CuponSecretaria implements Serializable { this.porcdescuentotaxaembarque = porcdescuentotaxaembarque; } + public String getSubserie() { + return subserie; + } + + public void setSubserie(String subserie) { + this.subserie = subserie; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + @Override - public int hashCode() { - int hash = 0; - hash += (cuponsecretariaId != null ? cuponsecretariaId.hashCode() : 0); - return hash; - } + public int hashCode() { + int hash = 0; + hash += (cuponsecretariaId != null ? cuponsecretariaId.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 CuponSecretaria)) { - return false; - } - CuponSecretaria other = (CuponSecretaria) object; - if ((this.cuponsecretariaId == null && other.cuponsecretariaId != null) || (this.cuponsecretariaId != null && !this.cuponsecretariaId.equals(other.cuponsecretariaId))) { - return false; - } - return true; - } + @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 CuponSecretaria)) { + return false; + } + CuponSecretaria other = (CuponSecretaria) object; + if ((this.cuponsecretariaId == null && other.cuponsecretariaId != null) || (this.cuponsecretariaId != null && !this.cuponsecretariaId.equals(other.cuponsecretariaId))) { + return false; + } + return true; + } - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.CuponSecretaria[cuponsecretariaId=" + cuponsecretariaId + "]"; - } + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.CuponSecretaria[cuponsecretariaId=" + cuponsecretariaId + "]"; + } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java index 3f155fa85..2d716bdca 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java @@ -38,47 +38,49 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @SequenceGenerator(name = "SECRETARIA_SEQ", sequenceName = "SECRETARIA_SEQ", allocationSize = 1) public class Secretaria implements Serializable { - public static final Short PRECIO_TOTAL = 1; - public static final Short PRECIO_MENOS_DESCUENTO = 2; - public static final Short DESCUENTO_COBRAR = 3; - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_SEQ") - @Column(name = "SECRETARIA_ID") - private Integer secretariaId; - @Column(name = "DESCSECRETARIA") - private String descsecretaria; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "CVESECRETARIA") - private String cvesecretaria; - @Column(name = "VALIDAFOLIO") - private Boolean validafolio; - @Column(name = "IMPRIMEPRECIO") - private Short imprimeprecio; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "SECRETARIA_ID") - private List lsCuponSecretaria; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "secretaria") + public static final Short PRECIO_TOTAL = 1; + public static final Short PRECIO_MENOS_DESCUENTO = 2; + public static final Short DESCUENTO_COBRAR = 3; + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_SEQ") + @Column(name = "SECRETARIA_ID") + private Integer secretariaId; + @Column(name = "DESCSECRETARIA") + private String descsecretaria; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "CVESECRETARIA") + private String cvesecretaria; + @Column(name = "VALIDAFOLIO") + private Boolean validafolio; + @Column(name = "INDSERIESUBSERIE") + private Boolean validaSerieSubSerie; + @Column(name = "IMPRIMEPRECIO") + private Short imprimeprecio; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "SECRETARIA_ID") + private List lsCuponSecretaria; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "secretaria") @LazyCollection(LazyCollectionOption.FALSE) private List empresas = new ArrayList(); - - public Secretaria() { - } - public SecretariaEmpresa addEmpresa(Empresa e) { - SecretariaEmpresa se = new SecretariaEmpresa(); - se.setEmpresa(e); - se.setSecretaria(this); - se.setActivo(Boolean.TRUE); - se.setFecmodif(Calendar.getInstance().getTime()); - se.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + public Secretaria() { + } + + public SecretariaEmpresa addEmpresa(Empresa e) { + SecretariaEmpresa se = new SecretariaEmpresa(); + se.setEmpresa(e); + se.setSecretaria(this); + se.setActivo(Boolean.TRUE); + se.setFecmodif(Calendar.getInstance().getTime()); + se.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); this.empresas.add(se); return se; } @@ -95,92 +97,91 @@ public class Secretaria implements Serializable { } } } - - public Secretaria(Integer secretariaId) { - this.secretariaId = secretariaId; - } - public Integer getSecretariaId() { - return secretariaId; - } + public Secretaria(Integer secretariaId) { + this.secretariaId = secretariaId; + } - public void setSecretariaId(Integer secretariaId) { - this.secretariaId = secretariaId; - } + public Integer getSecretariaId() { + return secretariaId; + } - public String getDescsecretaria() { - return descsecretaria; - } + public void setSecretariaId(Integer secretariaId) { + this.secretariaId = secretariaId; + } - public void setDescsecretaria(String descsecretaria) { - this.descsecretaria = descsecretaria; - } + public String getDescsecretaria() { + return descsecretaria; + } - public Boolean getActivo() { - return activo; - } + public void setDescsecretaria(String descsecretaria) { + this.descsecretaria = descsecretaria; + } - public void setActivo(Boolean activo) { - this.activo = activo; - } + public Boolean getActivo() { + return activo; + } - public Date getFecmodif() { - return fecmodif; - } + public void setActivo(Boolean activo) { + this.activo = activo; + } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } + public Date getFecmodif() { + return fecmodif; + } - public Integer getUsuarioId() { - return usuarioId; - } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } + public Integer getUsuarioId() { + return usuarioId; + } - public String getCvesecretaria() { - return cvesecretaria; - } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } - public void setCvesecretaria(String cvesecretaria) { - this.cvesecretaria = cvesecretaria; - } + public String getCvesecretaria() { + return cvesecretaria; + } - public Boolean getValidafolio() { - return validafolio; - } + public void setCvesecretaria(String cvesecretaria) { + this.cvesecretaria = cvesecretaria; + } - public void setValidafolio(Boolean validafolio) { - this.validafolio = validafolio; - } + public Boolean getValidafolio() { + return validafolio; + } - public Short getImprimeprecio() { - return imprimeprecio; - } + public void setValidafolio(Boolean validafolio) { + this.validafolio = validafolio; + } - public void setImprimeprecio(Short imprimeprecio) { - this.imprimeprecio = imprimeprecio; - } + public Short getImprimeprecio() { + return imprimeprecio; + } - public List getLsCuponSecretaria() { + public void setImprimeprecio(Short imprimeprecio) { + this.imprimeprecio = imprimeprecio; + } - List tmp = new ArrayList(); - if (lsCuponSecretaria != null) { - for (CuponSecretaria cp : this.lsCuponSecretaria) { - if (cp.getActivo()) { - tmp.add(cp); - } - } - } + public List getLsCuponSecretaria() { - return tmp; - } + List tmp = new ArrayList(); + if (lsCuponSecretaria != null) { + for (CuponSecretaria cp : this.lsCuponSecretaria) { + if (cp.getActivo()) { + tmp.add(cp); + } + } + } - - public List getEmpresas() { - List lista = new ArrayList(); + return tmp; + } + + public List getEmpresas() { + List lista = new ArrayList(); for (SecretariaEmpresa eb : empresas) { if (eb.getActivo()) { lista.add(eb); @@ -194,32 +195,39 @@ public class Secretaria implements Serializable { } public void setLsCuponSecretaria(List lsCuponSecretaria) { - this.lsCuponSecretaria = lsCuponSecretaria; - } + this.lsCuponSecretaria = lsCuponSecretaria; + } + public Boolean getValidaSerieSubSerie() { + return validaSerieSubSerie; + } + + public void setValidaSerieSubSerie(Boolean validaSerieSubSerie) { + this.validaSerieSubSerie = validaSerieSubSerie; + } @Override - public int hashCode() { - int hash = 0; - hash += (secretariaId != null ? secretariaId.hashCode() : 0); - return hash; - } + public int hashCode() { + int hash = 0; + hash += (secretariaId != null ? secretariaId.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 Secretaria)) { - return false; - } - Secretaria other = (Secretaria) object; - if ((this.secretariaId == null && other.secretariaId != null) || (this.secretariaId != null && !this.secretariaId.equals(other.secretariaId))) { - return false; - } - return true; - } + @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 Secretaria)) { + return false; + } + Secretaria other = (Secretaria) object; + if ((this.secretariaId == null && other.secretariaId != null) || (this.secretariaId != null && !this.secretariaId.equals(other.secretariaId))) { + return false; + } + return true; + } - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.Secretaria[secretariaId=" + secretariaId + "]"; - } + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.Secretaria[secretariaId=" + secretariaId + "]"; + } } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java index 859ea8dd5..7842914cc 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java index b64880b93..26eeeea61 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java @@ -235,4 +235,8 @@ public class ApplicationProperties { return property.equals("1"); } + public boolean isSerieSubserieSecretaria() { + String property = p.getProperty("validaSerieSubserieSecretaria", "0"); + return property.equals("1"); + } } diff --git a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java b/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java index d4eb39d26..0f8efc513 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java @@ -1,15 +1,9 @@ package com.rjconsultores.ventaboletos.utilerias.seguridad; -import java.io.File; -import java.net.URL; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Locale; import java.util.regex.Pattern; -import org.zkoss.util.resource.LabelLocator; -import org.zkoss.util.resource.Labels; - import com.rjconsultores.ventaboletos.exception.BusinessException; public class ContrasenaUtileria { @@ -52,24 +46,24 @@ public class ContrasenaUtileria { throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES}); } } - public static void main(String args[]){ - System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar")); - - LabelLocator teste = new LabelLocator() { - - @Override - public URL locate(Locale arg0) throws Exception { - return new File("E:/scia_ventaboletos_transpais_senda/sco/AdmVenta/Web/trunk/ventaboletos/web/WEB-INF/i3-label_pt_BR.label").toURI().toURL(); - } - }; - Labels.register(teste); - try { - ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@"); - System.out.println("ok"); - } catch (BusinessException e) { - System.out.println(e.getLocalizedMessage()); - } - - } +// public static void main(String args[]){ +// System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar")); +// +// LabelLocator teste = new LabelLocator() { +// +// @Override +// public URL locate(Locale arg0) throws Exception { +// return new File("E:/scia_ventaboletos_transpais_senda/sco/AdmVenta/Web/trunk/ventaboletos/web/WEB-INF/i3-label_pt_BR.label").toURI().toURL(); +// } +// }; +// Labels.register(teste); +// try { +// ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@"); +// System.out.println("ok"); +// } catch (BusinessException e) { +// System.out.println(e.getLocalizedMessage()); +// } +// +// } }