From 59c0de7f25101b9d106adac89e7dd6578081c89f Mon Sep 17 00:00:00 2001 From: ihyeon-yong Date: Mon, 11 Sep 2023 13:01:28 +0900 Subject: [PATCH] add assetCode --- .../application/DefaultStatsService.java | 1 + .../presentation/StatsController.java | 8 ++++---- .../presentation/StatsDetailRecord.java | 8 +++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultStatsService.java b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultStatsService.java index 842ef68..663f3d8 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultStatsService.java +++ b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultStatsService.java @@ -137,6 +137,7 @@ public class DefaultStatsService implements StatsService{ } for(int i=0 ; i < 16 ; i++){ StatsDetailRecord statsDetailRecord = new StatsDetailRecord( + slot.getAssetCode(), slot.getSlotNumber(), String.valueOf(i), "status", diff --git a/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsController.java b/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsController.java index 7974780..227397d 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsController.java +++ b/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsController.java @@ -28,7 +28,7 @@ public class StatsController { @ResponseStatus(HttpStatus.OK) @GetMapping("/chambers/stats") public StatsResult chambers( -// @RequestHeader("Authorization") String authorization + @RequestHeader("Authorization") String authorization ){ log.info("[chambers stats]"); @@ -37,11 +37,11 @@ public class StatsController { return new StatsResult(chamberStats); } - @ResourceMapping(name = "Chambers_stats_detail", method = "GET", uri = "/chambers/stats/{chamberNumber}", description = "get chamber stats detail") + @ResourceMapping(name = "Chambers_stats_detail", method = "GET", uri = "/chambers/stats/detail/{chamberNumber}", description = "get chamber stats detail") @ResponseStatus(HttpStatus.OK) - @GetMapping("/chambers/stats/{chamberNumber}") + @GetMapping("/chambers/stats/detail/{chamberNumber}") public PageableResponse detail( -// @RequestHeader("Authorization") String authorization + @RequestHeader("Authorization") String authorization, @PathVariable String chamberNumber, @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "size", required = false, defaultValue = "20") Integer size diff --git a/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsDetailRecord.java b/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsDetailRecord.java index c6379b3..9a741b6 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsDetailRecord.java +++ b/src/main/java/inc/sdt/controlcentermanagement/presentation/StatsDetailRecord.java @@ -1,6 +1,7 @@ package inc.sdt.controlcentermanagement.presentation; public class StatsDetailRecord { + private String assetCode; private String slotNumber; private String tubeId; private String status; @@ -14,7 +15,8 @@ public class StatsDetailRecord { private String voltageOffset; private String currentOffset; - public StatsDetailRecord(String slotNumber, String tubeId, String status, String voltage, String current, String pin, String err1, String err2, String passTime, String retentionRate, String voltageOffset, String currentOffset) { + public StatsDetailRecord(String assetCode, String slotNumber, String tubeId, String status, String voltage, String current, String pin, String err1, String err2, String passTime, String retentionRate, String voltageOffset, String currentOffset) { + this.assetCode = assetCode; this.slotNumber = slotNumber; this.tubeId = tubeId; this.status = status; @@ -29,6 +31,10 @@ public class StatsDetailRecord { this.currentOffset = currentOffset; } + public String getAssetCode() { + return assetCode; + } + public String getVoltageOffset() { return voltageOffset; }