diff --git a/ear/target/maven-archiver/pom.properties b/ear/target/maven-archiver/pom.properties index 21836f6..839a0e5 100644 --- a/ear/target/maven-archiver/pom.properties +++ b/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Sun Feb 12 21:25:08 ECT 2023 +#Mon Feb 13 12:18:59 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-ear diff --git a/ear/target/portal-ear.ear b/ear/target/portal-ear.ear index 0da60cb..30d801b 100644 Binary files a/ear/target/portal-ear.ear and b/ear/target/portal-ear.ear differ diff --git a/ear/target/portal-ear/portal-ejb.jar b/ear/target/portal-ear/portal-ejb.jar index 66ee477..0c2da8c 100644 Binary files a/ear/target/portal-ear/portal-ejb.jar and b/ear/target/portal-ear/portal-ejb.jar differ diff --git a/ear/target/portal-ear/portal-web.war b/ear/target/portal-ear/portal-web.war index 32f9f83..fd8736b 100644 Binary files a/ear/target/portal-ear/portal-web.war and b/ear/target/portal-ear/portal-web.war differ diff --git a/ejb/src/main/java/com/fp/armas/portal/dao/general/GenericDaoImpl.java b/ejb/src/main/java/com/fp/armas/portal/dao/general/GenericDaoImpl.java index 4922e84..a3fddc4 100644 --- a/ejb/src/main/java/com/fp/armas/portal/dao/general/GenericDaoImpl.java +++ b/ejb/src/main/java/com/fp/armas/portal/dao/general/GenericDaoImpl.java @@ -48,9 +48,9 @@ public class GenericDaoImpl implements GenericDao{ public void create(T entity) throws DaoException { // TODO Auto-generated method stub try{ - this.getEntityManager().clear(); + //this.getEntityManager().clear(); this.getEntityManager().persist(entity); - this.getEntityManager().flush(); + //this.getEntityManager().flush(); } catch(PersistenceException e){ throw transformDaoException(e); } catch (Throwable e) { @@ -62,9 +62,9 @@ public class GenericDaoImpl implements GenericDao{ public void update(T entity) throws DaoException { // TODO Auto-generated method stub try { - this.getEntityManager().clear(); + //this.getEntityManager().clear(); this.getEntityManager().merge(entity); - this.getEntityManager().flush(); + //this.getEntityManager().flush(); } catch(PersistenceException e){ throw transformDaoException(e); } catch (Throwable e) { @@ -76,9 +76,9 @@ public class GenericDaoImpl implements GenericDao{ public void delete(T entity) throws DaoException { // TODO Auto-generated method stub try{ - this.getEntityManager().clear(); + //this.getEntityManager().clear(); this.getEntityManager().remove(this.getEntityManager().contains(entity) ? entity : this.getEntityManager().merge(entity)); - this.getEntityManager().flush(); + //this.getEntityManager().flush(); } catch(PersistenceException e){ throw transformDaoException(e); } catch (Throwable e) { diff --git a/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java b/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java index c22ac77..6d32819 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java @@ -11,14 +11,13 @@ import java.util.Date; * The persistent class for the TCUSTCOMPANY database table. * */ -@Entity(name = "Tcustcompany") -@Table(name = "TCUSTCOMPANY") + public class Tcustcompany implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private TcustcompanyPK id; - @Column(name = "BUSINESSCLASSCATALOG", nullable = true) + private String businessclasscatalog; private String businessclasscatalogcode; diff --git a/ejb/src/main/java/com/fp/armas/portal/model/TcustcompanyPK.java b/ejb/src/main/java/com/fp/armas/portal/model/TcustcompanyPK.java index d4b4263..9d81c41 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/TcustcompanyPK.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/TcustcompanyPK.java @@ -2,6 +2,7 @@ package com.fp.armas.portal.model; import java.io.Serializable; import java.util.Date; +import java.util.Objects; import javax.persistence.*; @@ -15,7 +16,7 @@ public class TcustcompanyPK implements Serializable { private static final long serialVersionUID = 1L; @Column - private long personcode; + private Long personcode; @Temporal(TemporalType.TIMESTAMP) private java.util.Date dateto; @@ -23,7 +24,7 @@ public class TcustcompanyPK implements Serializable { public TcustcompanyPK() { } - public TcustcompanyPK(long personcode, Date dateto) { + public TcustcompanyPK(Long personcode, Date dateto) { super(); this.personcode = personcode; this.dateto = dateto; @@ -31,10 +32,10 @@ public class TcustcompanyPK implements Serializable { - public long getPersoncode() { + public Long getPersoncode() { return this.personcode; } - public void setPersoncode(long personcode) { + public void setPersoncode(Long personcode) { this.personcode = personcode; } public java.util.Date getDateto() { @@ -53,15 +54,15 @@ public class TcustcompanyPK implements Serializable { } TcustcompanyPK castOther = (TcustcompanyPK)other; return - (this.personcode == castOther.personcode) + (Objects.equals(this.personcode, castOther.personcode)) && this.dateto.equals(castOther.dateto); } public int hashCode() { final int prime = 31; int hash = 17; - hash = hash * prime + ((int) (this.personcode ^ (this.personcode >>> 32))); - hash = hash * prime + this.dateto.hashCode(); + hash = hash * prime + ((int) (this.personcode ^ (this.personcode >>> 32))); + hash = hash * prime + this.dateto.hashCode(); return hash; } diff --git a/ejb/src/main/java/com/fp/armas/portal/model/TcustpersondetailPK.java b/ejb/src/main/java/com/fp/armas/portal/model/TcustpersondetailPK.java index 29afdd4..bdbbd49 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/TcustpersondetailPK.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/TcustpersondetailPK.java @@ -2,6 +2,7 @@ package com.fp.armas.portal.model; import java.io.Serializable; import java.util.Date; +import java.util.Objects; import javax.persistence.*; @@ -15,7 +16,7 @@ public class TcustpersondetailPK implements Serializable { private static final long serialVersionUID = 1L; @Column - private long personcode; + private Long personcode; @Temporal(TemporalType.TIMESTAMP) private java.util.Date dateto; @@ -23,7 +24,7 @@ public class TcustpersondetailPK implements Serializable { public TcustpersondetailPK() { } - public TcustpersondetailPK(long personcode, Date dateto) { + public TcustpersondetailPK(Long personcode, Date dateto) { super(); this.personcode = personcode; this.dateto = dateto; @@ -31,10 +32,10 @@ public class TcustpersondetailPK implements Serializable { - public long getPersoncode() { + public Long getPersoncode() { return this.personcode; } - public void setPersoncode(long personcode) { + public void setPersoncode(Long personcode) { this.personcode = personcode; } public java.util.Date getDateto() { @@ -53,15 +54,16 @@ public class TcustpersondetailPK implements Serializable { } TcustpersondetailPK castOther = (TcustpersondetailPK)other; return - (this.personcode == castOther.personcode) + (Objects.equals(this.personcode, castOther.personcode)) && this.dateto.equals(castOther.dateto); } + @Override public int hashCode() { final int prime = 31; int hash = 17; - hash = hash * prime + ((int) (this.personcode ^ (this.personcode >>> 32))); - hash = hash * prime + this.dateto.hashCode(); + hash = hash * prime + ((int) (this.personcode ^ (this.personcode >>> 32))); + hash = hash * prime + this.dateto.hashCode(); return hash; } diff --git a/ejb/src/main/java/com/fp/armas/portal/model/Tgenefile.java b/ejb/src/main/java/com/fp/armas/portal/model/Tgenefile.java index 132661b..dcde8bc 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/Tgenefile.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/Tgenefile.java @@ -2,7 +2,7 @@ package com.fp.armas.portal.model; import java.io.Serializable; import javax.persistence.*; -import java.util.Set; +import java.util.Set; /** diff --git a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java index b48bc98..92455db 100644 --- a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java +++ b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java @@ -324,7 +324,7 @@ public class RegistroBean { Tcustpersonphone telefonoCelular, Tcustpeople adicionalPersona, Tcustcompany compania, Tgenefilesdetail foto) throws RegistroException { try { Tcustperson personaExistente = null; - if(persona.getId() != null && persona.getId().getPersoncode() != 0){ + if(persona.getId() != null && persona.getId().getPersoncode() != 0 && persona.getId().getPersoncode() == null){ personaExistente = personaDao.buscarPorId(persona.getId().getPersoncode()); } if(personaExistente == null){ @@ -390,7 +390,8 @@ public class RegistroBean { public Tcustcompany obtenerCompania(Integer personcode) throws RegistroException{ try { TcustcompanyPK pk = new TcustcompanyPK(); - pk.setPersoncode(personcode); + + pk.setPersoncode(Long.valueOf(personcode.toString())); pk.setDateto(FechaUtil.obtenerFecha(2999, 11, 31)); return companiaDao.buscarPorId(pk); } catch (Throwable e) { @@ -737,7 +738,7 @@ public class RegistroBean { if(!persona.getIdentificationcatalog().equals(PortalMessages.getInstancia().getString("catalogo.codigo.detalle.id.ruc"))){ return; } - if(compania.getId() == null || compania.getId().getPersoncode() == 0){ + if(compania.getId() == null || compania.getId().getPersoncode() == 0 || compania.getId().getPersoncode() == null){ compania.setId(new TcustcompanyPK()); compania.getId().setDateto(FechaUtil.obtenerFecha(2999, 11, 31)); compania.getId().setPersoncode(persona.getId().getPersoncode()); @@ -745,7 +746,8 @@ public class RegistroBean { compania.setLogo(guardaFoto(foto)); compania.setRecordversion(0L); compania.setIngressuser(PortalMessages.getInstancia().getString("usuario.registro")); - companiaDao.create(compania); + + companiaDao.create(compania); } else{ Tcustcompany companiaAnterior = companiaDao.buscarPorId(new TcustcompanyPK(compania.getId().getPersoncode(), compania.getId().getDateto())); if(companiaAnterior != null){ diff --git a/ejb/src/main/resources/META-INF/ormPortal.xml b/ejb/src/main/resources/META-INF/ormPortal.xml index b7a089b..f6eda1f 100644 --- a/ejb/src/main/resources/META-INF/ormPortal.xml +++ b/ejb/src/main/resources/META-INF/ormPortal.xml @@ -14,7 +14,7 @@ - + diff --git a/ejb/src/main/resources/META-INF/persistence.xml b/ejb/src/main/resources/META-INF/persistence.xml index cca2c6f..642e3e9 100644 --- a/ejb/src/main/resources/META-INF/persistence.xml +++ b/ejb/src/main/resources/META-INF/persistence.xml @@ -1,42 +1,43 @@ - - + + + org.hibernate.ejb.HibernatePersistence + java:jboss/datasources/FLIPDS1 - META-INF/ormPortal.xml - - com.fp.armas.portal.model.Tgenecatalog - com.fp.armas.portal.model.Tgenecatalogdetail - com.fp.armas.portal.model.TgenecatalogdetailPK - com.fp.armas.portal.model.Tgeneactivity - com.fp.armas.portal.model.Tcustpeople - com.fp.armas.portal.model.TcustpeoplePK - com.fp.armas.portal.model.Tgenesequence - com.fp.armas.portal.model.Tcustcompany - com.fp.armas.portal.model.TcustcompanyPK - com.fp.armas.portal.model.Tgenefile - com.fp.armas.portal.model.Tgenefilesdetail - com.fp.armas.portal.model.TgenefilesdetailPK - com.fp.armas.portal.model.Tcustpersondetail - - + META-INF/ormPortal.xml + com.fp.armas.portal.model.Tgenecatalog + com.fp.armas.portal.model.Tgenecatalogdetail + com.fp.armas.portal.model.TgenecatalogdetailPK + com.fp.armas.portal.model.Tgeneactivity + com.fp.armas.portal.model.Tcustpeople + com.fp.armas.portal.model.TcustpeoplePK + com.fp.armas.portal.model.Tgenesequence + com.fp.armas.portal.model.TcustcompanyPK + com.fp.armas.portal.model.Tgenefile + com.fp.armas.portal.model.Tgenefilesdetail + com.fp.armas.portal.model.TgenefilesdetailPK + com.fp.armas.portal.model.Tcustpersondetail + com.fp.armas.portal.model.Tcustcompany + - + - + + + + + + - + diff --git a/ejb/target/classes/META-INF/ormPortal.xml b/ejb/target/classes/META-INF/ormPortal.xml index b7a089b..f6eda1f 100644 --- a/ejb/target/classes/META-INF/ormPortal.xml +++ b/ejb/target/classes/META-INF/ormPortal.xml @@ -14,7 +14,7 @@ - +
diff --git a/ejb/target/classes/META-INF/persistence.xml b/ejb/target/classes/META-INF/persistence.xml index cca2c6f..642e3e9 100644 --- a/ejb/target/classes/META-INF/persistence.xml +++ b/ejb/target/classes/META-INF/persistence.xml @@ -1,42 +1,43 @@ - - + + + org.hibernate.ejb.HibernatePersistence + java:jboss/datasources/FLIPDS1 - META-INF/ormPortal.xml - - com.fp.armas.portal.model.Tgenecatalog - com.fp.armas.portal.model.Tgenecatalogdetail - com.fp.armas.portal.model.TgenecatalogdetailPK - com.fp.armas.portal.model.Tgeneactivity - com.fp.armas.portal.model.Tcustpeople - com.fp.armas.portal.model.TcustpeoplePK - com.fp.armas.portal.model.Tgenesequence - com.fp.armas.portal.model.Tcustcompany - com.fp.armas.portal.model.TcustcompanyPK - com.fp.armas.portal.model.Tgenefile - com.fp.armas.portal.model.Tgenefilesdetail - com.fp.armas.portal.model.TgenefilesdetailPK - com.fp.armas.portal.model.Tcustpersondetail - - + META-INF/ormPortal.xml + com.fp.armas.portal.model.Tgenecatalog + com.fp.armas.portal.model.Tgenecatalogdetail + com.fp.armas.portal.model.TgenecatalogdetailPK + com.fp.armas.portal.model.Tgeneactivity + com.fp.armas.portal.model.Tcustpeople + com.fp.armas.portal.model.TcustpeoplePK + com.fp.armas.portal.model.Tgenesequence + com.fp.armas.portal.model.TcustcompanyPK + com.fp.armas.portal.model.Tgenefile + com.fp.armas.portal.model.Tgenefilesdetail + com.fp.armas.portal.model.TgenefilesdetailPK + com.fp.armas.portal.model.Tcustpersondetail + com.fp.armas.portal.model.Tcustcompany + - + - + + + + + + - + diff --git a/ejb/target/classes/com/fp/armas/portal/dao/general/GenericDaoImpl.class b/ejb/target/classes/com/fp/armas/portal/dao/general/GenericDaoImpl.class index ea263cc..8bb69d0 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/dao/general/GenericDaoImpl.class and b/ejb/target/classes/com/fp/armas/portal/dao/general/GenericDaoImpl.class differ diff --git a/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class b/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class index 8cd3554..a54f2b9 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class and b/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class differ diff --git a/ejb/target/classes/com/fp/armas/portal/model/TcustcompanyPK.class b/ejb/target/classes/com/fp/armas/portal/model/TcustcompanyPK.class index e226f54..ec66d50 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/model/TcustcompanyPK.class and b/ejb/target/classes/com/fp/armas/portal/model/TcustcompanyPK.class differ diff --git a/ejb/target/classes/com/fp/armas/portal/model/TcustpersondetailPK.class b/ejb/target/classes/com/fp/armas/portal/model/TcustpersondetailPK.class index 0270ad4..73a68e2 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/model/TcustpersondetailPK.class and b/ejb/target/classes/com/fp/armas/portal/model/TcustpersondetailPK.class differ diff --git a/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class b/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class index c91e9d8..4a9cb21 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class and b/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class differ diff --git a/ejb/target/maven-archiver/pom.properties b/ejb/target/maven-archiver/pom.properties index cfcb00a..e6abbd2 100644 --- a/ejb/target/maven-archiver/pom.properties +++ b/ejb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Sun Feb 12 21:25:06 ECT 2023 +#Mon Feb 13 12:18:57 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-ejb diff --git a/ejb/target/portal-ejb.jar b/ejb/target/portal-ejb.jar index 66ee477..0c2da8c 100644 Binary files a/ejb/target/portal-ejb.jar and b/ejb/target/portal-ejb.jar differ diff --git a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java index b2f9514..a7a5f54 100644 --- a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java +++ b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java @@ -335,8 +335,8 @@ public class RegistroController extends BaseController implements Serializable { * @param personaDetalle */ private void completaDatosCompania(Tcustpersondetail personaDetalle) { - if(personaDetalle.getId()!=null && personaDetalle.getId().getPersoncode()>0){ - registroDataManager.setCompania(portalService.obtenerCompaniaPorId((int)personaDetalle.getId().getPersoncode())); + if(personaDetalle.getId()!=null && personaDetalle.getId().getPersoncode()>0 && personaDetalle.getId().getPersoncode()!= null){ + registroDataManager.setCompania(portalService.obtenerCompaniaPorId(personaDetalle.getId().getPersoncode().intValue())); if(registroDataManager.getCompania()!=null && registroDataManager.getCompania().getId()!=null && registroDataManager.getCompania().getId().getPersoncode()>0 && registroDataManager.getCompania().getLogo()!=null){ Tgenefilesdetail tgenefilesdetail= portalService.obtenerImagen(registroDataManager.getCompania().getLogo()); if(tgenefilesdetail!=null && tgenefilesdetail.getImage()!=null){ @@ -354,8 +354,8 @@ public class RegistroController extends BaseController implements Serializable { * @param personaDetalle */ private void completaDatosPersonaNatural(Tcustpersondetail personaDetalle){ - if(personaDetalle.getId() != null && personaDetalle.getId().getPersoncode() != 0){ - registroDataManager.setAdicionalPersona(portalService.obtenerPersonaNaturalPorId((int)personaDetalle.getId().getPersoncode())); + if(personaDetalle.getId() != null && personaDetalle.getId().getPersoncode() != 0 && personaDetalle.getId().getPersoncode() != null){ + registroDataManager.setAdicionalPersona(portalService.obtenerPersonaNaturalPorId(personaDetalle.getId().getPersoncode().intValue())); } } @@ -392,21 +392,21 @@ public class RegistroController extends BaseController implements Serializable { */ private void completaDatosGenerales(Tcustpersondetail personaDetalle){ if(personaDetalle != null){ - Tcustpersonaddress direccionPrincipal = portalService.obtenerDireccionPrincipal((int)personaDetalle.getId().getPersoncode()); + Tcustpersonaddress direccionPrincipal = portalService.obtenerDireccionPrincipal((int)personaDetalle.getId().getPersoncode().intValue()); if(direccionPrincipal == null){ registroDataManager.setDireccionPersona(new Tcustpersonaddress()); registroDataManager.getDireccionPersona().setAddresstypecatalog(TIPO_DIRECCION); } else{ registroDataManager.setDireccionPersona(direccionPrincipal); } - Tcustpersonaddress mail = portalService.obtenerCorreo((int)personaDetalle.getId().getPersoncode());; + Tcustpersonaddress mail = portalService.obtenerCorreo((int)personaDetalle.getId().getPersoncode().intValue()); if(mail == null){ this.registroDataManager.getCorreoPersona().setAddresstypecatalogcode(TIPO_DIRECCION); this.registroDataManager.getCorreoPersona().setAddresstypecatalog("3"); } else{ registroDataManager.setCorreoPersona(mail); } - Tcustpersonphone telefonoFijo = portalService.obtenerTelefonoFijo((int)personaDetalle.getId().getPersoncode()); + Tcustpersonphone telefonoFijo = portalService.obtenerTelefonoFijo(personaDetalle.getId().getPersoncode().intValue()); if(telefonoFijo == null){ this.registroDataManager.setTelefonoPersona(new Tcustpersonphone()); this.registroDataManager.getTelefonoPersona().setAddressnumber(1L); @@ -415,7 +415,7 @@ public class RegistroController extends BaseController implements Serializable { } else{ registroDataManager.setTelefonoPersona(telefonoFijo); } - Tcustpersonphone telefonoCelular = portalService.obtenerTelefonoCelular((int)personaDetalle.getId().getPersoncode()); + Tcustpersonphone telefonoCelular = portalService.obtenerTelefonoCelular(personaDetalle.getId().getPersoncode().intValue()); if(telefonoCelular == null){ this.registroDataManager.setTelefonoCelular(new Tcustpersonphone()); this.registroDataManager.getTelefonoCelular().setAddressnumber(2L); diff --git a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class index 790feed..83487dc 100644 Binary files a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ diff --git a/web/target/maven-archiver/pom.properties b/web/target/maven-archiver/pom.properties index 4ce0961..8e3b961 100644 --- a/web/target/maven-archiver/pom.properties +++ b/web/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Sun Feb 12 21:25:07 ECT 2023 +#Mon Feb 13 12:18:58 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-web diff --git a/web/target/portal-web.war b/web/target/portal-web.war index 32f9f83..fd8736b 100644 Binary files a/web/target/portal-web.war and b/web/target/portal-web.war differ diff --git a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class index 790feed..83487dc 100644 Binary files a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ