|
@@ -8,6 +8,8 @@ import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
+import java.time.format.DateTimeFormatterBuilder;
|
|
|
|
|
+import java.time.temporal.ChronoField;
|
|
|
import java.util.logging.Logger;
|
|
import java.util.logging.Logger;
|
|
|
|
|
|
|
|
import javax.naming.AuthenticationException;
|
|
import javax.naming.AuthenticationException;
|
|
@@ -107,7 +109,11 @@ public class ObservationRest {
|
|
|
fromTimestamp = LocalDateTime.of(date, LocalTime.MIN);
|
|
fromTimestamp = LocalDateTime.of(date, LocalTime.MIN);
|
|
|
toTimestamp = fromTimestamp.plusMonths(1);
|
|
toTimestamp = fromTimestamp.plusMonths(1);
|
|
|
} else if (fromTime != null && toTime != null) {
|
|
} else if (fromTime != null && toTime != null) {
|
|
|
- final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
|
+ final DateTimeFormatter formatter = new DateTimeFormatterBuilder().appendPattern("yyyy-MM-dd[ HH:mm:ss]")
|
|
|
|
|
+ .parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
|
|
|
|
|
+ .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
|
|
|
|
|
+ .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
|
|
|
|
|
+ .toFormatter();
|
|
|
|
|
|
|
|
fromTimestamp = LocalDateTime.parse(fromTime, formatter);
|
|
fromTimestamp = LocalDateTime.parse(fromTime, formatter);
|
|
|
toTimestamp = LocalDateTime.parse(toTime, formatter);
|
|
toTimestamp = LocalDateTime.parse(toTime, formatter);
|