From c408294b7e797a96670118f2f265f20ecc6cfbc6 Mon Sep 17 00:00:00 2001 From: leonardo Date: Sat, 13 May 2017 18:18:51 +0000 Subject: [PATCH] fixes bug #9033 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68827 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/ParadaCodOrgaoConcedenteDAO.java | 7 ++ .../ParadaCodOrgaoConcedenteHibernateDAO.java | 20 +++++ .../ventaboletos/entidad/Parada.java | 24 ++++++ .../entidad/ParadaCodOrgaoConcedente.java | 75 +++++++++++++++++++ .../ParadaCodOrgaoConcedenteService.java | 7 ++ .../ParadaCodOrgaoConcedenteServiceImpl.java | 47 ++++++++++++ 6 files changed, 180 insertions(+) create mode 100644 src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java create mode 100644 src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java create mode 100644 src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java create mode 100644 src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java create mode 100644 src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java b/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java new file mode 100644 index 000000000..cbef316e5 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java @@ -0,0 +1,7 @@ +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; + +public interface ParadaCodOrgaoConcedenteDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java new file mode 100644 index 000000000..05ad4c9da --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java @@ -0,0 +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); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Parada.java b/src/com/rjconsultores/ventaboletos/entidad/Parada.java index f3d59f022..1fecb4383 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Parada.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Parada.java @@ -11,6 +11,7 @@ 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; @@ -23,6 +24,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.hibernate.annotations.CascadeType; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; + /** * * @author Administrador @@ -83,6 +88,10 @@ public class Parada implements Serializable { @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; + public Parada() { } @@ -266,4 +275,19 @@ public class Parada implements Serializable { 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); + } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java b/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java new file mode 100644 index 000000000..8e099e44c --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java @@ -0,0 +1,75 @@ +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.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 { + @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/service/ParadaCodOrgaoConcedenteService.java b/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java new file mode 100644 index 000000000..a7c0cb0d9 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java @@ -0,0 +1,7 @@ +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; + +public interface ParadaCodOrgaoConcedenteService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java new file mode 100644 index 000000000..fc73a4bf9 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java @@ -0,0 +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); + } + +}