Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/importer/laf/LafWriter.java @ 1028:1c41c7b8f7c2 schema-update
Updated server application to new database model. THIS IS STILL WIP!!!
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Fri, 08 Jul 2016 15:32:36 +0200 |
parents | fa922101a462 |
children |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/importer/laf/LafWriter.java Mon Jul 04 14:31:18 2016 +0200 +++ b/src/main/java/de/intevation/lada/importer/laf/LafWriter.java Fri Jul 08 15:32:36 2016 +0200 @@ -15,15 +15,13 @@ import javax.persistence.PersistenceException; import de.intevation.lada.importer.ReportItem; -import de.intevation.lada.model.land.LKommentarM; -import de.intevation.lada.model.land.LKommentarP; -import de.intevation.lada.model.land.LMessung; -import de.intevation.lada.model.land.LMesswert; -import de.intevation.lada.model.land.LOrtszuordnung; -import de.intevation.lada.model.land.LProbe; -import de.intevation.lada.model.land.MessungTranslation; -import de.intevation.lada.model.land.ProbeTranslation; -import de.intevation.lada.model.stamm.Ort; +import de.intevation.lada.model.land.KommentarM; +import de.intevation.lada.model.land.KommentarP; +import de.intevation.lada.model.land.Messung; +import de.intevation.lada.model.land.Messwert; +import de.intevation.lada.model.land.Ortszuordnung; +import de.intevation.lada.model.land.Probe; +import de.intevation.lada.model.stammdaten.Ort; import de.intevation.lada.util.annotation.AuthorizationConfig; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.auth.Authorization; @@ -84,20 +82,18 @@ * @param probe The new {@link LProbe} object. * @return success */ - public boolean writeProbe(UserInfo userInfo, LProbe probe, ProbeTranslation probeTranslation) { - if (!authorization.isAuthorized(userInfo, probe, LProbe.class)) { + public boolean writeProbe(UserInfo userInfo, Probe probe) { + if (!authorization.isAuthorized(userInfo, probe, Probe.class)) { errors.add(new ReportItem("auth", "not authorized", 699)); return false; } - if (probeTranslation.getProbeIdAlt() == null) { + if (probe.getIdAlt() == null) { errors.add(new ReportItem("probeId", "missing", 673)); return false; } try { repository.create(probe, "land"); - probeTranslation.setProbeId(probe); this.currentProbeId = probe.getId(); - repository.create(probeTranslation, "land"); } catch (PersistenceException e) { errors.add(new ReportItem("probe", "writing", 670)); @@ -116,13 +112,10 @@ */ public boolean writeMessungen( UserInfo userInfo, - LMessung messung, - MessungTranslation messungTranslation + Messung messung ) { messung.setProbeId(this.currentProbeId); repository.create(messung, "land"); - messungTranslation.setMessungsId(messung); - repository.create(messungTranslation, "land"); return true; } @@ -144,7 +137,7 @@ * @param orte List of {@link LOrt} objects. * @return success */ - public boolean writeLOrte(UserInfo userInfo, LOrtszuordnung ort) { + public boolean writeOrtszuordung(UserInfo userInfo, Ortszuordnung ort) { ort.setProbeId(this.currentProbeId); repository.create(ort, "land"); return true; @@ -159,9 +152,9 @@ */ public boolean writeProbenKommentare( UserInfo userInfo, - List<LKommentarP> kommentare + List<KommentarP> kommentare ) { - for(LKommentarP kommentar: kommentare) { + for(KommentarP kommentar: kommentare) { kommentar.setProbeId(this.currentProbeId); repository.create(kommentar, "land"); } @@ -177,10 +170,10 @@ */ public boolean writeMessungKommentare( UserInfo userInfo, - Map<LMessung, List<LKommentarM>> kommentare + Map<Messung, List<KommentarM>> kommentare ) { - for (LMessung messung : kommentare.keySet()) { - for (LKommentarM kommentar: kommentare.get(messung)) { + for (Messung messung : kommentare.keySet()) { + for (KommentarM kommentar: kommentare.get(messung)) { kommentar.setMessungsId(messung.getId()); repository.create(kommentar, "land"); } @@ -197,10 +190,10 @@ */ public boolean writeMesswerte( UserInfo userInfo, - Map<LMessung, List<LMesswert>> werte + Map<Messung, List<Messwert>> werte ) { - for (LMessung messung : werte.keySet()) { - for(LMesswert messwert: werte.get(messung)) { + for (Messung messung : werte.keySet()) { + for (Messwert messwert: werte.get(messung)) { messwert.setMessungsId(messung.getId()); repository.create(messwert, "land"); }