comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java @ 8856:5e38e2924c07 3.2.x

Fix code style.
author Tom Gottfried <tom@intevation.de>
date Thu, 18 Jan 2018 20:12:01 +0100
parents 665c8326b1a6
children 0a5239a1e46e
comparison
equal deleted inserted replaced
8855:d7c005e12af0 8856:5e38e2924c07
22 import org.hibernate.Session; 22 import org.hibernate.Session;
23 import org.hibernate.type.StandardBasicTypes; 23 import org.hibernate.type.StandardBasicTypes;
24 24
25 public class SedimentLoadDataFactory 25 public class SedimentLoadDataFactory
26 { 26 {
27 private static Logger log = Logger.getLogger(SedimentLoadDataFactory.class); 27 private static Logger log = Logger.getLogger(
28 SedimentLoadDataFactory.class);
28 29
29 public static final String CACHE_NAME = "sediment-load-data"; 30 public static final String CACHE_NAME = "sediment-load-data";
30 31
31 public static final String SUSPENDED_STRING = "Schwebstoff"; 32 public static final String SUSPENDED_STRING = "Schwebstoff";
32 33
38 "sl.time_interval_id, " + 39 "sl.time_interval_id, " +
39 "sl.grain_fraction_id, " + 40 "sl.grain_fraction_id, " +
40 "sl.sq_time_interval_id " + 41 "sl.sq_time_interval_id " +
41 "FROM sediment_load sl " + 42 "FROM sediment_load sl " +
42 "JOIN sediment_load_values slv ON sl.id = slv.sediment_load_id " + 43 "JOIN sediment_load_values slv ON sl.id = slv.sediment_load_id " +
43 "JOIN measurement_station ms ON ms.id = slv.measurement_station_id " + 44 "JOIN measurement_station ms " +
45 "ON ms.id = slv.measurement_station_id " +
44 "JOIN ranges rs ON rs.id = ms.range_id " + 46 "JOIN ranges rs ON rs.id = ms.range_id " +
45 "JOIN rivers r ON r.id = rs.river_id " + 47 "JOIN rivers r ON r.id = rs.river_id " +
46 "WHERE r.name = :river) " + 48 "WHERE r.name = :river) " +
47 "SELECT " + 49 "SELECT " +
48 "sl.id AS sl_id, " + 50 "sl.id AS sl_id, " +
61 "FROM load_at_river sl " + 63 "FROM load_at_river sl " +
62 "CROSS JOIN measurement_station ms " + 64 "CROSS JOIN measurement_station ms " +
63 "JOIN ranges rs ON ms.range_id = rs.id " + 65 "JOIN ranges rs ON ms.range_id = rs.id " +
64 "JOIN rivers r ON rs.river_id = r.id " + 66 "JOIN rivers r ON rs.river_id = r.id " +
65 "JOIN time_intervals ti ON sl.time_interval_id = ti.id " + 67 "JOIN time_intervals ti ON sl.time_interval_id = ti.id " +
66 "LEFT JOIN time_intervals sqti ON sl.sq_time_interval_id = sqti.id " + 68 "LEFT JOIN time_intervals sqti " +
69 "ON sl.sq_time_interval_id = sqti.id " +
67 "JOIN grain_fraction gf ON sl.grain_fraction_id = gf.id " + 70 "JOIN grain_fraction gf ON sl.grain_fraction_id = gf.id " +
68 "LEFT JOIN sediment_load_values slv " + 71 "LEFT JOIN sediment_load_values slv " +
69 "ON ms.id=slv.measurement_station_id AND sl.id=slv.sediment_load_id " + 72 "ON ms.id=slv.measurement_station_id " +
73 "AND sl.id=slv.sediment_load_id " +
70 "WHERE (" + 74 "WHERE (" +
71 "(ms.measurement_type='Geschiebe' AND gf.name IN " + 75 "(ms.measurement_type='Geschiebe' AND gf.name IN " +
72 "('coarse', 'fine_middle', 'sand', 'susp_sand', " + 76 "('coarse', 'fine_middle', 'sand', 'susp_sand', " +
73 "'susp_sand_bed', 'bed_load', 'bed_load_susp_sand', " + 77 "'susp_sand_bed', 'bed_load', 'bed_load_susp_sand', " +
74 "'suspended_load', 'total')) " + 78 "'suspended_load', 'total')) " +
127 131
128 public SedimentLoadData getUncached(String river) { 132 public SedimentLoadData getUncached(String river) {
129 133
130 Session session = SessionHolder.HOLDER.get(); 134 Session session = SessionHolder.HOLDER.get();
131 135
132 SQLQuery sqlQuery = session.createSQLQuery(SQL_LOAD_RIVER_SEDIMENT_LOADS) 136 SQLQuery sqlQuery = session.createSQLQuery(
137 SQL_LOAD_RIVER_SEDIMENT_LOADS)
133 .addScalar("sl_id", StandardBasicTypes.INTEGER) 138 .addScalar("sl_id", StandardBasicTypes.INTEGER)
134 .addScalar("sl_kind", StandardBasicTypes.INTEGER) 139 .addScalar("sl_kind", StandardBasicTypes.INTEGER)
135 .addScalar("sl_description", StandardBasicTypes.STRING) 140 .addScalar("sl_description", StandardBasicTypes.STRING)
136 .addScalar("ti_start_time", StandardBasicTypes.TIMESTAMP) 141 .addScalar("ti_start_time", StandardBasicTypes.TIMESTAMP)
137 .addScalar("ti_stop_time", StandardBasicTypes.TIMESTAMP) 142 .addScalar("ti_stop_time", StandardBasicTypes.TIMESTAMP)

http://dive4elements.wald.intevation.org