Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/validation/rules/messung/HasPflichtmessgroessen.java @ 1097:186d602e031a
Merged branch schema-update into default.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Fri, 14 Oct 2016 18:17:42 +0200 |
parents | 3ec358698b4d |
children | 18c789672b14 |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/validation/rules/messung/HasPflichtmessgroessen.java Fri Oct 14 16:11:22 2016 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/messung/HasPflichtmessgroessen.java Fri Oct 14 18:17:42 2016 +0200 @@ -11,9 +11,9 @@ import javax.inject.Inject; -import de.intevation.lada.model.land.LMessung; -import de.intevation.lada.model.land.LMesswert; -import de.intevation.lada.model.stamm.PflichtMessgroesse; +import de.intevation.lada.model.land.Messung; +import de.intevation.lada.model.land.Messwert; +import de.intevation.lada.model.stammdaten.PflichtMessgroesse; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -38,29 +38,29 @@ @Override public Violation execute(Object object) { - LMessung messung = (LMessung)object; + Messung messung = (Messung)object; QueryBuilder<PflichtMessgroesse> builder = new QueryBuilder<PflichtMessgroesse>( repository.entityManager("stamm"), PflichtMessgroesse.class); - builder.and("mmtId", messung.getMmtId()); + builder.and("messMethodeId", messung.getMmtId()); Response response = repository.filter(builder.getQuery(), "stamm"); @SuppressWarnings("unchecked") List<PflichtMessgroesse> pflicht = (List<PflichtMessgroesse>)response.getData(); - QueryBuilder<LMesswert> wertBuilder = - new QueryBuilder<LMesswert>( - repository.entityManager("land"), LMesswert.class); + QueryBuilder<Messwert> wertBuilder = + new QueryBuilder<Messwert>( + repository.entityManager("land"), Messwert.class); wertBuilder.and("messungsId", messung.getId()); Response wertResponse = repository.filter(wertBuilder.getQuery(), "land"); @SuppressWarnings("unchecked") - List<LMesswert> messwerte = (List<LMesswert>)wertResponse.getData(); + List<Messwert> messwerte = (List<Messwert>)wertResponse.getData(); Violation violation = new Violation(); boolean missing = false; for (PflichtMessgroesse p : pflicht) { - for (LMesswert wert : messwerte) { + for (Messwert wert : messwerte) { if (!p.getMessgroesseId().equals(wert.getMessgroesseId())) { missing = true; }