From fbef92af550c3d2ac66430c6f9280242c655cee6 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Tue, 12 May 2026 14:51:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EA=B4=80=EB=A6=AC=20API=20?= =?UTF-8?q?=EC=98=81=EB=AC=B8=EB=B2=84=EC=A0=84=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/training/dataset/dto/DatasetDto.java | 2 +- .../model/dto/ModelTrainDetailDto.java | 17 +++++++++--- .../training/model/dto/ModelTrainMngDto.java | 26 ++++++++++++++----- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java index b324e91..2301d36 100644 --- a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java +++ b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java @@ -318,7 +318,7 @@ public class DatasetDto { public String getDataTypeName(String groupTitleCd) { LearnDataType type = Enums.fromId(LearnDataType.class, groupTitleCd); - return type == null ? null : type.getText(); + return type == null ? null : (HeaderUtil.isEnglishRequest() ? type.getId() : type.getText()); } public String getYear() { diff --git a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java index c39a0af..1c15123 100644 --- a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java +++ b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.kamco.cd.training.common.enums.LearnDataType; import com.kamco.cd.training.common.enums.TrainStatusType; import com.kamco.cd.training.common.enums.TrainType; +import com.kamco.cd.training.common.utils.HeaderUtil; import com.kamco.cd.training.common.utils.enums.Enums; import com.kamco.cd.training.common.utils.interfaces.JsonFormatDttm; import com.kamco.cd.training.dataset.dto.DatasetDto.SelectTransferDataSet; @@ -40,7 +41,9 @@ public class ModelTrainDetailDto { public String getStatusName() { if (this.statusCd == null || this.statusCd.isBlank()) return null; try { - return TrainStatusType.valueOf(this.statusCd).getText(); // 또는 getName() + return HeaderUtil.isEnglishRequest() + ? TrainStatusType.valueOf(this.statusCd).getId() + : TrainStatusType.valueOf(this.statusCd).getText(); // 또는 getName() } catch (IllegalArgumentException e) { return this.statusCd; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -49,7 +52,9 @@ public class ModelTrainDetailDto { public String getTrainTypeName() { if (this.trainType == null || this.trainType.isBlank()) return null; try { - return TrainType.valueOf(this.trainType).getText(); // 또는 getName() + return HeaderUtil.isEnglishRequest() + ? TrainType.valueOf(this.trainType).getId() + : TrainType.valueOf(this.trainType).getText(); // 또는 getName() } catch (IllegalArgumentException e) { return this.trainType; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -70,7 +75,11 @@ public class ModelTrainDetailDto { long minutes = (totalSeconds % 3600) / 60; long seconds = totalSeconds % 60; - return String.format("%d시간 %d분 %d초", hours, minutes, seconds); + if (HeaderUtil.isEnglishRequest()) { + return String.format("%dh %dm %ds", hours, minutes, seconds); + } else { + return String.format("%d시간 %d분 %d초", hours, minutes, seconds); + } } public String getStepAllDuration() { @@ -174,7 +183,7 @@ public class ModelTrainDetailDto { public String getDataTypeName(String groupTitleCd) { LearnDataType type = Enums.fromId(LearnDataType.class, groupTitleCd); - return type == null ? null : type.getText(); + return type == null ? null : (HeaderUtil.isEnglishRequest() ? type.getId() : type.getText()); } } diff --git a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java index cd707d3..f392594 100644 --- a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java +++ b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java @@ -45,8 +45,8 @@ public class ModelTrainMngDto { private String requestPath; private String packingState; - private ZonedDateTime packingStrtDttm; - private ZonedDateTime packingEndDttm; + @JsonFormatDttm private ZonedDateTime packingStrtDttm; + @JsonFormatDttm private ZonedDateTime packingEndDttm; private Long beforeModelId; private Integer bestEpoch; @@ -54,7 +54,9 @@ public class ModelTrainMngDto { public String getStatusName() { if (this.statusCd == null || this.statusCd.isBlank()) return null; try { - return TrainStatusType.valueOf(this.statusCd).getText(); // 또는 getName() + return (HeaderUtil.isEnglishRequest() + ? TrainStatusType.valueOf(this.statusCd).getId() + : TrainStatusType.valueOf(this.statusCd).getText()); // 또는 getName() } catch (IllegalArgumentException e) { return this.statusCd; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -63,7 +65,9 @@ public class ModelTrainMngDto { public String getStep1StatusName() { if (this.step1Status == null || this.step1Status.isBlank()) return null; try { - return TrainStatusType.valueOf(this.step1Status).getText(); // 또는 getName() + return (HeaderUtil.isEnglishRequest() + ? TrainStatusType.valueOf(this.step1Status).getId() + : TrainStatusType.valueOf(this.step1Status).getText()); // 또는 getName() } catch (IllegalArgumentException e) { return this.step1Status; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -72,7 +76,9 @@ public class ModelTrainMngDto { public String getStep2StatusName() { if (this.step2Status == null || this.step2Status.isBlank()) return null; try { - return TrainStatusType.valueOf(this.step2Status).getText(); // 또는 getName() + return (HeaderUtil.isEnglishRequest() + ? TrainStatusType.valueOf(this.step2Status).getId() + : TrainStatusType.valueOf(this.step2Status).getText()); // 또는 getName() } catch (IllegalArgumentException e) { return this.step2Status; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -81,7 +87,9 @@ public class ModelTrainMngDto { public String getTrainTypeName() { if (this.trainType == null || this.trainType.isBlank()) return null; try { - return TrainType.valueOf(this.trainType).getText(); // 또는 getName() + return (HeaderUtil.isEnglishRequest() + ? TrainType.valueOf(this.trainType).getId() + : TrainType.valueOf(this.trainType).getText()); // 또는 getName() } catch (IllegalArgumentException e) { return this.trainType; // 매핑 못하면 코드 그대로 반환(원하면 null 처리) } @@ -98,7 +106,11 @@ public class ModelTrainMngDto { long minutes = (totalSeconds % 3600) / 60; long seconds = totalSeconds % 60; - return String.format("%d시간 %d분 %d초", hours, minutes, seconds); + if (HeaderUtil.isEnglishRequest()) { + return String.format("%dh %dm %ds", hours, minutes, seconds); + } else { + return String.format("%d시간 %d분 %d초", hours, minutes, seconds); + } } public String getStep1Duration() {