diff --git a/src/main/java/com/kri/kfpa/dash/service/AdminService.java b/src/main/java/com/kri/kfpa/dash/service/AdminService.java index c7d8d44..d7a6a57 100644 --- a/src/main/java/com/kri/kfpa/dash/service/AdminService.java +++ b/src/main/java/com/kri/kfpa/dash/service/AdminService.java @@ -10,6 +10,7 @@ import com.kri.kfpa.dash.mapper.DataMapper; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Service @@ -24,15 +25,24 @@ public class AdminService { private final DataMapper dataMapper; + @Value("${kri.kfpa-comment-idkey-suffix:}") + private String kfpaCommentIdkeySuffix; + public boolean updateDivComment(RequestWriteDivCommentDto request) { String idkey = IDKEY_MAP.get(request.getDivId().toString()); if (idkey == null) { throw BusinessException.badRequest("INVALID_DIV_ID", "지역본부 ID가 잘못됐습니다."); } + String suffixedIdkey = idkey + kfpaCommentIdkeySuffix; + validateCommentValues(request.getCommentValues()); - return dataMapper.updateDivComment(KFPA_COMMENT_PKEY, idkey, request.getCommentValues()); + return dataMapper.updateDivComment( + KFPA_COMMENT_PKEY, + suffixedIdkey, + request.getCommentValues() + ); } private void validateCommentValues(Map commentValues) { diff --git a/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java b/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java index 0c83448..93b9d04 100644 --- a/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java +++ b/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Service @@ -27,6 +28,9 @@ public class StatisticsService { private final DataMapper dataMapper; + @Value("${kri.kfpa-comment-idkey-suffix:}") + private String kfpaCommentIdkeySuffix; + public Map> getCsiData() { List csiDataList = dataMapper.selectDivCsiData(KFPA_DASH_PKEY); @@ -54,6 +58,8 @@ public class StatisticsService { ).with("div", div); } + String suffixedIdkey = idkey + kfpaCommentIdkeySuffix; + List objectTypeCsiRankList = dataMapper.selectDivObjectTypeCsiRank(KFPA_DASH_PKEY).stream() .filter(entity -> entity.getDiv().equals(div)) @@ -66,7 +72,8 @@ public class StatisticsService { DivCommentEntity divCommentEntity = divCommentCache.computeIfAbsent( div, key -> { - DivCommentEntity selectedComment = dataMapper.selectDivComment(KFPA_COMMENT_PKEY, idkey); + DivCommentEntity selectedComment = + dataMapper.selectDivComment(KFPA_COMMENT_PKEY, suffixedIdkey); return selectedComment == null ? DivCommentEntity.empty() : selectedComment; } ); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..eef7bd1 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,2 @@ +kri: + kfpa-comment-idkey-suffix: "_TEST" \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..eef7bd1 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,2 @@ +kri: + kfpa-comment-idkey-suffix: "_TEST" \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..5d23408 --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,2 @@ +kri: + kfpa-comment-idkey-suffix: "" \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ef6156d..30ad588 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -10,6 +10,9 @@ spring: url: jdbc:sqlserver://1.235.195.8:20022;databaseName=KON;encrypt=false username: kon password: kon#51304 + profiles: + # 아무 설정 없을 때 기본으로 쓸 프로파일 + default: local logging: file: diff --git a/src/main/resources/mybatis/mapper/DataMapper.xml b/src/main/resources/mybatis/mapper/DataMapper.xml index dd43be0..04c5a2f 100644 --- a/src/main/resources/mybatis/mapper/DataMapper.xml +++ b/src/main/resources/mybatis/mapper/DataMapper.xml @@ -162,7 +162,8 @@ , #{commentValues.performance26.capability} AS [Q1_3_3] FOR JSON PATH, WITHOUT_ARRAY_WRAPPER )) - ) + ), + survey_date = JSON_MODIFY(survey_date, '$.Q1', CONVERT(varchar(19), GETDATE(), 120)) FROM Kon.dbo.DATA A WHERE PKEY = #{pkey} AND IDKEY = #{idkey}