# HG changeset patch # User Raimund Renkert # Date 1449139263 -3600 # Node ID 092e673cbb8d1fd95eada7f66f5e289d602d8b24 # Parent c77b340db5fea11a0c14592a794365c5dfab23a5 Added and updated model, services, etc for to fit the new db schema. diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/exporter/laf/LafCreator.java --- a/src/main/java/de/intevation/lada/exporter/laf/LafCreator.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/exporter/laf/LafCreator.java Thu Dec 03 11:41:03 2015 +0100 @@ -19,7 +19,7 @@ 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.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.land.LProbe; import de.intevation.lada.model.land.LZusatzWert; import de.intevation.lada.model.land.ProbeTranslation; @@ -27,7 +27,7 @@ import de.intevation.lada.model.stamm.Messgroesse; import de.intevation.lada.model.stamm.ProbenZusatz; import de.intevation.lada.model.stamm.Probenart; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -197,30 +197,31 @@ */ @SuppressWarnings("unchecked") private String writeOrt(LProbe probe) { - QueryBuilder builder = - new QueryBuilder( + QueryBuilder builder = + new QueryBuilder( repository.entityManager("land"), - LOrt.class); + LOrtszuordnung.class); builder.and("probeId", probe.getId()); Response objects = repository.filter(builder.getQuery(), "land"); - List orte = (List)objects.getData(); + List orte = + (List)objects.getData(); String laf = ""; - for(LOrt o : orte) { + for(LOrtszuordnung o : orte) { laf += "%ORT%\n"; - QueryBuilder oBuilder = - new QueryBuilder( + QueryBuilder oBuilder = + new QueryBuilder( repository.entityManager("stamm"), - SOrt.class); - oBuilder.and("id", o.getOrt()); - List sOrte= - (List)repository.filter( + Ort.class); + oBuilder.and("id", o.getOrtId()); + List sOrte= + (List)repository.filter( oBuilder.getQuery(), "stamm").getData(); laf += lafLine("ORT_CODE", - "\"" + sOrte.get(0).getBezeichnung() + "\""); - laf += lafLine("ORT_TYP", "\"" + o.getOrtsTyp() + "\""); + "\"" + sOrte.get(0).getAnlageId() + "\""); + laf += lafLine("ORT_TYP", "\"" + o.getOrtszuordnungTyp() + "\""); laf += o.getOrtszusatztext() == null ? "": lafLine("ORT_ZUSATZTEXT", "\"" + o.getOrtszusatztext() + "\""); laf += lafLine("ORT_LAND_S", String.valueOf(sOrte.get(0).getStaatId())); @@ -230,7 +231,7 @@ koord += sOrte.get(0).getLatitude(); //TODO: use table koordinatenart and koord*extern! laf += lafLine("ORT_KOORDINATEN_S", koord); - laf += lafLine("ORT_GEMEINDESCHLUESSEL", sOrte.get(0).getVerwaltungseinheitId()); + laf += lafLine("ORT_GEMEINDESCHLUESSEL", sOrte.get(0).getOrtId()); } return laf; } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/factory/ProbeFactory.java --- a/src/main/java/de/intevation/lada/factory/ProbeFactory.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/factory/ProbeFactory.java Thu Dec 03 11:41:03 2015 +0100 @@ -19,7 +19,7 @@ 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.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.land.LProbe; import de.intevation.lada.model.land.Messprogramm; import de.intevation.lada.model.land.MessprogrammMmt; @@ -27,7 +27,7 @@ import de.intevation.lada.model.land.ProbeTranslation; import de.intevation.lada.model.stamm.DeskriptorUmwelt; import de.intevation.lada.model.stamm.Deskriptoren; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -208,17 +208,17 @@ } if (messprogramm.getOrtId() != null && !messprogramm.getOrtId().equals("")) { - LOrt ort = new LOrt(); - ort.setOrtsTyp("E"); + LOrtszuordnung ort = new LOrtszuordnung(); + ort.setOrtszuordnungTyp("E"); ort.setProbeId(probe.getId()); - QueryBuilder ortBuilder = new QueryBuilder( - repository.entityManager("stamm"), SOrt.class); + QueryBuilder ortBuilder = new QueryBuilder( + repository.entityManager("stamm"), Ort.class); ortBuilder.and("id", messprogramm.getOrtId()); Response ortResponse = repository.filter(ortBuilder.getQuery(), "stamm"); @SuppressWarnings("unchecked") - List orte = (List) ortResponse.getData(); + List orte = (List) ortResponse.getData(); if (orte != null && !orte.isEmpty()) { - ort.setOrt(BigInteger.valueOf(orte.get(0).getId())); + ort.setOrtId(Long.valueOf(orte.get(0).getId())); } repository.create(ort, "land"); } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/importer/laf/LafParser.java --- a/src/main/java/de/intevation/lada/importer/laf/LafParser.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/importer/laf/LafParser.java Thu Dec 03 11:41:03 2015 +0100 @@ -18,7 +18,7 @@ import de.intevation.lada.importer.ReportItem; import de.intevation.lada.model.land.LMessung; -import de.intevation.lada.model.land.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.land.LProbe; import de.intevation.lada.util.auth.UserInfo; import de.intevation.lada.validation.Validator; @@ -215,7 +215,7 @@ } } writer.writeOrte(userInfo, producer.getOrte()); - for (LOrt ort: producer.getLOrte()) { + for (LOrtszuordnung ort: producer.getLOrte()) { Violation oViolation = ortValidator.validate(ort); if (oViolation.hasErrors()) { ReportItem oErr = new ReportItem("validation", oViolation.getErrors(), null); diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/importer/laf/LafProducer.java --- a/src/main/java/de/intevation/lada/importer/laf/LafProducer.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/importer/laf/LafProducer.java Thu Dec 03 11:41:03 2015 +0100 @@ -15,17 +15,16 @@ import javax.inject.Inject; import de.intevation.lada.importer.ReportItem; -import de.intevation.lada.model.Ort; 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.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.land.LProbe; import de.intevation.lada.model.land.LZusatzWert; import de.intevation.lada.model.land.MessungTranslation; import de.intevation.lada.model.land.ProbeTranslation; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.stamm.Ort; /** * The LAFProducer creates entity objects form key-value pairs using the @@ -79,12 +78,12 @@ /** * Orte created by this producer. */ - private List lorte; + private List lorte; /** * SOrte created by this producer. */ - private List orte; + private List orte; /** * Messwerte created by this producer. @@ -139,7 +138,7 @@ this.pKommentare = new ArrayList(); this.mKommentare = new HashMap>(); this.messungen = new HashMap(); - this.lorte = new ArrayList(); + this.lorte = new ArrayList(); this.messwerte = new HashMap>(); String fileName = "/import.json"; LafFormat format = new LafFormat(); @@ -333,14 +332,14 @@ /** * @return List of {@link Ort} entities. */ - public List getOrte() { + public List getOrte() { return this.orte; } /** * @return List of {@link LOrt} entities. */ - public List getLOrte() { + public List getLOrte() { return this.lorte; } @@ -381,8 +380,8 @@ this.probe = new LProbe(); this.messungen = new HashMap(); this.messung = null; - this.lorte = new ArrayList(); - this.orte = new ArrayList(); + this.lorte = new ArrayList(); + this.orte = new ArrayList(); this.ort.reset(); this.messwerte = new HashMap>(); this.mKommentare = new HashMap>(); @@ -413,11 +412,11 @@ */ public void newOrt() { if (this.ort != null) { - SOrt o = this.ort.toOrt(); + Ort o = this.ort.toOrt(); if (o != null) { this.orte.add(o); } - LOrt lo = this.ort.toLOrt(); + LOrtszuordnung lo = this.ort.toLOrt(); if (lo != null) { this.lorte.add(lo); } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/importer/laf/LafWriter.java --- a/src/main/java/de/intevation/lada/importer/laf/LafWriter.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/importer/laf/LafWriter.java Thu Dec 03 11:41:03 2015 +0100 @@ -19,11 +19,11 @@ 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.LOrt; +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.SOrt; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.util.annotation.AuthorizationConfig; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.auth.Authorization; @@ -133,7 +133,7 @@ * @param orte List of {@link SOrt} objects. * @return success */ - public boolean writeOrte(UserInfo userInfo, List orte) { + public boolean writeOrte(UserInfo userInfo, List orte) { return true; } @@ -144,7 +144,7 @@ * @param orte List of {@link LOrt} objects. * @return success */ - public boolean writeLOrte(UserInfo userInfo, LOrt ort) { + public boolean writeLOrte(UserInfo userInfo, LOrtszuordnung ort) { ort.setProbeId(this.currentProbeId); repository.create(ort, "land"); return true; diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/importer/laf/OrtCreator.java --- a/src/main/java/de/intevation/lada/importer/laf/OrtCreator.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/importer/laf/OrtCreator.java Thu Dec 03 11:41:03 2015 +0100 @@ -16,8 +16,8 @@ import org.apache.log4j.Logger; import de.intevation.lada.importer.ReportItem; -import de.intevation.lada.model.land.LOrt; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.land.LOrtszuordnung; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.model.stamm.Staat; import de.intevation.lada.model.stamm.Verwaltungseinheit; import de.intevation.lada.util.annotation.RepositoryConfig; @@ -401,12 +401,12 @@ * * @return The new Ort. */ - public SOrt toOrt() { + public Ort toOrt() { if (this.ortCode != null && this.ortCode.length() > 0) { return null; } logger.debug("create a new ort"); - SOrt ort = new SOrt(); + Ort ort = new Ort(); repository.create(ort, "stamm"); this.ortId = ort.getId(); boolean koord = true; @@ -460,14 +460,14 @@ if (this.nuts != null && this.nuts.length() > 0) { ort.setNutsCode(nuts); } - else if (ort.getVerwaltungseinheitId() != null && - ort.getVerwaltungseinheitId().length() > 0) + else if (ort.getGemId() != null && + ort.getGemId().length() > 0) { QueryBuilder builder = new QueryBuilder( repository.entityManager("stamm"), Verwaltungseinheit.class); - builder.and("id", ort.getVerwaltungseinheitId()); + builder.and("id", ort.getGemId()); @SuppressWarnings("unchecked") List einheit = (List)repository.filter( @@ -478,7 +478,7 @@ ort.setNutsCode(einheit.get(0).getNuts()); } } - ort.setBeschreibung(beschreibung); + ort.setLangtext(beschreibung); if (this.hoehe != null) { ort.setHoeheLand(Float.valueOf(hoehe)); } @@ -494,7 +494,7 @@ * @param koord Set the coordinates or not. * @return The Ort object. */ - private SOrt setLandLang(SOrt ort, boolean koord) { + private Ort setLandLang(Ort ort, boolean koord) { QueryBuilder builder = new QueryBuilder( repository.entityManager("stamm"), @@ -526,7 +526,7 @@ * @param koord Set the coordinates or not. * @return The Ort object. */ - private SOrt setLandKurz(SOrt ort, boolean koord) { + private Ort setLandKurz(Ort ort, boolean koord) { QueryBuilder builder = new QueryBuilder( repository.entityManager("stamm"), @@ -558,7 +558,7 @@ * @param koord Set the coordinates or not. * @return The Ort object. */ - private SOrt setLandS(SOrt ort, boolean koord) { + private Ort setLandS(Ort ort, boolean koord) { ort.setStaatId(Integer.valueOf(this.landS)); if (koord) { QueryBuilder builder = @@ -592,7 +592,7 @@ * @param koord Set the coordinates or not. * @return The Ort object. */ - private SOrt setGemeinde(SOrt ort, boolean koord) { + private Ort setGemeinde(Ort ort, boolean koord) { QueryBuilder builder = new QueryBuilder( repository.entityManager("stamm"), @@ -607,7 +607,7 @@ this.warnings.add(new ReportItem("verwaltungseinheit", null, 631)); return ort; } - ort.setVerwaltungseinheitId(einheit.get(0).getId()); + ort.setGemId(einheit.get(0).getId()); if (koord) { ort.setKoordXExtern(einheit.get(0).getKoordXExtern()); ort.setKoordYExtern(einheit.get(0).getKoordYExtern()); @@ -623,8 +623,8 @@ * @param koord Set the coordinates or not. * @return The Ort object. */ - private SOrt setGemeindeS(SOrt ort, boolean koord) { - ort.setVerwaltungseinheitId(this.gemSchluessel); + private Ort setGemeindeS(Ort ort, boolean koord) { + ort.setGemId(this.gemSchluessel); if (koord) { QueryBuilder builder = new QueryBuilder( @@ -652,7 +652,7 @@ * @param ort The ort object. * @return The Ort object. */ - private SOrt setKoordinaten(SOrt ort) { + private Ort setKoordinaten(Ort ort) { String art = ""; String x = ""; String y = ""; @@ -685,7 +685,7 @@ } ort.setKoordXExtern(x); ort.setKoordYExtern(y); - ort.setKoordinatenartId(Integer.valueOf(art)); + ort.setKdaId(Integer.valueOf(art)); return ort; } @@ -695,7 +695,7 @@ * @param ort The ort object. * @return The Ort object. */ - private SOrt setKoordinatenS(SOrt ort) { + private Ort setKoordinatenS(Ort ort) { String art = ""; String x = ""; String y = ""; @@ -730,7 +730,7 @@ ort.setLongitude(Double.valueOf(x)); ort.setKoordYExtern(y); ort.setLatitude(Double.valueOf(y)); - ort.setKoordinatenartId(Integer.valueOf(art)); + ort.setKdaId(Integer.valueOf(art)); return ort; } @@ -739,31 +739,31 @@ * * @return The new LOrt object. */ - public LOrt toLOrt() { + public LOrtszuordnung toLOrt() { if (this.ortId == null && (this.ortCode == null || this.ortCode.length() == 0) ) { return null; } if(this.ortCode != null && this.ortCode.length() > 0) { - QueryBuilder builder = - new QueryBuilder( + QueryBuilder builder = + new QueryBuilder( repository.entityManager("stamm"), - SOrt.class); + Ort.class); builder.and("bezeichnung", this.ortCode); @SuppressWarnings("unchecked") - List orte= - (List)repository.filter( + List orte= + (List)repository.filter( builder.getQuery(), "stamm").getData(); if (orte != null && !orte.isEmpty()) { this.ortId = orte.get(0).getId(); } } - LOrt ort = new LOrt(); - ort.setOrt(BigInteger.valueOf(this.ortId)); + LOrtszuordnung ort = new LOrtszuordnung(); + ort.setOrtId(Long.valueOf(this.ortId)); ort.setProbeId(this.probeId); - ort.setOrtsTyp(this.ortTyp); + ort.setOrtszuordnungTyp(this.ortTyp); ort.setOrtszusatztext(this.zusatztext); return ort; } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/Ort.java --- a/src/main/java/de/intevation/lada/model/Ort.java Wed Dec 02 14:07:26 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model; - -import java.io.Serializable; -import java.math.BigInteger; -import java.sql.Timestamp; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.Transient; - - -/** - * The persistent class for the ort database table. - */ -@MappedSuperclass -@Table(name="ort") -public class Ort implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - @Column(name="id", unique=true, nullable=false) - private Integer id; - - @Column(name="letzte_aenderung") - private Timestamp letzteAenderung; - - @Column(name="orts_typ") - private String ortsTyp; - - private String ortszusatztext; - - @Column(name="probe_id") - private Integer probeId; - - @Column(name="ort_id") - private BigInteger ort; - - @Transient - private boolean owner; - - @Transient - private boolean readonly; - - public Ort() { - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Timestamp getLetzteAenderung() { - return this.letzteAenderung; - } - - public void setLetzteAenderung(Timestamp letzteAenderung) { - this.letzteAenderung = letzteAenderung; - } - - public String getOrtsTyp() { - return this.ortsTyp; - } - - public void setOrtsTyp(String ortsTyp) { - this.ortsTyp = ortsTyp; - } - - public String getOrtszusatztext() { - return this.ortszusatztext; - } - - public void setOrtszusatztext(String ortszusatztext) { - this.ortszusatztext = ortszusatztext; - } - - public Integer getProbeId() { - return this.probeId; - } - - public void setProbeId(Integer probeId) { - this.probeId = probeId; - } - - public BigInteger getOrt() { - return this.ort; - } - - public void setOrt(BigInteger ort) { - this.ort = ort; - } - - public boolean isOwner() { - return owner; - } - - public void setOwner(boolean owner) { - this.owner = owner; - } - - public boolean isReadonly() { - return readonly; - } - - public void setReadonly(boolean readonly) { - this.readonly = readonly; - } -} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/Ortszuordnung.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/Ortszuordnung.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,88 @@ +package de.intevation.lada.model; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Table; + + +/** + * The persistent class for the ortszuordnung database table. + */ +@MappedSuperclass +@Table(name="ortszuordnung") +public class Ortszuordnung implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + @Column(name="ort_id") + private Long ortId; + + @Column(name="ortszuordnung_typ") + private String ortszuordnungTyp; + + private String ortszusatztext; + + @Column(name="probe_id") + private Integer probeId; + + public Ortszuordnung() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public Long getOrtId() { + return this.ortId; + } + + public void setOrtId(Long ortId) { + this.ortId = ortId; + } + + public String getOrtszuordnungTyp() { + return this.ortszuordnungTyp; + } + + public void setOrtszuordnungTyp(String ortszuordnungTyp) { + this.ortszuordnungTyp = ortszuordnungTyp; + } + + public String getOrtszusatztext() { + return this.ortszusatztext; + } + + public void setOrtszusatztext(String ortszusatztext) { + this.ortszusatztext = ortszusatztext; + } + + public Integer getProbeId() { + return this.probeId; + } + + public void setProbeId(Integer probeId) { + this.probeId = probeId; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/bund/Ort.java --- a/src/main/java/de/intevation/lada/model/bund/Ort.java Wed Dec 02 14:07:26 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model.bund; - -import javax.persistence.Entity; -import javax.persistence.Table; - - -/** - * The persistent class for the ort database table. - */ -@Entity -@Table(name="ort") -public class Ort extends de.intevation.lada.model.Ort { - private static final long serialVersionUID = 1L; - -} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/bund/Ortszuordnung.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/bund/Ortszuordnung.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,21 @@ +/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU GPL (v>=3) + * and comes with ABSOLUTELY NO WARRANTY! Check out + * the documentation coming with IMIS-Labordaten-Application for details. + */ +package de.intevation.lada.model.bund; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * The persistent class for the ortszuordung database table. + */ +@Entity +@Table(name="ortszuordung") +public class Ortszuordnung extends de.intevation.lada.model.Ortszuordnung { + private static final long serialVersionUID = 1L; + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/land/LOrt.java --- a/src/main/java/de/intevation/lada/model/land/LOrt.java Wed Dec 02 14:07:26 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model.land; - -import java.sql.Timestamp; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; - - -/** - * The persistent class for the ort database table. - */ -@Entity -@Table(name="ort") -public class LOrt extends de.intevation.lada.model.Ort { - private static final long serialVersionUID = 1L; - - @Column(name="tree_modified", insertable=false, updatable=false) - private Timestamp treeModified; - - @OneToOne - @JoinColumn(name="probe_id", insertable=false, updatable=false) - private LProbe probe; - - @Transient - private Timestamp parentModified; - - public Timestamp getTreeModified() { - return treeModified; - } - - public void setTreeModified(Timestamp treeModified) { - this.treeModified = treeModified; - } - - public Timestamp getParentModified() { - if (this.parentModified == null && this.probe != null) { - return this.probe.getTreeModified(); - } - return this.parentModified; - } - - public void setParentModified(Timestamp parentModified) { - this.parentModified = parentModified; - } -} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/land/LOrtszuordnung.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/land/LOrtszuordnung.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,31 @@ +package de.intevation.lada.model.land; + +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + + +/** + * The persistent class for the ortszuordnung database table. + */ +@Entity +@Table(name="ortszuordnung") +public class LOrtszuordnung extends de.intevation.lada.model.Ortszuordnung { + private static final long serialVersionUID = 1L; + + @Column(name="tree_modified") + private Timestamp treeModified; + + public LOrtszuordnung() { + } + + public Timestamp getTreeModified() { + return this.treeModified; + } + + public void setTreeModified(Timestamp treeModified) { + this.treeModified = treeModified; + } +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/DatensatzErzeuger.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/stamm/DatensatzErzeuger.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,89 @@ +package de.intevation.lada.model.stamm; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + + +/** + * The persistent class for the datensatz_erzeuger database table. + * + */ +@Entity +@Table(name="datensatz_erzeuger") +public class DatensatzErzeuger implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + private String bezeichnung; + + @Column(name="da_erzeuger_id") + private String daErzeugerId; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + @Column(name="mst_id") + private String mstId; + + @Column(name="netzbetreiber_id") + private String netzbetreiberId; + + public DatensatzErzeuger() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBezeichnung() { + return this.bezeichnung; + } + + public void setBezeichnung(String bezeichnung) { + this.bezeichnung = bezeichnung; + } + + public String getDaErzeugerId() { + return this.daErzeugerId; + } + + public void setDaErzeugerId(String daErzeugerId) { + this.daErzeugerId = daErzeugerId; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public String getMstId() { + return this.mstId; + } + + public void setMstId(String mstId) { + this.mstId = mstId; + } + + public String getNetzbetreiberId() { + return this.netzbetreiberId; + } + + public void setNetzbetreiberId(String netzbetreiberId) { + this.netzbetreiberId = netzbetreiberId; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/MessprogrammKategorie.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/stamm/MessprogrammKategorie.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,78 @@ +package de.intevation.lada.model.stamm; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + + +/** + * The persistent class for the messprogramm_kategorie database table. + * + */ +@Entity +@Table(name="messprogramm_kategorie") +public class MessprogrammKategorie implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + private String bezeichnung; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + @Column(name="mpl_id") + private String mplId; + + @Column(name="netzbetreiber_id") + private String netzbetreiberId; + + public MessprogrammKategorie() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBezeichnung() { + return this.bezeichnung; + } + + public void setBezeichnung(String bezeichnung) { + this.bezeichnung = bezeichnung; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public String getMplId() { + return this.mplId; + } + + public void setMplId(String mplId) { + this.mplId = mplId; + } + + public String getNetzbetreiberId() { + return this.netzbetreiberId; + } + + public void setNetzbetreiberId(String netzbetreiberId) { + this.netzbetreiberId = netzbetreiberId; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/Ort.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/stamm/Ort.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,309 @@ +package de.intevation.lada.model.stamm; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + + +/** + * The persistent class for the ort database table. + * + */ +@Entity +@Table(name="ort") +public class Ort implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + private String aktiv; + + @Column(name="anlage_id") + private Integer anlageId; + + private String berichtstext; + + @Column(name="gem_id") + private String gemId; + + private Object geom; + + @Column(name="hoehe_land") + private float hoeheLand; + + @Column(name="kda_id") + private Integer kdaId; + + @Column(name="koord_x_extern") + private String koordXExtern; + + @Column(name="koord_y_extern") + private String koordYExtern; + + private String kurztext; + + private String langtext; + + private double latitude; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + private double longitude; + + @Column(name="mp_art") + private String mpArt; + + @Column(name="netzbetreiber_id") + private String netzbetreiberId; + + @Column(name="nuts_code") + private String nutsCode; + + @Column(name="ort_id") + private String ortId; + + @Column(name="ort_typ") + private Integer ortTyp; + + @Column(name="oz_id") + private Integer ozId; + + private String sektor; + + private Object shape; + + @Column(name="staat_id") + private Integer staatId; + + private String unscharf; + + private String zone; + + private String zustaendigkeit; + + public Ort() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getAktiv() { + return this.aktiv; + } + + public void setAktiv(String aktiv) { + this.aktiv = aktiv; + } + + public Integer getAnlageId() { + return this.anlageId; + } + + public void setAnlageId(Integer anlageId) { + this.anlageId = anlageId; + } + + public String getBerichtstext() { + return this.berichtstext; + } + + public void setBerichtstext(String berichtstext) { + this.berichtstext = berichtstext; + } + + public String getGemId() { + return this.gemId; + } + + public void setGemId(String gemId) { + this.gemId = gemId; + } + + public Object getGeom() { + return this.geom; + } + + public void setGeom(Object geom) { + this.geom = geom; + } + + public float getHoeheLand() { + return this.hoeheLand; + } + + public void setHoeheLand(float hoeheLand) { + this.hoeheLand = hoeheLand; + } + + public Integer getKdaId() { + return this.kdaId; + } + + public void setKdaId(Integer kdaId) { + this.kdaId = kdaId; + } + + public String getKoordXExtern() { + return this.koordXExtern; + } + + public void setKoordXExtern(String koordXExtern) { + this.koordXExtern = koordXExtern; + } + + public String getKoordYExtern() { + return this.koordYExtern; + } + + public void setKoordYExtern(String koordYExtern) { + this.koordYExtern = koordYExtern; + } + + public String getKurztext() { + return this.kurztext; + } + + public void setKurztext(String kurztext) { + this.kurztext = kurztext; + } + + public String getLangtext() { + return this.langtext; + } + + public void setLangtext(String langtext) { + this.langtext = langtext; + } + + public double getLatitude() { + return this.latitude; + } + + public void setLatitude(double latitude) { + this.latitude = latitude; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public double getLongitude() { + return this.longitude; + } + + public void setLongitude(double longitude) { + this.longitude = longitude; + } + + public String getMpArt() { + return this.mpArt; + } + + public void setMpArt(String mpArt) { + this.mpArt = mpArt; + } + + public String getNetzbetreiberId() { + return this.netzbetreiberId; + } + + public void setNetzbetreiberId(String netzbetreiberId) { + this.netzbetreiberId = netzbetreiberId; + } + + public String getNutsCode() { + return this.nutsCode; + } + + public void setNutsCode(String nutsCode) { + this.nutsCode = nutsCode; + } + + public String getOrtId() { + return this.ortId; + } + + public void setOrtId(String ortId) { + this.ortId = ortId; + } + + public Integer getOrtTyp() { + return this.ortTyp; + } + + public void setOrtTyp(Integer ortTyp) { + this.ortTyp = ortTyp; + } + + public Integer getOzId() { + return this.ozId; + } + + public void setOzId(Integer ozId) { + this.ozId = ozId; + } + + public String getSektor() { + return this.sektor; + } + + public void setSektor(String sektor) { + this.sektor = sektor; + } + + public Object getShape() { + return this.shape; + } + + public void setShape(Object shape) { + this.shape = shape; + } + + public Integer getStaatId() { + return this.staatId; + } + + public void setStaatId(Integer staatId) { + this.staatId = staatId; + } + + public String getUnscharf() { + return this.unscharf; + } + + public void setUnscharf(String unscharf) { + this.unscharf = unscharf; + } + + public String getZone() { + return this.zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getZustaendigkeit() { + return this.zustaendigkeit; + } + + public void setZustaendigkeit(String zustaendigkeit) { + this.zustaendigkeit = zustaendigkeit; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/OrtTyp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/stamm/OrtTyp.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,45 @@ +package de.intevation.lada.model.stamm; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + + +/** + * The persistent class for the ort_typ database table. + * + */ +@Entity +@Table(name="ort_typ") +public class OrtTyp implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + @Column(name="ort_typ") + private String ortTyp; + + public OrtTyp() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getOrtTyp() { + return this.ortTyp; + } + + public void setOrtTyp(String ortTyp) { + this.ortTyp = ortTyp; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/Probenehmer.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/stamm/Probenehmer.java Thu Dec 03 11:41:03 2015 +0100 @@ -0,0 +1,177 @@ +package de.intevation.lada.model.stamm; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; + + +/** + * The persistent class for the probenehmer database table. + * + */ +@Entity +public class Probenehmer implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + private String bearbeiter; + + private String bemerkung; + + private String betrieb; + + private String bezeichnung; + + @Column(name="kurz_bezeichnung") + private String kurzBezeichnung; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + @Column(name="netzbetreiber_id") + private String netzbetreiberId; + + private String ort; + + private String plz; + + @Column(name="prn_id") + private String prnId; + + private String strasse; + + private String telefon; + + private String tp; + + private String typ; + + public Probenehmer() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBearbeiter() { + return this.bearbeiter; + } + + public void setBearbeiter(String bearbeiter) { + this.bearbeiter = bearbeiter; + } + + public String getBemerkung() { + return this.bemerkung; + } + + public void setBemerkung(String bemerkung) { + this.bemerkung = bemerkung; + } + + public String getBetrieb() { + return this.betrieb; + } + + public void setBetrieb(String betrieb) { + this.betrieb = betrieb; + } + + public String getBezeichnung() { + return this.bezeichnung; + } + + public void setBezeichnung(String bezeichnung) { + this.bezeichnung = bezeichnung; + } + + public String getKurzBezeichnung() { + return this.kurzBezeichnung; + } + + public void setKurzBezeichnung(String kurzBezeichnung) { + this.kurzBezeichnung = kurzBezeichnung; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public String getNetzbetreiberId() { + return this.netzbetreiberId; + } + + public void setNetzbetreiberId(String netzbetreiberId) { + this.netzbetreiberId = netzbetreiberId; + } + + public String getOrt() { + return this.ort; + } + + public void setOrt(String ort) { + this.ort = ort; + } + + public String getPlz() { + return this.plz; + } + + public void setPlz(String plz) { + this.plz = plz; + } + + public String getPrnId() { + return this.prnId; + } + + public void setPrnId(String prnId) { + this.prnId = prnId; + } + + public String getStrasse() { + return this.strasse; + } + + public void setStrasse(String strasse) { + this.strasse = strasse; + } + + public String getTelefon() { + return this.telefon; + } + + public void setTelefon(String telefon) { + this.telefon = telefon; + } + + public String getTp() { + return this.tp; + } + + public void setTp(String tp) { + this.tp = tp; + } + + public String getTyp() { + return this.typ; + } + + public void setTyp(String typ) { + this.typ = typ; + } + +} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/model/stamm/SOrt.java --- a/src/main/java/de/intevation/lada/model/stamm/SOrt.java Wed Dec 02 14:07:26 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,214 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model.stamm; - -import java.io.Serializable; -import java.sql.Timestamp; - -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - -import org.apache.log4j.Logger; - - -/** - * The persistent class for the ort database table. - */ -@Entity -@Table(name="ort") -public class SOrt implements Serializable { - private static final long serialVersionUID = 1L; - @Inject - @Transient - private Logger logger = Logger.getLogger(SOrt.class); - - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - @Column(name="id", nullable=false, insertable=false) - private Integer id; - - private String beschreibung; - - private String bezeichnung; - - @Column(name="hoehe_land") - private Float hoeheLand; - - @Column(name="koord_x_extern") - private String koordXExtern; - - @Column(name="koord_y_extern") - private String koordYExtern; - - private Double latitude; - - @Column(name="letzte_aenderung") - private Timestamp letzteAenderung; - - private Double longitude; - - @Column(name="nuts_code") - private String nutsCode; - - @Column(name="o_typ") - private String oTyp; - - private String unscharf; - - @Column(name="kda_id") - private Integer koordinatenartId; - - @Column(name="netzbetreiber_id") - private String netzbetreiberId; - - @Column(name="staat_id") - private Integer staatId; - - @Column(name="gem_id") - private String verwaltungseinheitId; - - public SOrt() { - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getBeschreibung() { - return this.beschreibung; - } - - public void setBeschreibung(String beschreibung) { - this.beschreibung = beschreibung; - } - - public String getBezeichnung() { - return this.bezeichnung; - } - - public void setBezeichnung(String bezeichnung) { - this.bezeichnung = bezeichnung; - } - - public Float getHoeheLand() { - return this.hoeheLand; - } - - public void setHoeheLand(Float hoeheLand) { - this.hoeheLand = hoeheLand; - } - - public String getKoordXExtern() { - return this.koordXExtern; - } - - public void setKoordXExtern(String koordXExtern) { - this.koordXExtern = koordXExtern; - } - - public String getKoordYExtern() { - return this.koordYExtern; - } - - public void setKoordYExtern(String koordYExtern) { - this.koordYExtern = koordYExtern; - } - - public Double getLatitude() { - return this.latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public Timestamp getLetzteAenderung() { - logger.debug("get date: " + this.letzteAenderung.toString()); - return this.letzteAenderung; - } - - public void setLetzteAenderung(Timestamp letzteAenderung) { - logger.debug("set date: " + letzteAenderung.toString()); - this.letzteAenderung = letzteAenderung; - } - - public Double getLongitude() { - return this.longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getNutsCode() { - return this.nutsCode; - } - - public void setNutsCode(String nutsCode) { - this.nutsCode = nutsCode; - } - - public String getOTyp() { - return this.oTyp; - } - - public void setOTyp(String oTyp) { - this.oTyp = oTyp; - } - - public String getUnscharf() { - return this.unscharf; - } - - public void setUnscharf(String unscharf) { - this.unscharf = unscharf; - } - - public Integer getKoordinatenartId() { - return this.koordinatenartId; - } - - public void setKoordinatenartId(Integer koordinatenartId) { - this.koordinatenartId = koordinatenartId; - } - - public String getNetzbetreiberId() { - return this.netzbetreiberId; - } - - public void setNetzbetreiberId(String netzbetreiberId) { - this.netzbetreiberId = netzbetreiberId; - } - - public Integer getStaatId() { - return this.staatId; - } - - public void setStaatId(Integer staatId) { - this.staatId = staatId; - } - - public String getVerwaltungseinheitId() { - return this.verwaltungseinheitId; - } - - public void setVerwaltungseinheitId(String verwaltungseinheitId) { - this.verwaltungseinheitId = verwaltungseinheitId; - } - -} diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/rest/OrtService.java --- a/src/main/java/de/intevation/lada/rest/OrtService.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/rest/OrtService.java Thu Dec 03 11:41:03 2015 +0100 @@ -31,7 +31,7 @@ import de.intevation.lada.lock.LockConfig; import de.intevation.lada.lock.LockType; import de.intevation.lada.lock.ObjectLocker; -import de.intevation.lada.model.land.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.util.annotation.AuthorizationConfig; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.auth.Authorization; @@ -136,18 +136,18 @@ MultivaluedMap params = info.getQueryParameters(); if (params.isEmpty() || !params.containsKey("probeId")) { logger.debug("get all"); - return defaultRepo.getAll(LOrt.class, "land"); + return defaultRepo.getAll(LOrtszuordnung.class, "land"); } String probeId = params.getFirst("probeId"); - QueryBuilder builder = - new QueryBuilder( + QueryBuilder builder = + new QueryBuilder( defaultRepo.entityManager("land"), - LOrt.class); + LOrtszuordnung.class); builder.and("probeId", probeId); return authorization.filter( request, defaultRepo.filter(builder.getQuery(), "land"), - LOrt.class); + LOrtszuordnung.class); } /** @@ -168,8 +168,8 @@ @PathParam("id") String id ) { Response response = - defaultRepo.getById(LOrt.class, Integer.valueOf(id), "land"); - LOrt ort = (LOrt)response.getData(); + defaultRepo.getById(LOrtszuordnung.class, Integer.valueOf(id), "land"); + LOrtszuordnung ort = (LOrtszuordnung)response.getData(); Violation violation = validator.validate(ort); if (violation.hasErrors() || violation.hasWarnings()) { response.setErrors(violation.getErrors()); @@ -178,7 +178,7 @@ return authorization.filter( request, response, - LOrt.class); + LOrtszuordnung.class); } /** @@ -209,13 +209,13 @@ public Response create( @Context HttpHeaders headers, @Context HttpServletRequest request, - LOrt ort + LOrtszuordnung ort ) { if (!authorization.isAuthorized( request, ort, RequestMethod.POST, - LOrt.class)) { + LOrtszuordnung.class)) { return new Response(false, 699, null); } Violation violation = validator.validate(ort); @@ -235,7 +235,7 @@ return authorization.filter( request, response, - LOrt.class); + LOrtszuordnung.class); } /** @@ -266,13 +266,13 @@ public Response update( @Context HttpHeaders headers, @Context HttpServletRequest request, - LOrt ort + LOrtszuordnung ort ) { if (!authorization.isAuthorized( request, ort, RequestMethod.PUT, - LOrt.class)) { + LOrtszuordnung.class)) { return new Response(false, 699, null); } if (lock.isLocked(ort)) { @@ -289,8 +289,8 @@ ort.setLetzteAenderung(new Timestamp(new Date().getTime())); Response response = defaultRepo.update(ort, "land"); Response updated = defaultRepo.getById( - LOrt.class, - ((LOrt)response.getData()).getId(), "land"); + LOrtszuordnung.class, + ((LOrtszuordnung)response.getData()).getId(), "land"); if(violation.hasWarnings()) { updated.setWarnings(violation.getWarnings()); } @@ -298,7 +298,7 @@ return authorization.filter( request, updated, - LOrt.class); + LOrtszuordnung.class); } /** @@ -320,13 +320,13 @@ ) { /* Get the messwert object by id*/ Response object = - defaultRepo.getById(LOrt.class, Integer.valueOf(id), "land"); - LOrt ortObj = (LOrt)object.getData(); + defaultRepo.getById(LOrtszuordnung.class, Integer.valueOf(id), "land"); + LOrtszuordnung ortObj = (LOrtszuordnung)object.getData(); if (!authorization.isAuthorized( request, ortObj, RequestMethod.PUT, - LOrt.class)) { + LOrtszuordnung.class)) { return new Response(false, 699, null); } if (lock.isLocked(ortObj)) { diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/rest/stamm/LocationService.java --- a/src/main/java/de/intevation/lada/rest/stamm/LocationService.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/rest/stamm/LocationService.java Thu Dec 03 11:41:03 2015 +0100 @@ -22,7 +22,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -97,14 +97,14 @@ ) { MultivaluedMap params = info.getQueryParameters(); if (params.isEmpty() || !params.containsKey("ortId")) { - return defaultRepo.getAll(SOrt.class, "stamm"); + return defaultRepo.getAll(Ort.class, "stamm"); } String ortId = params.getFirst("ortId"); - QueryBuilder builder = - new QueryBuilder( + QueryBuilder builder = + new QueryBuilder( defaultRepo.entityManager("stamm"), - SOrt.class); - builder.and("ortId", ortId); + Ort.class); + builder.and("id", ortId); return defaultRepo.filter(builder.getQuery(), "stamm"); } @@ -125,7 +125,7 @@ @PathParam("id") String id ) { return defaultRepo.getById( - SOrt.class, + Ort.class, Integer.valueOf(id), "stamm"); } @@ -161,7 +161,7 @@ @Produces(MediaType.APPLICATION_JSON) public Response create( @Context HttpHeaders headers, - SOrt ort + Ort ort ) { /* Persist the new object*/ return defaultRepo.create(ort, "stamm"); @@ -197,11 +197,11 @@ @PUT @Path("/{id}") @Produces(MediaType.APPLICATION_JSON) - public Response update(@Context HttpHeaders headers, SOrt ort) { + public Response update(@Context HttpHeaders headers, Ort ort) { Response response = defaultRepo.update(ort, "stamm"); Response updated = defaultRepo.getById( - SOrt.class, - ((SOrt)response.getData()).getId(), "stamm"); + Ort.class, + ((Ort)response.getData()).getId(), "stamm"); return updated; } @@ -223,8 +223,8 @@ ) { /* Get the object by id*/ Response object = - defaultRepo.getById(SOrt.class, Integer.valueOf(id), "stamm"); - SOrt ortObj = (SOrt)object.getData(); + defaultRepo.getById(Ort.class, Integer.valueOf(id), "stamm"); + Ort ortObj = (Ort)object.getData(); /* Delete the object*/ return defaultRepo.delete(ortObj, "stamm"); } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/validation/OrtValidator.java --- a/src/main/java/de/intevation/lada/validation/OrtValidator.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/validation/OrtValidator.java Thu Dec 03 11:41:03 2015 +0100 @@ -11,7 +11,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import de.intevation.lada.model.land.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.validation.annotation.ValidationConfig; import de.intevation.lada.validation.annotation.ValidationRule; import de.intevation.lada.validation.rules.Rule; @@ -35,7 +35,7 @@ @Override public Violation validate(Object object) { Violation violations = new Violation(); - if (!(object instanceof LOrt)) { + if (!(object instanceof LOrtszuordnung)) { violations.addError("ort", 602); return violations; } diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/validation/rules/ort/CoordinatesInVE.java --- a/src/main/java/de/intevation/lada/validation/rules/ort/CoordinatesInVE.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/validation/rules/ort/CoordinatesInVE.java Thu Dec 03 11:41:03 2015 +0100 @@ -16,9 +16,9 @@ import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.PrecisionModel; -import de.intevation.lada.model.land.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.stamm.DeVg; -import de.intevation.lada.model.stamm.SOrt; +import de.intevation.lada.model.stamm.Ort; import de.intevation.lada.model.stamm.Verwaltungseinheit; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; @@ -45,19 +45,19 @@ @SuppressWarnings("unchecked") @Override public Violation execute(Object object) { - LOrt ort = (LOrt)object; - if (!"E".equals(ort.getOrtsTyp())) { + LOrtszuordnung ort = (LOrtszuordnung)object; + if (!"E".equals(ort.getOrtszuordnungTyp())) { return null; } - QueryBuilder ortBuilder = - new QueryBuilder(repository.entityManager("stamm"), SOrt.class); - ortBuilder.and("id", ort.getOrt()); + QueryBuilder ortBuilder = + new QueryBuilder(repository.entityManager("stamm"), Ort.class); + ortBuilder.and("id", ort.getOrtId()); Response response = repository.filter(ortBuilder.getQuery(), "stamm"); - List orte = (List)response.getData(); + List orte = (List)response.getData(); QueryBuilder veBuilder = new QueryBuilder( repository.entityManager("stamm"), Verwaltungseinheit.class); - veBuilder.and("id", orte.get(0).getVerwaltungseinheitId()); + veBuilder.and("id", orte.get(0).getGemId()); Response ver = repository.filter(veBuilder.getQuery(), "stamm"); if (((List)ver.getData()).isEmpty()) { Violation violation = new Violation(); diff -r c77b340db5fe -r 092e673cbb8d src/main/java/de/intevation/lada/validation/rules/probe/HasEntnahmeOrt.java --- a/src/main/java/de/intevation/lada/validation/rules/probe/HasEntnahmeOrt.java Wed Dec 02 14:07:26 2015 +0100 +++ b/src/main/java/de/intevation/lada/validation/rules/probe/HasEntnahmeOrt.java Thu Dec 03 11:41:03 2015 +0100 @@ -11,7 +11,7 @@ import javax.inject.Inject; -import de.intevation.lada.model.land.LOrt; +import de.intevation.lada.model.land.LOrtszuordnung; import de.intevation.lada.model.land.LProbe; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; @@ -44,14 +44,15 @@ violation.addWarning("entnahmeOrt", 631); return violation; } - QueryBuilder builder = - new QueryBuilder(repo.entityManager("land"), LOrt.class); + QueryBuilder builder = + new QueryBuilder( + repo.entityManager("land"), LOrtszuordnung.class); builder.and("probeId", id); Response response = repo.filter(builder.getQuery(), "land"); @SuppressWarnings("unchecked") - List orte = (List)response.getData(); - for (LOrt ort: orte) { - if ("E".equals(ort.getOrtsTyp())) { + List orte = (List)response.getData(); + for (LOrtszuordnung ort: orte) { + if ("E".equals(ort.getOrtszuordnungTyp())) { return null; } }