diff --git a/.classpath b/.classpath
index 89051b0..a8f768e 100644
--- a/.classpath
+++ b/.classpath
@@ -26,7 +26,7 @@
-
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/src/main/java/org/comunidadmadrid/fp/dam2/procesamiento/ProcesadorFormacionInstitutoCSV.java b/src/main/java/org/comunidadmadrid/fp/dam2/procesamiento/ProcesadorFormacionInstitutoCSV.java
index b3a83d4..3768121 100644
--- a/src/main/java/org/comunidadmadrid/fp/dam2/procesamiento/ProcesadorFormacionInstitutoCSV.java
+++ b/src/main/java/org/comunidadmadrid/fp/dam2/procesamiento/ProcesadorFormacionInstitutoCSV.java
@@ -51,7 +51,7 @@ public class ProcesadorFormacionInstitutoCSV {
// Si el registro es de tipo "S" se tratará para insertarse en la Base de datos.
if (registroATratar.equals("S")) {
InstitutoFormacion institutoFormacion = new InstitutoFormacion();
- InstitutoFormacionID institutoFormacionID = new InstitutoFormacionID(idInstituto, codFormacion);
+ InstitutoFormacionID institutoFormacionID = new InstitutoFormacionID(idInstituto, codFormacion,anyo);
Instituto instituto = new Instituto();
instituto.setIdentificador(idInstituto);
@@ -61,7 +61,6 @@ public class ProcesadorFormacionInstitutoCSV {
institutoFormacion.setIdInstitutoFormacion(institutoFormacionID);
institutoFormacion.setInstituto(instituto);
institutoFormacion.setFormacion(formacion);
- institutoFormacion.setAnyoAcademico(anyo);
listaInstitutoFormacion.add(institutoFormacion);
}
diff --git a/src/main/java/org/comunidadmadrid/fp/dam2/vo/InstitutoFormacion.java b/src/main/java/org/comunidadmadrid/fp/dam2/vo/InstitutoFormacion.java
index 924c127..d1b99b3 100644
--- a/src/main/java/org/comunidadmadrid/fp/dam2/vo/InstitutoFormacion.java
+++ b/src/main/java/org/comunidadmadrid/fp/dam2/vo/InstitutoFormacion.java
@@ -32,46 +32,31 @@ public class InstitutoFormacion {
@JoinColumn(name="cod_formacion", insertable=false, updatable=false)
private Formacion formacion;
- @Column(name="anyo_academico")
- private int anyoAcademico;
@Embeddable
public static class InstitutoFormacionID{
public InstitutoFormacionID() {
}
- public InstitutoFormacionID(Integer idInstituto, String codFormacion) {
- this.codFormacion=codFormacion;
- this.idIntituto=idInstituto;
-
+
+
+ public InstitutoFormacionID(Integer idIntituto, String codFormacion, int anyoAcademico) {
+ super();
+ this.idIntituto = idIntituto;
+ this.codFormacion = codFormacion;
+ this.anyoAcademico = anyoAcademico;
}
+
+
@Column(name="id_instituto")
private Integer idIntituto;
@Column(name="cod_formacion")
private String codFormacion;
+ @Column(name="anyo_academico")
+ private int anyoAcademico;
- @Override
- public int hashCode() {
- return Objects.hash(codFormacion, idIntituto);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- InstitutoFormacionID other = (InstitutoFormacionID) obj;
- return Objects.equals(codFormacion, other.codFormacion) && Objects.equals(idIntituto, other.idIntituto);
- }
- @Override
- public String toString() {
- return "InstitutoFormacionID [idIntituto=" + idIntituto + ", idFormacion=" + codFormacion + "]";
- }
public Integer getIdIntituto() {
return idIntituto;
}
@@ -83,14 +68,38 @@ public class InstitutoFormacion {
}
public void setCodFormacion(String codFormacion) {
this.codFormacion = codFormacion;
- }
+ }
+ public int getAnyoAcademico() {
+ return anyoAcademico;
+ }
+ public void setAnyoAcademico(int anyoAcademico) {
+ this.anyoAcademico = anyoAcademico;
+ }
+ @Override
+ public int hashCode() {
+ return Objects.hash(anyoAcademico, codFormacion, idIntituto);
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ InstitutoFormacionID other = (InstitutoFormacionID) obj;
+ return anyoAcademico == other.anyoAcademico && Objects.equals(codFormacion, other.codFormacion)
+ && Objects.equals(idIntituto, other.idIntituto);
+ }
+ @Override
+ public String toString() {
+ return "InstitutoFormacionID [idIntituto=" + idIntituto + ", codFormacion=" + codFormacion
+ + ", anyoAcademico=" + anyoAcademico + "]";
+ }
+
+
}
- @Override
- public String toString() {
- return "InstitutoFormacion [idInstitutoFormacion=" + idInstitutoFormacion + ", instituto=" + instituto
- + ", formacion=" + formacion + ", anyoAcademico=" + anyoAcademico + "]";
- }
public InstitutoFormacionID getIdInstitutoFormacion() {
return idInstitutoFormacion;
@@ -116,11 +125,10 @@ public class InstitutoFormacion {
this.formacion = formacion;
}
- public int getAnyoAcademico() {
- return anyoAcademico;
+ @Override
+ public String toString() {
+ return "InstitutoFormacion [idInstitutoFormacion=" + idInstitutoFormacion + ", instituto=" + instituto
+ + ", formacion=" + formacion + "]";
}
- public void setAnyoAcademico(int anyoAcademico) {
- this.anyoAcademico = anyoAcademico;
- }
}
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 4128b8a..7715c54 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -12,10 +12,8 @@
-
-
+
-
diff --git a/src/main/resources/formacion.properties b/src/main/resources/formacion.properties
index 5acb306..7fc2056 100644
--- a/src/main/resources/formacion.properties
+++ b/src/main/resources/formacion.properties
@@ -1,11 +1,11 @@
# Información sobre la Base de datos PostgreSQL
jdbc.driver=org.postgresql.Driver
-jdbc.url=jdbc:postgresql://192.168.1.36:5432/formacionfp_origen
+jdbc.url=jdbc:postgresql://10.11.218.147:5432/formacionfp_postgresql
jdbc.usuario=vdlp
jdbc.password=postgresql_123
# Información sobre la Base de datos MongoDB
-mongodb.url=mongodb://admin:mongodb_123@192.168.1.36:27017
+mongodb.url=mongodb://localhost:27017/
mongodb.bbdd=formacionfp_dam2
#ruta URL formaciones
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index 029853e..4ee607b 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -4,7 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
- jdbc:mysql://192.168.1.36:3306/formacionfp_dam2
+ jdbc:mysql://10.11.218.147:3306/formacionfp_dam2
com.mysql.cj.jdbc.Driver
org.hibernate.dialect.MySQLDialect