diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java index 4d8e354..ff89857 100644 --- a/src/main/java/com/release11/klaus/controller/EventController.java +++ b/src/main/java/com/release11/klaus/controller/EventController.java @@ -28,18 +28,13 @@ import java.util.UUID; */ @Slf4j @RestController -@RequestMapping(path = "/event") +@RequestMapping(path = "/api/event") @AllArgsConstructor public class EventController { private final EtrackService service; @GetMapping - public ResponseEntity getHistory(@RequestBody(required = false) EventRequestDto event){ - event = EventRequestDto.builder() - .localDateTimeFrom(LocalDateTime.of(2021, 3, 3, 10, 1)) - .localDateTimeTo(LocalDateTime.of(2021, 3, 30, 19, 40)) - .clientUUID(UUID.fromString("68f98c04-403c-4344-bed2-1db779a15ead")) - .build(); + public ResponseEntity getHistory(@RequestBody EventRequestDto event){ return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK); } } diff --git a/src/main/resources/static/css/table.css b/src/main/resources/static/css/table.css new file mode 100644 index 0000000..00d87b1 --- /dev/null +++ b/src/main/resources/static/css/table.css @@ -0,0 +1,17 @@ +.simpleTable { + width: 100%; + text-align: left; + border: none; +} + +.simpleTable tr.thead{ + border-bottom: 1px solid gray; +} + +.simpleTable td { + font-size: 14px; +} + +.simpleTable th { + font-size: 24px; +} \ No newline at end of file diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index 3b54cdf..caafe0a 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -8,6 +8,7 @@ + @@ -103,14 +104,31 @@
- +
- - - + + + - + + + + + + + + + + + + + + + + + +
TimestampStatus
TimestampStatus
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
diff --git a/target/classes/com/release11/klaus/controller/EventController.class b/target/classes/com/release11/klaus/controller/EventController.class index e92cacd..f188430 100644 Binary files a/target/classes/com/release11/klaus/controller/EventController.class and b/target/classes/com/release11/klaus/controller/EventController.class differ diff --git a/target/classes/static/css/table.css b/target/classes/static/css/table.css new file mode 100644 index 0000000..00d87b1 --- /dev/null +++ b/target/classes/static/css/table.css @@ -0,0 +1,17 @@ +.simpleTable { + width: 100%; + text-align: left; + border: none; +} + +.simpleTable tr.thead{ + border-bottom: 1px solid gray; +} + +.simpleTable td { + font-size: 14px; +} + +.simpleTable th { + font-size: 24px; +} \ No newline at end of file diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html index 3b54cdf..caafe0a 100644 --- a/target/classes/static/html/mock.html +++ b/target/classes/static/html/mock.html @@ -8,6 +8,7 @@ + @@ -103,14 +104,31 @@
- +
- - - + + + - + + + + + + + + + + + + + + + + + +
TimestampStatus
TimestampStatus
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received