From 2d7413c8e17ae54bc9c67b207c58584f4b7e1d31 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Tue, 12 May 2026 11:16:19 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=81=EB=AC=B8=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B3=80=ED=99=98=20=EB=88=84=EB=9D=BD=EB=90=9C=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamcoback/config/api/ApiResponseDto.java | 8 +++++++ .../cd/kamcoback/label/dto/LabelWorkDto.java | 9 +++++++- .../cd/kamcoback/log/dto/ErrorLogDto.java | 23 +++++++++++++++++++ .../log/ErrorLogRepositoryImpl.java | 8 +++++-- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java index 154ad34c..c104a7b3 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java @@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.config.api; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.kamco.cd.kamcoback.common.utils.enums.EnumType; +import java.util.Arrays; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; @@ -225,5 +226,12 @@ public class ApiResponseDto { return INTERNAL_SERVER_ERROR; } + + public static ApiResponseCode fromMessage(String message) { + return Arrays.stream(values()) + .filter(code -> code.getMessage().equals(message)) + .findFirst() + .orElse(null); + } } } diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java index 8daae725..8d7900c8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java @@ -1,6 +1,7 @@ package com.kamco.cd.kamcoback.label.dto; import com.fasterxml.jackson.annotation.JsonProperty; +import com.kamco.cd.kamcoback.common.utils.HeaderUtil; import com.kamco.cd.kamcoback.common.utils.enums.Enums; import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; @@ -109,7 +110,13 @@ public class LabelWorkDto { if (type == null) { return enumId; } - return type.getText(); + + boolean english = HeaderUtil.isEnglishRequest(); + if (!english) { + return type.getText(); + } + + return type.getTextEn(); } /** diff --git a/src/main/java/com/kamco/cd/kamcoback/log/dto/ErrorLogDto.java b/src/main/java/com/kamco/cd/kamcoback/log/dto/ErrorLogDto.java index 1589c313..734940f9 100644 --- a/src/main/java/com/kamco/cd/kamcoback/log/dto/ErrorLogDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/log/dto/ErrorLogDto.java @@ -1,7 +1,10 @@ package com.kamco.cd.kamcoback.log.dto; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.kamco.cd.kamcoback.common.utils.HeaderUtil; import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose; import com.kamco.cd.kamcoback.common.utils.enums.EnumType; +import com.kamco.cd.kamcoback.config.api.ApiResponseDto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import lombok.AllArgsConstructor; @@ -61,6 +64,26 @@ public class ErrorLogDto { private final String errorMessage; private final String errorDetail; private final String createDate; // to_char해서 가져옴 + + @JsonProperty("errorMessage") + public String getErrorMessage() { + boolean english = HeaderUtil.isEnglishRequest(); + if (!english) { + return this.errorMessage; + } + + return ApiResponseDto.ApiResponseCode.fromMessage(this.errorMessage).toString(); + } + + @JsonProperty("errorName") + public String getErrorName() { + boolean english = HeaderUtil.isEnglishRequest(); + if (!english) { + return this.errorName; + } + + return ApiResponseDto.ApiResponseCode.fromMessage(this.errorName).toString(); + } } @Schema(name = "ErrorSearchReq", description = "에러로그 검색 요청") diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java index 2e926902..ec79faa0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/ErrorLogRepositoryImpl.java @@ -5,6 +5,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QErrorLogEntity.errorLogEnt import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMenuEntity.menuEntity; +import com.kamco.cd.kamcoback.common.utils.HeaderUtil; import com.kamco.cd.kamcoback.log.dto.ErrorLogDto; import com.kamco.cd.kamcoback.log.dto.EventStatus; import com.kamco.cd.kamcoback.log.dto.EventType; @@ -38,14 +39,17 @@ public class ErrorLogRepositoryImpl extends QuerydslRepositorySupport @Override public Page findLogByError(ErrorLogDto.ErrorSearchReq searchReq) { Pageable pageable = searchReq.toPageable(); + boolean english = HeaderUtil.isEnglishRequest(); + StringExpression menuNm = (english ? menuEntity.menuNmEn : menuEntity.menuNm); + List foundContent = queryFactory .select( Projections.constructor( ErrorLogDto.Basic.class, errorLogEntity.id.as("logId"), - Expressions.stringTemplate("{0}", "한국자산관리공사"), // serviceName - menuEntity.menuNm.as("menuName"), + Expressions.constant(english ? "Kamco" : "한국자산관리공사"), // serviceName + menuNm.as("menuName"), memberEntity.employeeNo.as("loginId"), memberEntity.name.as("userName"), errorLogEntity.errorType.as("eventType"),