영문버전 변환 누락된 부분 추가
This commit is contained in:
@@ -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<T> {
|
||||
|
||||
return INTERNAL_SERVER_ERROR;
|
||||
}
|
||||
|
||||
public static ApiResponseCode fromMessage(String message) {
|
||||
return Arrays.stream(values())
|
||||
.filter(code -> code.getMessage().equals(message))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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 = "에러로그 검색 요청")
|
||||
|
||||
@@ -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<ErrorLogDto.Basic> findLogByError(ErrorLogDto.ErrorSearchReq searchReq) {
|
||||
Pageable pageable = searchReq.toPageable();
|
||||
boolean english = HeaderUtil.isEnglishRequest();
|
||||
StringExpression menuNm = (english ? menuEntity.menuNmEn : menuEntity.menuNm);
|
||||
|
||||
List<ErrorLogDto.Basic> 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"),
|
||||
|
||||
Reference in New Issue
Block a user