Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java @ 4006:d4e39cc5c10c
S(Q) relation: Removed unused field from SQL statement.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Mon, 01 Oct 2012 18:39:48 +0200 |
parents | 22abdc45869c |
children | d4d272e56d3a |
comparison
equal
deleted
inserted
replaced
4005:22abdc45869c | 4006:d4e39cc5c10c |
---|---|
34 "gp.LFDNR AS LFDNR," + | 34 "gp.LFDNR AS LFDNR," + |
35 "g.UFERABST AS UFERABST," + | 35 "g.UFERABST AS UFERABST," + |
36 "g.UFERABLINKS AS UFERABLINKS," + | 36 "g.UFERABLINKS AS UFERABLINKS," + |
37 "m.TSCHWEB AS TSCHWEB," + | 37 "m.TSCHWEB AS TSCHWEB," + |
38 "m.TSAND AS TSAND," + | 38 "m.TSAND AS TSAND," + |
39 "gp.MESSDAUER AS MESSDAUER," + | |
40 "gp.MENGE AS MENGE," + | |
41 "gp.GTRIEB AS GTRIEB," + | 39 "gp.GTRIEB AS GTRIEB," + |
42 "m.TGESCHIEBE AS TGESCHIEBE," + | 40 "m.TGESCHIEBE AS TGESCHIEBE," + |
43 "sie.SIEB01 AS SIEB01," + | 41 "sie.SIEB01 AS SIEB01," + |
44 "sie.SIEB02 AS SIEB02," + | 42 "sie.SIEB02 AS SIEB02," + |
45 "sie.SIEB03 AS SIEB03," + | 43 "sie.SIEB03 AS SIEB03," + |
182 .addScalar("LFDNR", StandardBasicTypes.INTEGER) | 180 .addScalar("LFDNR", StandardBasicTypes.INTEGER) |
183 .addScalar("UFERABST", StandardBasicTypes.DOUBLE) | 181 .addScalar("UFERABST", StandardBasicTypes.DOUBLE) |
184 .addScalar("UFERABLINKS", StandardBasicTypes.DOUBLE) | 182 .addScalar("UFERABLINKS", StandardBasicTypes.DOUBLE) |
185 .addScalar("TSCHWEB", StandardBasicTypes.DOUBLE) | 183 .addScalar("TSCHWEB", StandardBasicTypes.DOUBLE) |
186 .addScalar("TSAND", StandardBasicTypes.DOUBLE) | 184 .addScalar("TSAND", StandardBasicTypes.DOUBLE) |
187 .addScalar("MESSDAUER", StandardBasicTypes.DOUBLE) | |
188 .addScalar("MENGE", StandardBasicTypes.DOUBLE) | |
189 .addScalar("GTRIEB", StandardBasicTypes.DOUBLE) | 185 .addScalar("GTRIEB", StandardBasicTypes.DOUBLE) |
190 .addScalar("TGESCHIEBE", StandardBasicTypes.DOUBLE) | 186 .addScalar("TGESCHIEBE", StandardBasicTypes.DOUBLE) |
191 .addScalar("RSIEB01", StandardBasicTypes.DOUBLE) | 187 .addScalar("RSIEB01", StandardBasicTypes.DOUBLE) |
192 .addScalar("RSIEB02", StandardBasicTypes.DOUBLE) | 188 .addScalar("RSIEB02", StandardBasicTypes.DOUBLE) |
193 .addScalar("RSIEB03", StandardBasicTypes.DOUBLE) | 189 .addScalar("RSIEB03", StandardBasicTypes.DOUBLE) |
238 query.setDate("to", dateRange.getTo()); | 234 query.setDate("to", dateRange.getTo()); |
239 | 235 |
240 query.setResultTransformer(MeasurementResultTransformer.INSTANCE); | 236 query.setResultTransformer(MeasurementResultTransformer.INSTANCE); |
241 | 237 |
242 @SuppressWarnings("unchecked") | 238 @SuppressWarnings("unchecked") |
243 List<Measurement> measuments = (List<Measurement>)query.list(); | 239 List<Measurement> measuments = (List<Measurement>)query.list(); |
244 | 240 |
245 List<Measurement> same = new ArrayList<Measurement>(); | 241 List<Measurement> same = new ArrayList<Measurement>(); |
246 | 242 |
247 Integer lastLR = null; | 243 Integer lastLR = null; |
248 | 244 |
374 private static final boolean equalDate(Date a, Date b) { | 370 private static final boolean equalDate(Date a, Date b) { |
375 Calendar ca = Calendar.getInstance(); | 371 Calendar ca = Calendar.getInstance(); |
376 Calendar cb = Calendar.getInstance(); | 372 Calendar cb = Calendar.getInstance(); |
377 ca.setTime(a); | 373 ca.setTime(a); |
378 cb.setTime(b); | 374 cb.setTime(b); |
379 return ca.get(Calendar.YEAR) == cb.get(Calendar.YEAR) | 375 return ca.get(Calendar.YEAR) == cb.get(Calendar.YEAR) |
380 && ca.get(Calendar.MONTH) == cb.get(Calendar.MONTH) | 376 && ca.get(Calendar.MONTH) == cb.get(Calendar.MONTH) |
381 && ca.get(Calendar.DAY_OF_MONTH) == cb.get(Calendar.DAY_OF_MONTH); | 377 && ca.get(Calendar.DAY_OF_MONTH) == cb.get(Calendar.DAY_OF_MONTH); |
382 } | 378 } |
383 | 379 |
384 | 380 |
385 protected static Measurement accumulate(List<Measurement> measuments) { | 381 protected static Measurement accumulate(List<Measurement> measuments) { |