From 86693139d9cc31773efc42eddaa514103e116c9b Mon Sep 17 00:00:00 2001 From: carla Date: Fri, 26 Oct 2012 20:12:08 +0000 Subject: [PATCH] =?UTF-8?q?Cria=C3=A7=C3=A3o=20da=20novas=20classes=20rela?= =?UTF-8?q?cionada=20PuntoVenta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@22224 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../entidad/PtovtaAgenciaBancaria.java | 54 ++++-- .../ventaboletos/entidad/PtovtaTitular.java | 15 +- .../ventaboletos/entidad/PuntoVenta.java | 169 ++++++++++-------- 3 files changed, 143 insertions(+), 95 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgenciaBancaria.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgenciaBancaria.java index faeb799c6..d6ba59414 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgenciaBancaria.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgenciaBancaria.java @@ -13,12 +13,15 @@ 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; @@ -28,46 +31,50 @@ import javax.persistence.TemporalType; * @author Rafael */ @Entity -@Table(name = "PTOVTA_AGENCIABANCARIA") -@NamedQueries({ - @NamedQuery(name = "PtovtaAgenciaBancaria.findAll", query = "SELECT p FROM PtovtaAgenciaBancaria p")}) +@SequenceGenerator(name = "PTOVTA_AGENCIA_BANCARIA_SEQ", sequenceName = "PTOVTA_AGENCIA_BANCARIA_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_AGENCIA_BANCARIA") + public class PtovtaAgenciaBancaria implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_AGENCIA_BANCARIA_SEQ") @Column(name = "ID") private Integer id; - @Basic(optional = false) + @Column(name = "NUMAGENCIA") private String numagencia; - @Basic(optional = false) + @Column(name = "NUMCONTA") private String numconta; - @Basic(optional = false) + + @Column(name = "DIGITO") + private String digito; + @Column(name = "PESSOA") private String pessoa; - @Basic(optional = false) + @Column(name = "TIPO") private String tipo; - @Basic(optional = false) + @Column(name = "BILHETES") private String bilhetes; - @Basic(optional = false) + @Column(name = "CARGA") private String carga; - @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 int usuarioId; @JoinColumn(name = "BANCO_ID", referencedColumnName = "ID") - @ManyToOne(optional = false) + @ManyToOne private PtovtaBanco bancoId; @@ -85,17 +92,18 @@ public class PtovtaAgenciaBancaria implements Serializable { private static List tpContaList = new ArrayList(); static{ - pessoaList.add("blue"); - pessoaList.add("black"); + pessoaList.add("FÍSICA"); + pessoaList.add("JURÍDICA"); - tpContaList.add("small"); - tpContaList.add("medium"); + tpContaList.add("C/C"); + tpContaList.add("POUPANÇA"); } - public PtovtaAgenciaBancaria(Integer id, String numagencia, String numconta, String pessoa, String tipo, String bilhetes, String carga, Boolean activo, Date fecmodif, int usuarioId) { + public PtovtaAgenciaBancaria(Integer id, String numagencia, String digito, String numconta, String pessoa, String tipo, String bilhetes, String carga, Boolean activo, Date fecmodif, int usuarioId) { this.id = id; this.numagencia = numagencia; this.numconta = numconta; + this.digito = digito; this.pessoa = pessoa; this.tipo = tipo; this.bilhetes = bilhetes; @@ -129,7 +137,15 @@ public class PtovtaAgenciaBancaria implements Serializable { this.numconta = numconta; } - public String getPessoa() { + public String getDigito() { + return digito; + } + + public void setDigito(String digito) { + this.digito = digito; + } + + public String getPessoa() { return pessoa; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java index 6fd0402a8..b09f994c9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java @@ -9,12 +9,15 @@ 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.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -25,12 +28,12 @@ import javax.persistence.TemporalType; */ @Entity @Table(name = "PTOVTA_TITULAR") -@NamedQueries({ - @NamedQuery(name = "PtovtaTitular.findAll", query = "SELECT p FROM PtovtaTitular p")}) +@SequenceGenerator(name = "PTOVTA_TITULAR_SEQ", sequenceName = "PTOVTA_TITULAR_SEQ", allocationSize = 1) public class PtovtaTitular implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_TITULAR_SEQ") @Column(name = "ID") private Integer id; @@ -47,9 +50,9 @@ public class PtovtaTitular implements Serializable { private String orgaoemissor; @Lob @Column(name = "IMAGEM") - private Serializable imagem; + private byte[] imagem; - @Basic(optional = false) + @Column(name = "ACTIVO") private Boolean activo; @@ -121,11 +124,11 @@ public class PtovtaTitular implements Serializable { this.orgaoemissor = orgaoemissor; } - public Serializable getImagem() { + public byte[] getImagem() { return imagem; } - public void setImagem(Serializable imagem) { + public void setImagem(byte[] imagem) { this.imagem = imagem; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index 29e61c996..183f2e18c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -108,22 +108,51 @@ public class PuntoVenta implements Serializable { private String numfax; @Column(name = "COMPL") private String compl; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaEstoqueList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaTitularList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaHorarioList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaComissaoList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaDiversosList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaAgenciaList; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") - private List ptovtaAntecipacomissaoList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaEstoqueList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaTitularList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaHorarioList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaComissaoList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaDiversosList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaAgenciaList; +// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") +// private List ptovtaAntecipacomissaoList; + + + //@JoinColumn(name = "AGENCIA_ID", referencedColumnName = "ID") + @JoinColumn(name = "AGENCIA_ID") + @OneToOne(cascade=CascadeType.ALL) + private PtovtaAgenciaBancaria agenciaId; + + @JoinColumn(name = "TITULAR_ID") + @OneToOne(cascade=CascadeType.ALL) + private PtovtaTitular titularId; + + + - public PuntoVenta() { + public PtovtaTitular getTitularId() { + return titularId; + } + + public void setTitularId(PtovtaTitular titularId) { + this.titularId = titularId; + } + + public PtovtaAgenciaBancaria getAgenciaId() { + return agenciaId; + } + + public void setAgenciaId(PtovtaAgenciaBancaria agenciaId) { + this.agenciaId = agenciaId; + } + + public PuntoVenta() { } public PuntoVenta(Integer puntoventaId) { @@ -341,61 +370,61 @@ public class PuntoVenta implements Serializable { this.compl = compl; } - public List getPtovtaEstoqueList() { - return ptovtaEstoqueList; - } - - public void setPtovtaEstoqueList(List ptovtaEstoqueList) { - this.ptovtaEstoqueList = ptovtaEstoqueList; - } - - public List getPtovtaTitularList() { - return ptovtaTitularList; - } - - public void setPtovtaTitularList(List ptovtaTitularList) { - this.ptovtaTitularList = ptovtaTitularList; - } - - public List getPtovtaHorarioList() { - return ptovtaHorarioList; - } - - public void setPtovtaHorarioList(List ptovtaHorarioList) { - this.ptovtaHorarioList = ptovtaHorarioList; - } - - public List getPtovtaComissaoList() { - return ptovtaComissaoList; - } - - public void setPtovtaComissaoList(List ptovtaComissaoList) { - this.ptovtaComissaoList = ptovtaComissaoList; - } - - public List getPtovtaDiversosList() { - return ptovtaDiversosList; - } - - public void setPtovtaDiversosList(List ptovtaDiversosList) { - this.ptovtaDiversosList = ptovtaDiversosList; - } - - public List getPtovtaAgenciaList() { - return ptovtaAgenciaList; - } - - public void setPtovtaAgenciaList(List ptovtaAgenciaList) { - this.ptovtaAgenciaList = ptovtaAgenciaList; - } - - public List getPtovtaAntecipacomissaoList() { - return ptovtaAntecipacomissaoList; - } - - public void setPtovtaAntecipacomissaoList(List ptovtaAntecipacomissaoList) { - this.ptovtaAntecipacomissaoList = ptovtaAntecipacomissaoList; - } +// public List getPtovtaEstoqueList() { +// return ptovtaEstoqueList; +// } +// +// public void setPtovtaEstoqueList(List ptovtaEstoqueList) { +// this.ptovtaEstoqueList = ptovtaEstoqueList; +// } +// +// public List getPtovtaTitularList() { +// return ptovtaTitularList; +// } +// +// public void setPtovtaTitularList(List ptovtaTitularList) { +// this.ptovtaTitularList = ptovtaTitularList; +// } +// +// public List getPtovtaHorarioList() { +// return ptovtaHorarioList; +// } +// +// public void setPtovtaHorarioList(List ptovtaHorarioList) { +// this.ptovtaHorarioList = ptovtaHorarioList; +// } +// +// public List getPtovtaComissaoList() { +// return ptovtaComissaoList; +// } +// +// public void setPtovtaComissaoList(List ptovtaComissaoList) { +// this.ptovtaComissaoList = ptovtaComissaoList; +// } +// +// public List getPtovtaDiversosList() { +// return ptovtaDiversosList; +// } +// +// public void setPtovtaDiversosList(List ptovtaDiversosList) { +// this.ptovtaDiversosList = ptovtaDiversosList; +// } +// +// public List getPtovtaAgenciaList() { +// return ptovtaAgenciaList; +// } +// +// public void setPtovtaAgenciaList(List ptovtaAgenciaList) { +// this.ptovtaAgenciaList = ptovtaAgenciaList; +// } +// +// public List getPtovtaAntecipacomissaoList() { +// return ptovtaAntecipacomissaoList; +// } +// +// public void setPtovtaAntecipacomissaoList(List ptovtaAntecipacomissaoList) { +// this.ptovtaAntecipacomissaoList = ptovtaAntecipacomissaoList; +// } public void setLsPtovtaUsuarioBancario(List lsPtovtaUsuarioBancario) { this.lsPtovtaUsuarioBancario = lsPtovtaUsuarioBancario;