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

fixes bug #9105 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71568 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2017-07-19 21:43:31 +00:00
parent 4b191e7645
commit b20a2c6ec0
8 changed files with 287 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
View File

@ -7,7 +7,6 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.commons.collections.set.CompositeSet.SetMutator;
import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang.math.NumberUtils;
import org.hibernate.Criteria; import org.hibernate.Criteria;
import org.hibernate.Query; import org.hibernate.Query;

1
src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java
View File

@ -4,7 +4,6 @@
*/ */
package com.rjconsultores.ventaboletos.dao.hibernate; package com.rjconsultores.ventaboletos.dao.hibernate;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

11
src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java
View File

@ -83,6 +83,9 @@ public class CajaDetPago implements java.io.Serializable {
@OneToOne(mappedBy = "cajaDetPago") @OneToOne(mappedBy = "cajaDetPago")
private CajaTarjeta cajaTarjetas; private CajaTarjeta cajaTarjetas;
@Column(name = "SERIESUBSERIE", length = 30)
private String serieSubSerie;
public Long getCajaDetPagoId() { public Long getCajaDetPagoId() {
return cajaDetPagoId; return cajaDetPagoId;
} }
@ -235,4 +238,12 @@ public class CajaDetPago implements java.io.Serializable {
this.cajaTarjetas = cajaTarjetas; this.cajaTarjetas = cajaTarjetas;
} }
public String getSerieSubSerie() {
return serieSubSerie;
}
public void setSerieSubSerie(String serieSubSerie) {
this.serieSubSerie = serieSubSerie;
}
} }

214
src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java
View File

@ -27,99 +27,103 @@ import javax.persistence.TemporalType;
@SequenceGenerator(name = "CUPON_SECRETARIA_SEQ", sequenceName = "CUPON_SECRETARIA_SEQ", allocationSize = 1) @SequenceGenerator(name = "CUPON_SECRETARIA_SEQ", sequenceName = "CUPON_SECRETARIA_SEQ", allocationSize = 1)
public class CuponSecretaria implements Serializable { public class CuponSecretaria implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "CUPON_SECRETARIA_SEQ") @GeneratedValue(strategy = GenerationType.AUTO, generator = "CUPON_SECRETARIA_SEQ")
@Column(name = "CUPONSECRETARIA_ID") @Column(name = "CUPONSECRETARIA_ID")
private Integer cuponsecretariaId; private Integer cuponsecretariaId;
@Column(name = "NUMFOLIOINICIO") @Column(name = "NUMFOLIOINICIO")
private Long numfolioinicio; private Long numfolioinicio;
@Column(name = "NUMFOLIOFINAL") @Column(name = "NUMFOLIOFINAL")
private Long numfoliofinal; private Long numfoliofinal;
@Column(name = "ACTIVO") @Column(name = "ACTIVO")
private Boolean activo; private Boolean activo;
@Column(name = "FECMODIF") @Column(name = "FECMODIF")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date fecmodif; private Date fecmodif;
@Column(name = "USUARIO_ID") @Column(name = "USUARIO_ID")
private Integer usuarioId; private Integer usuarioId;
@Column(name = "PORCDESCUENTO") @Column(name = "PORCDESCUENTO")
private BigDecimal porcdescuento; private BigDecimal porcdescuento;
@Column(name = "PORCDESCUENTOOUTROS") @Column(name = "PORCDESCUENTOOUTROS")
private BigDecimal porcdescuentooutros; private BigDecimal porcdescuentooutros;
@Column(name = "PORCDESCUENTOPEDAGIO") @Column(name = "PORCDESCUENTOPEDAGIO")
private BigDecimal porcdescuentopedagio; private BigDecimal porcdescuentopedagio;
@Column(name = "PORCDESCUENTOSEGURO") @Column(name = "PORCDESCUENTOSEGURO")
private BigDecimal porcdescuentoseguro; private BigDecimal porcdescuentoseguro;
@Column(name = "PORCDESCUENTOTAXAEMBARQUE") @Column(name = "PORCDESCUENTOTAXAEMBARQUE")
private BigDecimal porcdescuentotaxaembarque; private BigDecimal porcdescuentotaxaembarque;
@Column(name = "SERIE")
public CuponSecretaria() { private String serie;
} @Column(name = "SUBSERIE")
private String subserie;
public CuponSecretaria(Integer cuponsecretariaId) { public CuponSecretaria() {
this.cuponsecretariaId = cuponsecretariaId; }
}
public Integer getCuponsecretariaId() { public CuponSecretaria(Integer cuponsecretariaId) {
return cuponsecretariaId; this.cuponsecretariaId = cuponsecretariaId;
} }
public void setCuponsecretariaId(Integer cuponsecretariaId) { public Integer getCuponsecretariaId() {
this.cuponsecretariaId = cuponsecretariaId; return cuponsecretariaId;
} }
public Long getNumfolioinicio() { public void setCuponsecretariaId(Integer cuponsecretariaId) {
return numfolioinicio; this.cuponsecretariaId = cuponsecretariaId;
} }
public void setNumfolioinicio(Long numfolioinicio) { public Long getNumfolioinicio() {
this.numfolioinicio = numfolioinicio; return numfolioinicio;
} }
public Long getNumfoliofinal() { public void setNumfolioinicio(Long numfolioinicio) {
return numfoliofinal; this.numfolioinicio = numfolioinicio;
} }
public void setNumfoliofinal(Long numfoliofinal) { public Long getNumfoliofinal() {
this.numfoliofinal = numfoliofinal; return numfoliofinal;
} }
public Boolean getActivo() { public void setNumfoliofinal(Long numfoliofinal) {
return activo; this.numfoliofinal = numfoliofinal;
} }
public void setActivo(Boolean activo) { public Boolean getActivo() {
this.activo = activo; return activo;
} }
public Date getFecmodif() { public void setActivo(Boolean activo) {
return fecmodif; this.activo = activo;
} }
public void setFecmodif(Date fecmodif) { public Date getFecmodif() {
this.fecmodif = fecmodif; return fecmodif;
} }
public Integer getUsuarioId() { public void setFecmodif(Date fecmodif) {
return usuarioId; this.fecmodif = fecmodif;
} }
public void setUsuarioId(Integer usuarioId) { public Integer getUsuarioId() {
this.usuarioId = usuarioId; return usuarioId;
} }
public BigDecimal getPorcdescuento() { public void setUsuarioId(Integer usuarioId) {
return porcdescuento; this.usuarioId = usuarioId;
} }
public void setPorcdescuento(BigDecimal porcdescuento) { public BigDecimal getPorcdescuento() {
this.porcdescuento = porcdescuento; return porcdescuento;
} }
public BigDecimal getPorcdescuentooutros() { public void setPorcdescuento(BigDecimal porcdescuento) {
this.porcdescuento = porcdescuento;
}
public BigDecimal getPorcdescuentooutros() {
return porcdescuentooutros; return porcdescuentooutros;
} }
@ -151,28 +155,44 @@ public class CuponSecretaria implements Serializable {
this.porcdescuentotaxaembarque = porcdescuentotaxaembarque; 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 @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (cuponsecretariaId != null ? cuponsecretariaId.hashCode() : 0); hash += (cuponsecretariaId != null ? cuponsecretariaId.hashCode() : 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are not set
if (!(object instanceof CuponSecretaria)) { if (!(object instanceof CuponSecretaria)) {
return false; return false;
} }
CuponSecretaria other = (CuponSecretaria) object; CuponSecretaria other = (CuponSecretaria) object;
if ((this.cuponsecretariaId == null && other.cuponsecretariaId != null) || (this.cuponsecretariaId != null && !this.cuponsecretariaId.equals(other.cuponsecretariaId))) { if ((this.cuponsecretariaId == null && other.cuponsecretariaId != null) || (this.cuponsecretariaId != null && !this.cuponsecretariaId.equals(other.cuponsecretariaId))) {
return false; return false;
} }
return true; return true;
} }
@Override @Override
public String toString() { public String toString() {
return "com.rjconsultores.ventaboletos.entidad.CuponSecretaria[cuponsecretariaId=" + cuponsecretariaId + "]"; return "com.rjconsultores.ventaboletos.entidad.CuponSecretaria[cuponsecretariaId=" + cuponsecretariaId + "]";
} }
} }

262
src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
View File

@ -38,47 +38,49 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@SequenceGenerator(name = "SECRETARIA_SEQ", sequenceName = "SECRETARIA_SEQ", allocationSize = 1) @SequenceGenerator(name = "SECRETARIA_SEQ", sequenceName = "SECRETARIA_SEQ", allocationSize = 1)
public class Secretaria implements Serializable { public class Secretaria implements Serializable {
public static final Short PRECIO_TOTAL = 1; public static final Short PRECIO_TOTAL = 1;
public static final Short PRECIO_MENOS_DESCUENTO = 2; public static final Short PRECIO_MENOS_DESCUENTO = 2;
public static final Short DESCUENTO_COBRAR = 3; public static final Short DESCUENTO_COBRAR = 3;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_SEQ") @GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_SEQ")
@Column(name = "SECRETARIA_ID") @Column(name = "SECRETARIA_ID")
private Integer secretariaId; private Integer secretariaId;
@Column(name = "DESCSECRETARIA") @Column(name = "DESCSECRETARIA")
private String descsecretaria; private String descsecretaria;
@Column(name = "ACTIVO") @Column(name = "ACTIVO")
private Boolean activo; private Boolean activo;
@Column(name = "FECMODIF") @Column(name = "FECMODIF")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date fecmodif; private Date fecmodif;
@Column(name = "USUARIO_ID") @Column(name = "USUARIO_ID")
private Integer usuarioId; private Integer usuarioId;
@Column(name = "CVESECRETARIA") @Column(name = "CVESECRETARIA")
private String cvesecretaria; private String cvesecretaria;
@Column(name = "VALIDAFOLIO") @Column(name = "VALIDAFOLIO")
private Boolean validafolio; private Boolean validafolio;
@Column(name = "IMPRIMEPRECIO") @Column(name = "INDSERIESUBSERIE")
private Short imprimeprecio; private Boolean validaSerieSubSerie;
@OneToMany(cascade = CascadeType.ALL) @Column(name = "IMPRIMEPRECIO")
@JoinColumn(name = "SECRETARIA_ID") private Short imprimeprecio;
private List<CuponSecretaria> lsCuponSecretaria; @OneToMany(cascade = CascadeType.ALL)
@OneToMany(cascade = CascadeType.ALL, mappedBy = "secretaria") @JoinColumn(name = "SECRETARIA_ID")
private List<CuponSecretaria> lsCuponSecretaria;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "secretaria")
@LazyCollection(LazyCollectionOption.FALSE) @LazyCollection(LazyCollectionOption.FALSE)
private List<SecretariaEmpresa> empresas = new ArrayList<SecretariaEmpresa>(); private List<SecretariaEmpresa> empresas = new ArrayList<SecretariaEmpresa>();
public Secretaria() {
}
public SecretariaEmpresa addEmpresa(Empresa e) { public Secretaria() {
SecretariaEmpresa se = new SecretariaEmpresa(); }
se.setEmpresa(e);
se.setSecretaria(this); public SecretariaEmpresa addEmpresa(Empresa e) {
se.setActivo(Boolean.TRUE); SecretariaEmpresa se = new SecretariaEmpresa();
se.setFecmodif(Calendar.getInstance().getTime()); se.setEmpresa(e);
se.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); se.setSecretaria(this);
se.setActivo(Boolean.TRUE);
se.setFecmodif(Calendar.getInstance().getTime());
se.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
this.empresas.add(se); this.empresas.add(se);
return se; return se;
} }
@ -95,92 +97,91 @@ public class Secretaria implements Serializable {
} }
} }
} }
public Secretaria(Integer secretariaId) {
this.secretariaId = secretariaId;
}
public Integer getSecretariaId() { public Secretaria(Integer secretariaId) {
return secretariaId; this.secretariaId = secretariaId;
} }
public void setSecretariaId(Integer secretariaId) { public Integer getSecretariaId() {
this.secretariaId = secretariaId; return secretariaId;
} }
public String getDescsecretaria() { public void setSecretariaId(Integer secretariaId) {
return descsecretaria; this.secretariaId = secretariaId;
} }
public void setDescsecretaria(String descsecretaria) { public String getDescsecretaria() {
this.descsecretaria = descsecretaria; return descsecretaria;
} }
public Boolean getActivo() { public void setDescsecretaria(String descsecretaria) {
return activo; this.descsecretaria = descsecretaria;
} }
public void setActivo(Boolean activo) { public Boolean getActivo() {
this.activo = activo; return activo;
} }
public Date getFecmodif() { public void setActivo(Boolean activo) {
return fecmodif; this.activo = activo;
} }
public void setFecmodif(Date fecmodif) { public Date getFecmodif() {
this.fecmodif = fecmodif; return fecmodif;
} }
public Integer getUsuarioId() { public void setFecmodif(Date fecmodif) {
return usuarioId; this.fecmodif = fecmodif;
} }
public void setUsuarioId(Integer usuarioId) { public Integer getUsuarioId() {
this.usuarioId = usuarioId; return usuarioId;
} }
public String getCvesecretaria() { public void setUsuarioId(Integer usuarioId) {
return cvesecretaria; this.usuarioId = usuarioId;
} }
public void setCvesecretaria(String cvesecretaria) { public String getCvesecretaria() {
this.cvesecretaria = cvesecretaria; return cvesecretaria;
} }
public Boolean getValidafolio() { public void setCvesecretaria(String cvesecretaria) {
return validafolio; this.cvesecretaria = cvesecretaria;
} }
public void setValidafolio(Boolean validafolio) { public Boolean getValidafolio() {
this.validafolio = validafolio; return validafolio;
} }
public Short getImprimeprecio() { public void setValidafolio(Boolean validafolio) {
return imprimeprecio; this.validafolio = validafolio;
} }
public void setImprimeprecio(Short imprimeprecio) { public Short getImprimeprecio() {
this.imprimeprecio = imprimeprecio; return imprimeprecio;
} }
public List<CuponSecretaria> getLsCuponSecretaria() { public void setImprimeprecio(Short imprimeprecio) {
this.imprimeprecio = imprimeprecio;
}
List<CuponSecretaria> tmp = new ArrayList<CuponSecretaria>(); public List<CuponSecretaria> getLsCuponSecretaria() {
if (lsCuponSecretaria != null) {
for (CuponSecretaria cp : this.lsCuponSecretaria) {
if (cp.getActivo()) {
tmp.add(cp);
}
}
}
return tmp; List<CuponSecretaria> tmp = new ArrayList<CuponSecretaria>();
} if (lsCuponSecretaria != null) {
for (CuponSecretaria cp : this.lsCuponSecretaria) {
if (cp.getActivo()) {
tmp.add(cp);
}
}
}
return tmp;
public List<SecretariaEmpresa> getEmpresas() { }
List<SecretariaEmpresa> lista = new ArrayList<SecretariaEmpresa>();
public List<SecretariaEmpresa> getEmpresas() {
List<SecretariaEmpresa> lista = new ArrayList<SecretariaEmpresa>();
for (SecretariaEmpresa eb : empresas) { for (SecretariaEmpresa eb : empresas) {
if (eb.getActivo()) { if (eb.getActivo()) {
lista.add(eb); lista.add(eb);
@ -194,32 +195,39 @@ public class Secretaria implements Serializable {
} }
public void setLsCuponSecretaria(List<CuponSecretaria> lsCuponSecretaria) { public void setLsCuponSecretaria(List<CuponSecretaria> lsCuponSecretaria) {
this.lsCuponSecretaria = lsCuponSecretaria; this.lsCuponSecretaria = lsCuponSecretaria;
} }
public Boolean getValidaSerieSubSerie() {
return validaSerieSubSerie;
}
public void setValidaSerieSubSerie(Boolean validaSerieSubSerie) {
this.validaSerieSubSerie = validaSerieSubSerie;
}
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (secretariaId != null ? secretariaId.hashCode() : 0); hash += (secretariaId != null ? secretariaId.hashCode() : 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are not set
if (!(object instanceof Secretaria)) { if (!(object instanceof Secretaria)) {
return false; return false;
} }
Secretaria other = (Secretaria) object; Secretaria other = (Secretaria) object;
if ((this.secretariaId == null && other.secretariaId != null) || (this.secretariaId != null && !this.secretariaId.equals(other.secretariaId))) { if ((this.secretariaId == null && other.secretariaId != null) || (this.secretariaId != null && !this.secretariaId.equals(other.secretariaId))) {
return false; return false;
} }
return true; return true;
} }
@Override @Override
public String toString() { public String toString() {
return "com.rjconsultores.ventaboletos.entidad.Secretaria[secretariaId=" + secretariaId + "]"; return "com.rjconsultores.ventaboletos.entidad.Secretaria[secretariaId=" + secretariaId + "]";
} }
} }

2
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; 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.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

4
src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java
View File

@ -235,4 +235,8 @@ public class ApplicationProperties {
return property.equals("1"); return property.equals("1");
} }
public boolean isSerieSubserieSecretaria() {
String property = p.getProperty("validaSerieSubserieSecretaria", "0");
return property.equals("1");
}
} }

44
src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java
View File

@ -1,15 +1,9 @@
package com.rjconsultores.ventaboletos.utilerias.seguridad; package com.rjconsultores.ventaboletos.utilerias.seguridad;
import java.io.File;
import java.net.URL;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Locale;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.zkoss.util.resource.LabelLocator;
import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.exception.BusinessException; import com.rjconsultores.ventaboletos.exception.BusinessException;
public class ContrasenaUtileria { public class ContrasenaUtileria {
@ -52,24 +46,24 @@ public class ContrasenaUtileria {
throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES}); throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES});
} }
} }
public static void main(String args[]){ // public static void main(String args[]){
System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar")); // System.out.println(ContrasenaUtileria.encriptarContrasena("gleimar"));
//
LabelLocator teste = new LabelLocator() { // LabelLocator teste = new LabelLocator() {
//
@Override // @Override
public URL locate(Locale arg0) throws Exception { // 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(); // 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); // Labels.register(teste);
try { // try {
ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@"); // ContrasenaUtileria.validarContrasenaCompleja("asdfasdf1@@");
System.out.println("ok"); // System.out.println("ok");
} catch (BusinessException e) { // } catch (BusinessException e) {
System.out.println(e.getLocalizedMessage()); // System.out.println(e.getLocalizedMessage());
} // }
//
} // }
} }