Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/sinfo/importitem/TkhKmLineImport.java @ 8977:bf8a9df86f32
Two fixes for the tkh and selected additionals import
| author | mschaefer |
|---|---|
| date | Tue, 03 Apr 2018 17:23:51 +0200 |
| parents | 50416a0df385 |
| children | 1f57381b3bb5 |
comparison
equal
deleted
inserted
replaced
| 8976:e541938dd3ab | 8977:bf8a9df86f32 |
|---|---|
| 13 import java.util.List; | 13 import java.util.List; |
| 14 | 14 |
| 15 import org.dive4elements.river.importer.common.AbstractKmLineImport; | 15 import org.dive4elements.river.importer.common.AbstractKmLineImport; |
| 16 import org.dive4elements.river.model.sinfo.TkhColumn; | 16 import org.dive4elements.river.model.sinfo.TkhColumn; |
| 17 import org.dive4elements.river.model.sinfo.TkhValue; | 17 import org.dive4elements.river.model.sinfo.TkhValue; |
| 18 import org.hibernate.Query; | 18 import org.hibernate.SQLQuery; |
| 19 import org.hibernate.Session; | 19 import org.hibernate.Session; |
| 20 | 20 |
| 21 /** | 21 /** |
| 22 * Imported Transportkörperhöhe value of a river station. | 22 * Imported Transportkörperhöhe value of a river station. |
| 23 * | 23 * |
| 44 | 44 |
| 45 /***** METHODS *****/ | 45 /***** METHODS *****/ |
| 46 | 46 |
| 47 @Override | 47 @Override |
| 48 protected TkhValue queryValueItem(final Session session, final TkhColumn parent) { | 48 protected TkhValue queryValueItem(final Session session, final TkhColumn parent) { |
| 49 final Query query = session.createQuery("FROM TkhValue WHERE (tkhcolumn=:parent)" | 49 /* |
| 50 * final Query query = session.createQuery("FROM TkhValue WHERE (TkhColumn=:parent)" | |
| 51 * + " AND (station BETWEEN (:station-0.0001) AND (:station+0.0001))"); | |
| 52 * query.setParameter("parent", parent); | |
| 53 * query.setParameter("station", this.station); | |
| 54 */ | |
| 55 final SQLQuery query = session.createSQLQuery("SELECT * FROM tkh_values WHERE (tkh_column_id=:parent)" | |
| 50 + " AND (station BETWEEN (:station-0.0001) AND (:station+0.0001))"); | 56 + " AND (station BETWEEN (:station-0.0001) AND (:station+0.0001))"); |
| 51 query.setParameter("parent", parent); | 57 query.setParameter("parent", parent.getId()).setParameter("station", this.station); |
| 52 query.setParameter("station", this.station); | |
| 53 final List rows = query.list(); | 58 final List rows = query.list(); |
| 54 if (!rows.isEmpty()) | 59 if (!rows.isEmpty()) |
| 55 return (TkhValue) rows.get(0); | 60 return (TkhValue) rows.get(0); |
| 56 else | 61 else |
| 57 return null; | 62 return null; |