fixes bug #AL-4634

master
valdevir 2024-07-16 11:20:03 -03:00
parent 3959f92672
commit 079f837108
2 changed files with 423 additions and 412 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.79.0</version> <version>1.80.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

View File

@ -1,411 +1,422 @@
/* /*
* To change this template, choose Tools | Templates * To change this template, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
package com.rjconsultores.ventaboletos.entidad; package com.rjconsultores.ventaboletos.entidad;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType; import javax.persistence.FetchType;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Transient; import javax.persistence.Transient;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import br.com.rjconsultores.auditador.annotations.NaoAuditar; import br.com.rjconsultores.auditador.annotations.NaoAuditar;
import br.com.rjconsultores.auditador.interfaces.Auditavel; import br.com.rjconsultores.auditador.interfaces.Auditavel;
/** /**
* *
* @author Administrador * @author Administrador
*/ */
@Entity @Entity
@SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1) @SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1)
@Table(name = "PARADA") @Table(name = "PARADA")
public class Parada implements Serializable, Auditavel<Parada> { public class Parada implements Serializable, Auditavel<Parada> {
public static Integer ID_PARADA_TODOS = -1; public static Integer ID_PARADA_TODOS = -1;
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 = "PARADA_SEQ") @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_SEQ")
@Column(name = "PARADA_ID") @Column(name = "PARADA_ID")
private Integer paradaId; private Integer paradaId;
@Basic(optional = false) @Basic(optional = false)
@Column(name = "DESCPARADA") @Column(name = "DESCPARADA")
private String descparada; private String descparada;
@Column(name = "CVEPARADA") @Column(name = "CVEPARADA")
private String cveparada; private String cveparada;
@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;
@OneToOne @OneToOne
@JoinColumn(name = "CIUDAD_ID") @JoinColumn(name = "CIUDAD_ID")
private Ciudad ciudad; private Ciudad ciudad;
@OneToOne @OneToOne
@JoinColumn(name = "TIPOPARADA_ID") @JoinColumn(name = "TIPOPARADA_ID")
private TipoParada tipoParada; private TipoParada tipoParada;
@OneToMany(mappedBy = "origem") @OneToMany(mappedBy = "origem")
private List<Corrida> corridaList; private List<Corrida> corridaList;
@OneToMany(mappedBy = "destino") @OneToMany(mappedBy = "destino")
private List<Corrida> corridaList1; private List<Corrida> corridaList1;
@OneToMany(mappedBy = "paradaOrigem") @OneToMany(mappedBy = "paradaOrigem")
private List<ReservacionMercado> reservacionMercadoList; private List<ReservacionMercado> reservacionMercadoList;
@OneToMany(mappedBy = "paradaDestino") @OneToMany(mappedBy = "paradaDestino")
private List<ReservacionMercado> reservacionMercadoList1; private List<ReservacionMercado> reservacionMercadoList1;
@OneToMany(mappedBy = "destino") @OneToMany(mappedBy = "destino")
private List<CategoriaMercado> categoriaMercadoDestinoList; private List<CategoriaMercado> categoriaMercadoDestinoList;
@OneToMany(mappedBy = "origem") @OneToMany(mappedBy = "origem")
private List<CategoriaMercado> categoriaMercadoOrigemList; private List<CategoriaMercado> categoriaMercadoOrigemList;
@OneToOne @OneToOne
@JoinColumn(name = "NODO_ID") @JoinColumn(name = "NODO_ID")
private Nodo nodo; private Nodo nodo;
@OneToMany(mappedBy = "origem") @OneToMany(mappedBy = "origem")
private List<Tramo> tramoOrigemList; private List<Tramo> tramoOrigemList;
@OneToMany(mappedBy = "destino") @OneToMany(mappedBy = "destino")
private List<Tramo> tramoDestinoList; private List<Tramo> tramoDestinoList;
@Column(name = "CODANTT") @Column(name = "CODANTT")
private Integer codantt; private Integer codantt;
@Column(name = "CODANTTAUX") @Column(name = "CODANTTAUX")
private Integer codanttaux; private Integer codanttaux;
@Column(name = "DESCPROCON") @Column(name = "DESCPROCON")
private String descProcon; private String descProcon;
@Column(name="INDVENDETOTEM") @Column(name="INDVENDETOTEM")
private Boolean indVendeTotem; private Boolean indVendeTotem;
@Column(name="INDVISIBLEINTERNET") @Column(name="INDVISIBLEINTERNET")
private Boolean indVisibleInternet; private Boolean indVisibleInternet;
@OneToOne @OneToOne
@JoinColumn(name = "AGRUPAMENTOPARADA_ID") @JoinColumn(name = "AGRUPAMENTOPARADA_ID")
private AgrupamentoParada agrupamentoParada; private AgrupamentoParada agrupamentoParada;
@ManyToOne @ManyToOne
@JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID") @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID")
private RegionMetropolitana regionMetropolitana; private RegionMetropolitana regionMetropolitana;
@OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL) @OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL)
@Fetch(value = FetchMode.SUBSELECT) @Fetch(value = FetchMode.SUBSELECT)
private List<ParadaCodOrgaoConcedente> codigosOrgaosConcedentes = new ArrayList<ParadaCodOrgaoConcedente>(); private List<ParadaCodOrgaoConcedente> codigosOrgaosConcedentes = new ArrayList<ParadaCodOrgaoConcedente>();
@Column(name="INDINTEGRACAOW2I") @Column(name="INDINTEGRACAOW2I")
private Boolean indIntegracaoW2i; private Boolean indIntegracaoW2i;
@Transient @Column(name="CODSIGMA")
@NaoAuditar private String codSigma;
private Parada paradaClone;
@Transient
@Transient @NaoAuditar
@NaoAuditar private Parada paradaClone;
Boolean isParadaConexaoRutaExcluida;
@Transient
@NaoAuditar
public Boolean getIsParadaConexaoRutaExcluida() { Boolean isParadaConexaoRutaExcluida;
return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida;
}
public Boolean getIsParadaConexaoRutaExcluida() {
public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) { return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida;
this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida; }
}
public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) {
public Parada() { this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida;
super(); }
}
public Parada() {
public Parada(Integer paradaId) { super();
this(); }
this.paradaId = paradaId; public Parada(Integer paradaId) {
} this();
public Parada(Integer paradaId, String cveparada, String descparada) { this.paradaId = paradaId;
this(paradaId); }
this.cveparada = cveparada;
this.descparada = descparada; public Parada(Integer paradaId, String cveparada, String descparada) {
} this(paradaId);
this.cveparada = cveparada;
public List<CategoriaMercado> getCategoriaMercadoDestinoList() { this.descparada = descparada;
return categoriaMercadoDestinoList; }
}
public List<CategoriaMercado> getCategoriaMercadoDestinoList() {
public void setCategoriaMercadoDestinoList(List<CategoriaMercado> categoriaMercadoDestinoList) { return categoriaMercadoDestinoList;
this.categoriaMercadoDestinoList = categoriaMercadoDestinoList; }
}
public void setCategoriaMercadoDestinoList(List<CategoriaMercado> categoriaMercadoDestinoList) {
public List<CategoriaMercado> getCategoriaMercadoOrigemList() { this.categoriaMercadoDestinoList = categoriaMercadoDestinoList;
return categoriaMercadoOrigemList; }
}
public List<CategoriaMercado> getCategoriaMercadoOrigemList() {
public void setCategoriaMercadoOrigemList(List<CategoriaMercado> categoriaMercadoOrigemList) { return categoriaMercadoOrigemList;
this.categoriaMercadoOrigemList = categoriaMercadoOrigemList; }
}
public void setCategoriaMercadoOrigemList(List<CategoriaMercado> categoriaMercadoOrigemList) {
public String getDescparada() { this.categoriaMercadoOrigemList = categoriaMercadoOrigemList;
return descparada; }
}
public String getDescparada() {
public void setDescparada(String descparada) { return descparada;
this.descparada = descparada; }
}
public void setDescparada(String descparada) {
public Integer getParadaId() { this.descparada = descparada;
return paradaId; }
}
public Integer getParadaId() {
public void setParadaId(Integer paradaId) { return paradaId;
this.paradaId = paradaId; }
}
public void setParadaId(Integer paradaId) {
public List<ReservacionMercado> getReservacionMercadoList() { this.paradaId = paradaId;
return reservacionMercadoList; }
}
public List<ReservacionMercado> getReservacionMercadoList() {
public void setReservacionMercadoList(List<ReservacionMercado> reservacionMercadoList) { return reservacionMercadoList;
this.reservacionMercadoList = reservacionMercadoList; }
}
public void setReservacionMercadoList(List<ReservacionMercado> reservacionMercadoList) {
public List<ReservacionMercado> getReservacionMercadoList1() { this.reservacionMercadoList = reservacionMercadoList;
return reservacionMercadoList1; }
}
public List<ReservacionMercado> getReservacionMercadoList1() {
public void setReservacionMercadoList1(List<ReservacionMercado> reservacionMercadoList1) { return reservacionMercadoList1;
this.reservacionMercadoList1 = reservacionMercadoList1; }
}
public void setReservacionMercadoList1(List<ReservacionMercado> reservacionMercadoList1) {
public String getCveparada() { this.reservacionMercadoList1 = reservacionMercadoList1;
return cveparada; }
}
public String getCveparada() {
public void setCveparada(String cveparada) { return cveparada;
this.cveparada = cveparada; }
}
public void setCveparada(String cveparada) {
public Boolean getActivo() { this.cveparada = cveparada;
return activo; }
}
public Boolean getActivo() {
public void setActivo(Boolean activo) { return activo;
this.activo = activo; }
}
public void setActivo(Boolean activo) {
public Date getFecmodif() { this.activo = activo;
return fecmodif; }
}
public Date getFecmodif() {
public void setFecmodif(Date fecmodif) { return fecmodif;
this.fecmodif = fecmodif; }
}
public void setFecmodif(Date fecmodif) {
public Integer getUsuarioId() { this.fecmodif = fecmodif;
return usuarioId; }
}
public Integer getUsuarioId() {
public void setUsuarioId(Integer usuarioId) { return usuarioId;
this.usuarioId = usuarioId; }
}
public void setUsuarioId(Integer usuarioId) {
public List<Corrida> getCorridaList() { this.usuarioId = usuarioId;
return corridaList; }
}
public List<Corrida> getCorridaList() {
public void setCorridaList(List<Corrida> corridaList) { return corridaList;
this.corridaList = corridaList; }
}
public void setCorridaList(List<Corrida> corridaList) {
public List<Corrida> getCorridaList1() { this.corridaList = corridaList;
return corridaList1; }
}
public List<Corrida> getCorridaList1() {
public void setCorridaList1(List<Corrida> corridaList1) { return corridaList1;
this.corridaList1 = corridaList1; }
}
public void setCorridaList1(List<Corrida> corridaList1) {
public List<Tramo> getTramoDestinoList() { this.corridaList1 = corridaList1;
return tramoDestinoList; }
}
public List<Tramo> getTramoDestinoList() {
public void setTramoDestinoList(List<Tramo> tramoDestinoList) { return tramoDestinoList;
this.tramoDestinoList = tramoDestinoList; }
}
public void setTramoDestinoList(List<Tramo> tramoDestinoList) {
public List<Tramo> getTramoOrigemList() { this.tramoDestinoList = tramoDestinoList;
return tramoOrigemList; }
}
public List<Tramo> getTramoOrigemList() {
public void setTramoOrigemList(List<Tramo> tramoOrigemList) { return tramoOrigemList;
this.tramoOrigemList = tramoOrigemList; }
}
public void setTramoOrigemList(List<Tramo> tramoOrigemList) {
public Ciudad getCiudad() { this.tramoOrigemList = tramoOrigemList;
return ciudad; }
}
public Ciudad getCiudad() {
public void setCiudad(Ciudad ciudad) { return ciudad;
this.ciudad = ciudad; }
}
public void setCiudad(Ciudad ciudad) {
public TipoParada getTipoParada() { this.ciudad = ciudad;
return tipoParada; }
}
public TipoParada getTipoParada() {
public void setTipoParada(TipoParada tipoParada) { return tipoParada;
this.tipoParada = tipoParada; }
}
public void setTipoParada(TipoParada tipoParada) {
public Nodo getNodo() { this.tipoParada = tipoParada;
return nodo; }
}
public Nodo getNodo() {
public void setNodo(Nodo nodo) { return nodo;
this.nodo = nodo; }
}
public void setNodo(Nodo nodo) {
public Integer getCodantt() { this.nodo = nodo;
return codantt; }
}
public Integer getCodantt() {
public void setCodantt(Integer codantt) { return codantt;
this.codantt = codantt; }
}
public void setCodantt(Integer codantt) {
@Override this.codantt = codantt;
public int hashCode() { }
int hash = 0;
hash += (getParadaId() != null ? getParadaId().hashCode() : 0); @Override
return hash; public int hashCode() {
} int hash = 0;
hash += (getParadaId() != null ? getParadaId().hashCode() : 0);
@Override return hash;
public boolean equals(Object object) { }
if (!(object instanceof Parada)) {
return false; @Override
} public boolean equals(Object object) {
Parada other = (Parada) object; if (!(object instanceof Parada)) {
if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) { return false;
return false; }
} Parada other = (Parada) object;
return true; if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) {
} return false;
}
@Override return true;
public String toString() { }
return getDescparada();
} @Override
public String toString() {
public String toStringCve() { return getDescparada();
return getCveparada(); }
}
public String toStringCve() {
public RegionMetropolitana getRegionMetropolitana() { return getCveparada();
return regionMetropolitana; }
}
public RegionMetropolitana getRegionMetropolitana() {
public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) { return regionMetropolitana;
this.regionMetropolitana = regionMetropolitana; }
}
public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) {
public List<ParadaCodOrgaoConcedente> getCodigosOrgaosConcedentes() { this.regionMetropolitana = regionMetropolitana;
return codigosOrgaosConcedentes; }
}
public List<ParadaCodOrgaoConcedente> getCodigosOrgaosConcedentes() {
public void setCodigosOrgaosConcedentes(List<ParadaCodOrgaoConcedente> codigosOrgaosConcedentes) { return codigosOrgaosConcedentes;
this.codigosOrgaosConcedentes = codigosOrgaosConcedentes; }
}
public void setCodigosOrgaosConcedentes(List<ParadaCodOrgaoConcedente> codigosOrgaosConcedentes) {
public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { this.codigosOrgaosConcedentes = codigosOrgaosConcedentes;
this.codigosOrgaosConcedentes.add(codigo); }
}
public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { this.codigosOrgaosConcedentes.add(codigo);
this.codigosOrgaosConcedentes.remove(codigo); }
}
public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
public String getDescProcon() { this.codigosOrgaosConcedentes.remove(codigo);
return descProcon; }
}
public String getDescProcon() {
public void setDescProcon(String descProcon) { return descProcon;
this.descProcon = descProcon; }
}
public void setDescProcon(String descProcon) {
public Boolean getIndVendeTotem() { this.descProcon = descProcon;
return indVendeTotem; }
}
public Boolean getIndVendeTotem() {
public void setIndVendeTotem(Boolean indVendeTotem) { return indVendeTotem;
this.indVendeTotem = indVendeTotem; }
}
public void setIndVendeTotem(Boolean indVendeTotem) {
public Integer getCodanttaux() { this.indVendeTotem = indVendeTotem;
return codanttaux; }
}
public Integer getCodanttaux() {
public void setCodanttaux(Integer codanttaux) { return codanttaux;
this.codanttaux = codanttaux; }
}
public void setCodanttaux(Integer codanttaux) {
public Boolean getIndVisibleInternet() { this.codanttaux = codanttaux;
return indVisibleInternet; }
}
public Boolean getIndVisibleInternet() {
public void setIndVisibleInternet(Boolean indVisibleInternet) { return indVisibleInternet;
this.indVisibleInternet = indVisibleInternet; }
}
public void setIndVisibleInternet(Boolean indVisibleInternet) {
public Boolean getIndIntegracaoW2i() { this.indVisibleInternet = indVisibleInternet;
return indIntegracaoW2i == null ? false : indIntegracaoW2i; }
}
public Boolean getIndIntegracaoW2i() {
public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) { return indIntegracaoW2i == null ? false : indIntegracaoW2i;
this.indIntegracaoW2i = indIntegracaoW2i; }
}
public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) {
public AgrupamentoParada getAgrupamentoParada() { this.indIntegracaoW2i = indIntegracaoW2i;
return agrupamentoParada; }
}
public AgrupamentoParada getAgrupamentoParada() {
public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) { return agrupamentoParada;
this.agrupamentoParada = agrupamentoParada; }
}
public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) {
@Override this.agrupamentoParada = agrupamentoParada;
public void clonar() throws CloneNotSupportedException { }
paradaClone = new Parada();
paradaClone = (Parada) this.clone(); public String getCodSigma() {
} return codSigma;
}
@Override
public Parada getCloneObject() throws CloneNotSupportedException { public void setCodSigma(String codSigma) {
return paradaClone; this.codSigma = codSigma;
} }
@Override @Override
public String getTextoInclusaoExclusao() { public void clonar() throws CloneNotSupportedException {
return String.format("EsquemaAsientoID [%s]", getParadaId()); paradaClone = new Parada();
} paradaClone = (Parada) this.clone();
}
@Override
public Object clone() throws CloneNotSupportedException { @Override
return super.clone(); 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();
}
}