From 974830846bd031e403e003e8b02cba768318c0d4 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 5 Dec 2025 10:39:20 +0900 Subject: [PATCH 01/15] =?UTF-8?q?OBP=20=EA=B3=BC=EA=B8=88=EC=9A=A9=20gw=20?= =?UTF-8?q?metric=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- CLAUDE.md | 51 ++++++++++++- GEMINI.md | 4 + build.gradle | 11 ++- .../credential/CredentialUIMapper.java | 2 +- .../onl/audit/adapter/map/AuditUIMapper.java | 2 +- .../service/TransactionReportHourJob.java | 11 ++- .../rms/onl/common/util/FileSystemUtil.java | 73 +++++++++++++++++++ .../apim/mapping/ApiInterfaceUIMapper.java | 2 +- .../onl/common/util/FileSystemUtilTest.java | 50 +++++++++++++ 10 files changed, 197 insertions(+), 12 deletions(-) create mode 100644 GEMINI.md create mode 100644 src/main/java/com/eactive/eai/rms/onl/common/util/FileSystemUtil.java create mode 100644 src/test/java/com/eactive/eai/rms/onl/common/util/FileSystemUtilTest.java diff --git a/.gitignore b/.gitignore index 5214320..2adda4b 100644 --- a/.gitignore +++ b/.gitignore @@ -243,4 +243,5 @@ gradle-gf63.sh eapim-admin-kjb/ .claude -*.report.md \ No newline at end of file +*.report.md +*.claude.md \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index 1d04763..f99420b 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,6 +1,17 @@ -# CLAUDE.md +# AI-Assisted Development Guide -이 파일은 Claude Code (claude.ai/code)가 이 저장소의 코드를 작업할 때 참고할 가이드를 제공합니다. +이 문서는 AI 어시스턴트가 이 저장소의 코드를 이해하고 기여하는 데 필요한 가이드를 제공합니다. + +## 프로젝트 주요 특징 + +AI 어시스턴트가 작업을 시작하기 전에 반드시 이해해야 할 핵심적인 특징들입니다. + +- **하이브리드 데이터 액세스**: 이 프로젝트는 **JPA(Hibernate)와 iBATIS를 함께 사용**합니다. + - **신규 기능**: 항상 **JPA**와 Spring Data 리포지토리를 사용해야 합니다. + - **레거시 코드**: 기존 iBATIS (`*.xml` 매퍼) 코드를 수정할 때는 해당 패턴을 따라야 합니다. +- **멀티 모듈 Gradle 프로젝트**: `settings.gradle`에 정의된 것처럼 여러 하위 모듈(`elink-online-*`, `kjb-*` 등)로 구성되어 있습니다. 특정 기능은 다른 모듈에 위치할 수 있습니다. +- **QueryDSL 코드 생성**: 빌드 시 `QueryDSL`을 사용하여 Q-class가 자동으로 생성됩니다. IDE에서 엔티티를 찾을 수 없다고 표시되면, `gradle compileJava`를 먼저 실행하여 코드를 생성해야 합니다. +- **고객사별 커스터마이징**: `ext.kjb` 또는 `custom` 패키지는 특정 고객사(광주은행)를 위한 코드를 포함하므로, 일반적인 기능 수정 시에는 주의가 필요합니다. ## 프로젝트 개요 @@ -69,6 +80,39 @@ gradle dependencies gradle tasks --all ``` +## 로컬 개발 빠른 시작 + +새로운 환경에서 프로젝트를 처음 설정하고 실행하는 권장 절차입니다. + +1. **IDE 설정 파일 생성 (최초 1회)** + ```bash + # IntelliJ IDEA 사용 시 + gradle idea + + # Eclipse 사용 시 + gradle eclipse + ``` + +2. **QueryDSL 등 소스 코드 생성** + ```bash + gradle compileJava + ``` + +3. **전체 빌드 및 테스트 실행** + ```bash + gradle build + ``` + +4. **IDE에서 프로젝트 열기** + - `gradle idea` 또는 `gradle eclipse` 실행 후, IDE에서 프로젝트를 엽니다. + +5. **실행 구성(Run Configuration) 설정** + - 사용하는 WAS(Tomcat 등)에 `eapim-admin` 프로젝트를 배포하도록 설정합니다. + - **VM Options**에 위에 명시된 "필수 환경 변수 (Tomcat)"를 모두 추가합니다. + +6. **서버 실행** + - IDE에서 설정한 실행 구성을 시작하여 서버를 실행합니다. + ## 아키텍처 및 모듈 의존성 ### 멀티 모듈 구조 @@ -132,6 +176,9 @@ eapim-admin (root project) ### 필수 환경 변수 (Tomcat) +다음은 로컬 Tomcat 환경에서 개발 시 필요한 시스템 프로퍼티(-D)입니다. +**설정 방법**: IntelliJ, Eclipse 등 IDE의 실행 구성(Run Configuration)에서 'VM options'에 추가하거나, 사용하는 Tomcat의 `bin` 폴더에 `setenv.bat` (Windows) 또는 `setenv.sh` (Linux/macOS) 파일을 생성하여 아래 내용들을 `CATALINA_OPTS` 또는 `JAVA_OPTS` 환경 변수에 추가합니다. + ``` -Deai.datasource.type=DEV -Dinst.Name=emsSvr99 diff --git a/GEMINI.md b/GEMINI.md new file mode 100644 index 0000000..60e6004 --- /dev/null +++ b/GEMINI.md @@ -0,0 +1,4 @@ +# GEMINI.md + +이 프로젝트에 대한 주요 정보 및 지침은 `CLAUDE.md` 파일을 참조하십시오. +(For key information and guidelines regarding this project, please refer to the `CLAUDE.md` file.) \ No newline at end of file diff --git a/build.gradle b/build.gradle index 77d3530..39c105a 100644 --- a/build.gradle +++ b/build.gradle @@ -36,10 +36,17 @@ java { } } +sourceSets { + main { + java { + srcDirs generatedJavaDir + } + } +} + compileJava { options.encoding = 'UTF-8' options.compilerArgs = ['-parameters'] - sourceSets.main.java { srcDir generatedJavaDir } options.generatedSourceOutputDirectory = project.file(generatedJavaDir) aptOptions { @@ -64,7 +71,7 @@ war { tasks.withType(JavaCompile) { options.encoding = 'UTF-8' - options.compilerArgs = ['-parameters'] + options.compilerArgs += ['-parameters', "-Xlint:unchecked", "-Xlint:deprecation"] } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialUIMapper.java index e3c7ff8..208dfa8 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialUIMapper.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialUIMapper.java @@ -28,7 +28,7 @@ public abstract class CredentialUIMapper implements GenericMapper -1 ) { + if (trTime.contains("EVERY_HOUR")) { // go on } else if (!StringUtils.contains(trTime, hour)) { return; @@ -93,9 +94,11 @@ public class TransactionReportHourJob implements Job { + CommonUtil.getToday("yyyy-MM-dd HH:mm") + ")"); } - String pathDir = monitoringContext.getStringProperty( MonitoringContext.RMS_TRANSACTION_LOG_PATH,"/fslog/eai/") - + monitoringContext.getStringProperty( Keys.SERVER_KEY) - + "/trlog"; + String pathDir = FileSystemUtil.pathNormalize( + monitoringContext.getStringProperty( MonitoringContext.RMS_TRANSACTION_LOG_PATH,"/fslog/eai/") + , monitoringContext.getStringProperty( Keys.SERVER_KEY) + , "trlog" + ); /////////////////////////////////////////////// // 로컬테스트용 diff --git a/src/main/java/com/eactive/eai/rms/onl/common/util/FileSystemUtil.java b/src/main/java/com/eactive/eai/rms/onl/common/util/FileSystemUtil.java new file mode 100644 index 0000000..7026ed7 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/common/util/FileSystemUtil.java @@ -0,0 +1,73 @@ +package com.eactive.eai.rms.onl.common.util; + +import java.io.File; +import java.util.StringJoiner; + +public class FileSystemUtil { + + /** + * Normalizes a path by joining segments and applying the correct file separator for the current operating system. + * It handles redundant separators between segments. + * + *

Examples for Linux/macOS:

+ * + * + *

Examples for Windows:

+ * + * + * @param args A variable number of path segments to join. + * @return A normalized path string for the current operating system. + */ + public static String pathNormalize(String... args) { + if (args == null || args.length == 0) { + return ""; + } + + StringJoiner joiner = new StringJoiner(File.separator); + for (String arg : args) { + if (arg != null && !arg.isEmpty()) { + String segment = arg; + // Remove leading separators from the segment + while (segment.startsWith("/") || segment.startsWith("\\")) { + segment = segment.substring(1); + } + // Remove trailing separators from the segment + while (segment.endsWith("/") || segment.endsWith("\\")) { + segment = segment.substring(0, segment.length() - 1); + } + if (!segment.isEmpty()) { + joiner.add(segment); + } + } + } + + String joinedPath = joiner.toString(); + + // Handle the root path for the first argument + String firstArg = args[0]; + if (firstArg != null && !firstArg.isEmpty()) { + if (firstArg.startsWith("/")) { + joinedPath = File.separator + joinedPath; + } else if (firstArg.matches("^[a-zA-Z]:\\\\") || firstArg.matches("^[a-zA-Z]:/.*")) { // Handle Windows drive letters, e.g., "C:\" or "C:/" + String drive = firstArg.substring(0, 2); + return drive + File.separator + joinedPath.substring(joinedPath.indexOf(File.separator) + 1); + } + } + + // Final normalization for Windows if the path starts with a separator (e.g. from a UNC path) + if (System.getProperty("os.name").toLowerCase().contains("win")) { + if (args[0] != null && args[0].startsWith("//") || args[0].startsWith("\\\\")) { + return "\\\\" + joinedPath; + } + return joinedPath.replace("/", "\\"); + } + + return joinedPath.replace("\\", "/"); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/mapping/ApiInterfaceUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/mapping/ApiInterfaceUIMapper.java index c933b63..8d4c762 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/mapping/ApiInterfaceUIMapper.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/mapping/ApiInterfaceUIMapper.java @@ -148,7 +148,7 @@ public interface ApiInterfaceUIMapper { @Mapping(target = "eaisendrecv", source = "sendRecvType") @Mapping(target = "eaidirection", source = "inOutType") @Mapping(target = "standardMessageItems", source = "standardMessageItems") - @Mapping(target = "apiFullPath", source = "apiFullPath") + StandardMessageInfo toStandardMessageInfo(ApiInterfaceUI vo); @AfterMapping diff --git a/src/test/java/com/eactive/eai/rms/onl/common/util/FileSystemUtilTest.java b/src/test/java/com/eactive/eai/rms/onl/common/util/FileSystemUtilTest.java new file mode 100644 index 0000000..0d2e19b --- /dev/null +++ b/src/test/java/com/eactive/eai/rms/onl/common/util/FileSystemUtilTest.java @@ -0,0 +1,50 @@ +package com.eactive.eai.rms.onl.common.util; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class FileSystemUtilTest { + + @Test + @EnabledOnOs(OS.LINUX) + void testPathNormalize_Linux() { + assertEquals("/asd1/asd2/asd3", FileSystemUtil.pathNormalize("/asd1/asd2", "asd3")); + assertEquals("/asd1/asd2/asd3", FileSystemUtil.pathNormalize("/asd1/asd2/", "/asd3")); + assertEquals("/asd1/asd2/asd3", FileSystemUtil.pathNormalize("/asd1/asd2", "/asd3")); + assertEquals("/asd1/asd2/asd3", FileSystemUtil.pathNormalize("/asd1/asd2/", "asd3/")); + assertEquals("/a/b/c", FileSystemUtil.pathNormalize("/a/", "/b/", "/c/")); + assertEquals("a/b/c", FileSystemUtil.pathNormalize("a", "b", "c")); + assertEquals("/a", FileSystemUtil.pathNormalize("/a")); + } + + @Test + @EnabledOnOs(OS.WINDOWS) + void testPathNormalize_Windows() { + assertEquals("\\asd1\\asd2\\asd3", FileSystemUtil.pathNormalize("/asd1/asd2", "asd3")); + assertEquals("\\asd1\\asd2\\asd3", FileSystemUtil.pathNormalize("/asd1/asd2/", "/asd3")); + assertEquals("\\asd1\\asd2\\asd3", FileSystemUtil.pathNormalize("/asd1/asd2", "/asd3")); + assertEquals("\\asd1\\asd2\\asd3", FileSystemUtil.pathNormalize("/asd1/asd2/", "asd3/")); + assertEquals("C:\\Users\\Test", FileSystemUtil.pathNormalize("C:/Users", "Test")); + assertEquals("C:\\Users\\Test", FileSystemUtil.pathNormalize("C:\\Users", "Test")); + assertEquals("\\a\\b\\c", FileSystemUtil.pathNormalize("/a/", "/b/", "/c/")); + assertEquals("a\\b\\c", FileSystemUtil.pathNormalize("a", "b", "c")); + assertEquals("\\a", FileSystemUtil.pathNormalize("/a")); + } + + @Test + void testPathNormalize_General() { + String expected = "a" + File.separator + "b" + File.separator + "c"; + assertEquals(expected, FileSystemUtil.pathNormalize("a", "b", "c")); + assertEquals("", FileSystemUtil.pathNormalize("")); + assertEquals("", FileSystemUtil.pathNormalize(null)); + assertEquals("", FileSystemUtil.pathNormalize()); + assertEquals("a", FileSystemUtil.pathNormalize("a")); + assertEquals("a", FileSystemUtil.pathNormalize("a/")); + assertEquals("a", FileSystemUtil.pathNormalize("/a")); + } +} From 6e1e077ac6a8797225315d1abbeae1ab56d405dd Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 5 Dec 2025 17:28:47 +0900 Subject: [PATCH 02/15] claude --- CLAUDE.md | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index f99420b..881e98d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ AI 어시스턴트가 작업을 시작하기 전에 반드시 이해해야 할 - **신규 기능**: 항상 **JPA**와 Spring Data 리포지토리를 사용해야 합니다. - **레거시 코드**: 기존 iBATIS (`*.xml` 매퍼) 코드를 수정할 때는 해당 패턴을 따라야 합니다. - **멀티 모듈 Gradle 프로젝트**: `settings.gradle`에 정의된 것처럼 여러 하위 모듈(`elink-online-*`, `kjb-*` 등)로 구성되어 있습니다. 특정 기능은 다른 모듈에 위치할 수 있습니다. -- **QueryDSL 코드 생성**: 빌드 시 `QueryDSL`을 사용하여 Q-class가 자동으로 생성됩니다. IDE에서 엔티티를 찾을 수 없다고 표시되면, `gradle compileJava`를 먼저 실행하여 코드를 생성해야 합니다. +- **QueryDSL 코드 생성**: 빌드 시 `QueryDSL`을 사용하여 Q-class가 자동으로 생성됩니다. IDE에서 엔티티를 찾을 수 없다고 표시되면, `kjb-gradle.sh compileJava`를 먼저 실행하여 코드를 생성해야 합니다. - **고객사별 커스터마이징**: `ext.kjb` 또는 `custom` 패키지는 특정 고객사(광주은행)를 위한 코드를 포함하므로, 일반적인 기능 수정 시에는 주의가 필요합니다. ## 프로젝트 개요 @@ -38,46 +38,51 @@ eLink EMS (eLink Management System)는 eLink의 웹 기반 관리 서비스로, ## 빌드 및 개발 명령어 ### 빌드 명령어 + +**⚠️ 중요**: 환경변수 문제로 인해 `gradle` 대신 `kjb-gradle.sh` 스크립트를 사용해야 합니다. +- 스크립트 위치: `/c/eactive/workspaces/shell-scripts/kjb-gradle.sh` +- PATH에 등록되어 있으므로 바로 `kjb-gradle.sh` 명령어 사용 가능 + ```bash # 표준 빌드 -gradle build +kjb-gradle.sh build # Weblogic 배포용 빌드 (테스트 제외) -gradle build -x test -Pprofile=weblogic +kjb-gradle.sh build -x test -Pprofile=weblogic # WAR 파일 빌드 -gradle war +kjb-gradle.sh war # 클린 빌드 -gradle clean build +kjb-gradle.sh clean build ``` ### 테스트 실행 ```bash # 모든 테스트 실행 -gradle test +kjb-gradle.sh test # 특정 테스트 클래스 실행 -gradle test --tests "com.example.ClassName" +kjb-gradle.sh test --tests "com.example.ClassName" # 특정 테스트 패키지 실행 (JUnit 플랫폼 사용) -gradle test --tests "com.eactive.eai.rms.*" +kjb-gradle.sh test --tests "com.eactive.eai.rms.*" ``` ### 개발 태스크 ```bash # 패키징 없이 클래스만 컴파일 -gradle classes +kjb-gradle.sh classes # QueryDSL Q-classes 및 기타 애노테이션 생성 -gradle compileJava +kjb-gradle.sh compileJava # 의존성 트리 보기 -gradle dependencies +kjb-gradle.sh dependencies # 사용 가능한 모든 태스크 목록 -gradle tasks --all +kjb-gradle.sh tasks --all ``` ## 로컬 개발 빠른 시작 @@ -87,24 +92,24 @@ gradle tasks --all 1. **IDE 설정 파일 생성 (최초 1회)** ```bash # IntelliJ IDEA 사용 시 - gradle idea - + kjb-gradle.sh idea + # Eclipse 사용 시 - gradle eclipse + kjb-gradle.sh eclipse ``` 2. **QueryDSL 등 소스 코드 생성** ```bash - gradle compileJava + kjb-gradle.sh compileJava ``` 3. **전체 빌드 및 테스트 실행** ```bash - gradle build + kjb-gradle.sh build ``` 4. **IDE에서 프로젝트 열기** - - `gradle idea` 또는 `gradle eclipse` 실행 후, IDE에서 프로젝트를 엽니다. + - `kjb-gradle.sh idea` 또는 `kjb-gradle.sh eclipse` 실행 후, IDE에서 프로젝트를 엽니다. 5. **실행 구성(Run Configuration) 설정** - 사용하는 WAS(Tomcat 등)에 `eapim-admin` 프로젝트를 배포하도록 설정합니다. @@ -155,7 +160,7 @@ eapim-admin (root project) 이 프로젝트는 **Gradle과 Eclipse 애노테이션 프로세서 모두를 사용**하므로, Q-classes가 **두 위치에 생성**됩니다: -1. **`build/generated/java/`** - `gradle compileJava` 또는 `gradle build` 실행 시 Gradle이 생성 +1. **`build/generated/java/`** - `kjb-gradle.sh compileJava` 또는 `kjb-gradle.sh build` 실행 시 Gradle이 생성 2. **`WebContent/generated/`** - Eclipse IDE에서 빌드 시 Eclipse APT가 생성 **이는 예상된 동작이며 의도적입니다.** 두 디렉토리 모두 `.gitignore`에 포함되어 있으며 커밋해서는 안 됩니다. @@ -164,8 +169,8 @@ eapim-admin (root project) - **Gradle 빌드**: `build/generated/java/`의 Q-classes가 자동으로 classpath에 포함됩니다 - **Eclipse IDE**: `WebContent/generated/`의 Q-classes가 자동으로 classpath에 포함됩니다 -- **업데이트 pull 후**: `gradle compileJava`를 실행하거나 Eclipse 프로젝트를 새로고침하여 Q-classes를 재생성합니다 -- **Q-classes IDE 오류 시**: `gradle clean compileJava` 또는 Eclipse → Project → Clean으로 재생성합니다 +- **업데이트 pull 후**: `kjb-gradle.sh compileJava`를 실행하거나 Eclipse 프로젝트를 새로고침하여 Q-classes를 재생성합니다 +- **Q-classes IDE 오류 시**: `kjb-gradle.sh clean compileJava` 또는 Eclipse → Project → Clean으로 재생성합니다 중복이 문제를 일으키지 않는 이유: - 두 도구 모두 동일한 JPA 엔티티에서 동일한 Q-classes를 생성합니다 @@ -249,7 +254,7 @@ eapim-admin (root project) WebLogic용 빌드 시, DefaultServlet 문제를 해결하기 위해 `web.xml`을 `weblogic-web.xml`로 교체하는 `weblogic` 프로필을 사용합니다: ```bash -gradle build -x test -Pprofile=weblogic +kjb-gradle.sh build -x test -Pprofile=weblogic ``` ## 기술 스택 @@ -326,7 +331,7 @@ com.eactive.eai ### Eclipse ```bash -gradle eclipse +kjb-gradle.sh eclipse ``` 다음을 생성합니다: @@ -338,7 +343,7 @@ gradle eclipse ### IntelliJ IDEA ```bash -gradle idea +kjb-gradle.sh idea ``` 또는 IntelliJ에서 직접 "Import Gradle Project"를 사용합니다. From cfeda1b7af75c6e169b7e4d3017d10973cac18a7 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 5 Dec 2025 17:29:30 +0900 Subject: [PATCH 03/15] gw metric --- .../oracle/sqlMapConfigOfOnl.xml | 3 + .../entity/onl/apim/obp/ObpGwMetricDAO.java | 103 +++++++ .../onl/apim/obp/ObpGwMetricRepository.java | 39 +++ .../onl/apim/obp/ObpGwMetricService.java | 54 ++++ .../entity/onl/apim/obp/ObpGwMetricVO.java | 68 +++++ .../onl/apim/obp/ObpGwMetricController.java | 97 +++++++ .../eai/rms/onl/apim/obp/ObpGwMetricDTO.java | 98 +++++++ .../onl/apim/obp/ObpGwMetricManService.java | 257 ++++++++++++++++++ .../common/service/ObpGwMetricHourJob.java | 56 ++++ .../eai/apim/obp/ObpGwMetric-oracle.xml | 91 +++++++ 10 files changed, 866 insertions(+) create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricController.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricDTO.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java create mode 100644 src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml diff --git a/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfOnl.xml b/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfOnl.xml index 8e843a1..0355c0c 100644 --- a/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfOnl.xml +++ b/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfOnl.xml @@ -201,4 +201,7 @@ + + + \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java new file mode 100644 index 0000000..b61fbac --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java @@ -0,0 +1,103 @@ +package com.eactive.eai.rms.data.entity.onl.apim.obp; + +import com.eactive.eai.rms.common.base.SqlMapClientTemplateDao; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * ObpGwMetric DAO - iBATIS를 사용한 로그 테이블 집계 + */ +@Repository +public class ObpGwMetricDAO extends SqlMapClientTemplateDao { + + /** + * EAIBZWKDSTCD 코드 목록 조회 + */ + @SuppressWarnings("unchecked") + public List selectAllBzwkCodes(String schemaId) { + HashMap paramMap = new HashMap<>(); + paramMap.put("schemaId", schemaId); + return this.template.queryForList("ObpGwMetric.selectAllBzwkCodes", paramMap); + } + + /** + * EAIBZWKDSTCD별 시간대 로그 집계 + */ + @SuppressWarnings("unchecked") + public List selectHourlyMetricsByBzwkCode(HashMap paramMap) { + return this.template.queryForList("ObpGwMetric.selectHourlyMetricsByBzwkCode", paramMap); + } + + /** + * API 이름 조회 (TSEAIHE01) + */ + @SuppressWarnings("unchecked") + public Map selectApiNames(String schemaId, Set apiIds) { + if (apiIds == null || apiIds.isEmpty()) { + return new HashMap<>(); + } + + HashMap paramMap = new HashMap<>(); + paramMap.put("schemaId", schemaId); + paramMap.put("apiIds", apiIds); + + List> resultList = this.template.queryForList("ObpGwMetric.selectApiNames", paramMap); + + return resultList.stream() + .collect(Collectors.toMap( + m -> m.get("API_ID"), + m -> m.get("API_NAME"), + (v1, v2) -> v1 + )); + } + + /** + * URI 조회 (TSEAIHS04) + */ + @SuppressWarnings("unchecked") + public Map selectUris(String schemaId, Set apiIds) { + if (apiIds == null || apiIds.isEmpty()) { + return new HashMap<>(); + } + + HashMap paramMap = new HashMap<>(); + paramMap.put("schemaId", schemaId); + paramMap.put("apiIds", apiIds); + + List> resultList = this.template.queryForList("ObpGwMetric.selectUris", paramMap); + + return resultList.stream() + .collect(Collectors.toMap( + m -> m.get("API_ID"), + m -> m.get("URI"), + (v1, v2) -> v1 + )); + } + + /** + * AppId 조회 (ptl_app_request) - org_id로 조회 + */ + @SuppressWarnings("unchecked") + public Map selectAppIdsByOrgIds(Set orgIds) { + if (orgIds == null || orgIds.isEmpty()) { + return new HashMap<>(); + } + + HashMap paramMap = new HashMap<>(); + paramMap.put("orgIds", orgIds); + + List> resultList = this.template.queryForList("ObpGwMetric.selectAppIdsByOrgIds", paramMap); + + return resultList.stream() + .collect(Collectors.toMap( + m -> m.get("ORG_ID"), + m -> m.get("APP_ID"), + (v1, v2) -> v1 + )); + } +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricRepository.java new file mode 100644 index 0000000..58c5031 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricRepository.java @@ -0,0 +1,39 @@ +package com.eactive.eai.rms.data.entity.onl.apim.obp; + +import com.eactive.apim.portal.obp.entity.ObpGwMetric; +import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.EMSDataSource; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +/** + * ObpGwMetric Repository (eapim-admin 위치) + * API Gateway 시간별 거래량 지표 조회/저장을 위한 Spring Data JPA Repository + */ +@EMSDataSource +public interface ObpGwMetricRepository extends BaseRepository { + + /** + * UPSERT 판단을 위한 기존 데이터 조회 + * 동일한 timeslice + apiId + clientId + hostname + orgId 조합이 존재하는지 확인 + */ + Optional findByTimesliceAndApiIdAndClientIdAndHostnameAndOrgId( + LocalDateTime timeslice, + String apiId, + String clientId, + String hostname, + String orgId + ); + + /** + * 특정 시간대의 모든 GwMetric 데이터 조회 + */ + List findByTimeslice(LocalDateTime timeslice); + + /** + * 특정 시간 범위의 GwMetric 데이터 조회 + */ + List findByTimesliceBetween(LocalDateTime startTime, LocalDateTime endTime); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java new file mode 100644 index 0000000..79d3022 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java @@ -0,0 +1,54 @@ +package com.eactive.eai.rms.data.entity.onl.apim.obp; + +import com.eactive.apim.portal.obp.entity.ObpGwMetric; +import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +/** + * ObpGwMetric Service - 엔티티 CRUD 서비스 + */ +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +public class ObpGwMetricService extends AbstractEMSDataSerivce { + + /** + * UPSERT 판단을 위한 기존 데이터 조회 + */ + public Optional findByUniqueKey(LocalDateTime timeslice, String apiId, String clientId, String hostname, String orgId) { + return getRepository().findByTimesliceAndApiIdAndClientIdAndHostnameAndOrgId( + timeslice, apiId, clientId, hostname, orgId); + } + + /** + * 특정 시간대의 모든 GwMetric 데이터 조회 + */ + public List findByTimeslice(LocalDateTime timeslice) { + return getRepository().findByTimeslice(timeslice); + } + + /** + * 특정 시간 범위의 GwMetric 데이터 조회 + */ + public List findByTimesliceBetween(LocalDateTime startTime, LocalDateTime endTime) { + return getRepository().findByTimesliceBetween(startTime, endTime); + } + + /** + * 엔티티 저장 (INSERT 또는 UPDATE) + */ + public ObpGwMetric save(ObpGwMetric entity) { + return getRepository().save(entity); + } + + /** + * 엔티티 목록 저장 + */ + public List saveAll(List entities) { + return getRepository().saveAll(entities); + } +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java new file mode 100644 index 0000000..20adc9a --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java @@ -0,0 +1,68 @@ +package com.eactive.eai.rms.data.entity.onl.apim.obp; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + * ObpGwMetric VO - 로그 집계 결과 매핑용 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ObpGwMetricVO { + + private static final DateTimeFormatter TIMESLICE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH0000000"); + + /** API ID (EAISVCNAME) */ + private String apiId; + + /** 클라이언트 ID (CLIENTID) */ + private String clientId; + + /** 호스트 이름 (EAISEVRINSTNCNAME) */ + private String hostname; + + /** 기관 ID (ORGID) */ + private String orgId; + + /** 타임슬라이스 문자열 (yyyyMMddHH0000000) */ + private String timeslice; + + /** 시도 횟수 (LOGPRCSSSERNO='100' 건수) */ + private Long attemptedCount; + + /** 완료 횟수 (LOGPRCSSSERNO='400' AND 성공 조건 건수) */ + private Long completedCount; + + /** + * timeslice 문자열을 LocalDateTime으로 변환 + */ + public LocalDateTime getTimesliceAsLocalDateTime() { + if (timeslice == null || timeslice.isEmpty()) { + return null; + } + // yyyyMMddHH0000000 형식에서 앞 10자리(yyyyMMddHH)만 사용 + String dateTimeStr = timeslice.substring(0, 10) + "0000"; + return LocalDateTime.parse(dateTimeStr, DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); + } + + /** + * 집계 키 생성 (apiId + clientId + hostname + orgId) + */ + public String getAggregationKey() { + return String.join("|", + nullSafe(apiId), + nullSafe(clientId), + nullSafe(hostname), + nullSafe(orgId) + ); + } + + private String nullSafe(String value) { + return value != null ? value : ""; + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricController.java b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricController.java new file mode 100644 index 0000000..fb3168b --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricController.java @@ -0,0 +1,97 @@ +package com.eactive.eai.rms.onl.apim.obp; + +import com.eactive.eai.rms.common.interceptor.InterceptorSkipController; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + +/** + * ObpGwMetric REST Controller + * API Gateway 시간별 거래량 지표 조회 API + * + *

세션 체크를 우회하기 위해 InterceptorSkipController 인터페이스 구현

+ */ +@Controller +public class ObpGwMetricController implements InterceptorSkipController { + + private static final Logger log = LoggerFactory.getLogger(ObpGwMetricController.class); + + private static final DateTimeFormatter PATH_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH:mm:ss"); + + private final ObpGwMetricManService obpGwMetricManService; + + public ObpGwMetricController(ObpGwMetricManService obpGwMetricManService) { + this.obpGwMetricManService = obpGwMetricManService; + } + + /** + * 특정 시간대의 GwMetric 데이터 조회 + * + * @param datetime 조회 시간대 (형식: yyyy-MM-dd_HH:mm:ss) + * @return JSON Array + */ + @RequestMapping( + value = "/kjb/gw-metrics/{datetime}", + produces = "application/json;charset=utf-8" + ) + @ResponseBody + public String getGwMetrics(@PathVariable("datetime") String datetime) { + log.debug("GwMetric 조회 요청: datetime={}", datetime); + long startTime = System.currentTimeMillis(); + + try { + // Path 파라미터 파싱 + LocalDateTime targetTime = LocalDateTime.parse(datetime, PATH_FORMATTER); + LocalDateTime timeslice = targetTime.withMinute(0).withSecond(0).withNano(0); + + // 조회 + List metrics = obpGwMetricManService.findByTimeslice(timeslice); + + // JSON 변환 (GSON) + Gson gson = new GsonBuilder() + .serializeNulls() + .create(); + + String json = gson.toJson(metrics); + + // 응답 크기 계산 (UTF-8 기준) + int jsonBytes = json.getBytes(StandardCharsets.UTF_8).length; + String jsonSize = formatByteSize(jsonBytes); + + long elapsed = System.currentTimeMillis() - startTime; + log.info("GwMetric 조회 완료: datetime={}, count={}, size={}, elapsed={}ms", + datetime, metrics.size(), jsonSize, elapsed); + + return json; + + } catch (Exception e) { + log.error("GwMetric 조회 실패: datetime={}", datetime, e); + throw e; + } + } + + /** + * 바이트 크기를 읽기 쉬운 형식으로 변환 + * 예: 1024 -> "1.0 KB", 1048576 -> "1.0 MB" + */ + private String formatByteSize(long bytes) { + if (bytes < 1024) { + return bytes + " B"; + } else if (bytes < 1024 * 1024) { + return String.format("%.1f KB", bytes / 1024.0); + } else { + return String.format("%.1f MB", bytes / (1024.0 * 1024.0)); + } + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricDTO.java b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricDTO.java new file mode 100644 index 0000000..02e8785 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricDTO.java @@ -0,0 +1,98 @@ +package com.eactive.eai.rms.onl.apim.obp; + +import com.eactive.apim.portal.obp.entity.ObpGwMetric; +import com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + * ObpGwMetric JSON 응답 DTO + * Entity 주석에 명시된 JSON Key 사용 + */ +@Data +public class ObpGwMetricDTO { + + private static final DateTimeFormatter ISO8601_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'+0000'"); + + @SerializedName("appKey") + private String clientId; + + @SerializedName("clusterHostname") + private String hostname; + + @SerializedName("timeslice") + private String timeslice; + + @SerializedName("apiName") + private String apiName; + + @SerializedName("apiRoutingUri") + private String uri; + + @SerializedName("attemptedCount") + private Long attemptedCount; + + @SerializedName("completedCount") + private Long completedCount; + + // EAPIM ID + @SerializedName("apiIdByEapim") + private String apiId; + + @SerializedName("appIdByEapim") + private String appId; + + @SerializedName("orgIdByEapim") + private String orgId; + + // AS-IS 호환용 필드 + @SerializedName("appId") + private String appIdByCaPortal; + + @SerializedName("portalOrgId") + private String orgIdByCaPortal; + + @SerializedName("portalApiId") + private String apiIdByCaPortal; + + @SerializedName("partnerCode") + private String partnerCode; + + @SerializedName("apiId") + private String apiIdByCa; + + /** + * Entity → DTO 변환 + */ + public static ObpGwMetricDTO from(ObpGwMetric entity) { + ObpGwMetricDTO dto = new ObpGwMetricDTO(); + dto.setClientId(entity.getClientId()); + dto.setHostname(entity.getHostname()); + dto.setTimeslice(formatTimeslice(entity.getTimeslice())); + dto.setApiName(entity.getApiName()); + dto.setUri(entity.getUri()); + dto.setAttemptedCount(entity.getAttemptedCount()); + dto.setCompletedCount(entity.getCompletedCount()); + dto.setApiId(entity.getApiId()); + dto.setAppId(entity.getAppId()); + dto.setOrgId(entity.getOrgId()); + dto.setAppIdByCaPortal(entity.getAppIdByCaPortal()); + dto.setOrgIdByCaPortal(entity.getOrgIdByCaPortal()); + dto.setApiIdByCaPortal(entity.getApiIdByCaPortal()); + dto.setPartnerCode(entity.getPartnerCode()); + dto.setApiIdByCa(entity.getApiIdByCa()); + return dto; + } + + /** + * timeslice를 ISO8601 형식 + UTC 시간대로 변환 + * 예: 2025-12-02T01:00:00+0000 + */ + private static String formatTimeslice(LocalDateTime timeslice) { + if (timeslice == null) return null; + return timeslice.format(ISO8601_FORMATTER); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java new file mode 100644 index 0000000..8543dec --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java @@ -0,0 +1,257 @@ +package com.eactive.eai.rms.onl.apim.obp; + +import com.eactive.apim.portal.obp.entity.ObpGwMetric; +import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; +import com.eactive.eai.rms.common.datasource.DataSourceType; +import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; +import com.eactive.eai.rms.common.util.CommonUtil; +import com.eactive.eai.rms.data.entity.onl.apim.obp.ObpGwMetricDAO; +import com.eactive.eai.rms.data.entity.onl.apim.obp.ObpGwMetricService; +import com.eactive.eai.rms.data.entity.onl.apim.obp.ObpGwMetricVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.stream.Collectors; + +/** + * ObpGwMetric Man Service - 비즈니스 로직 + * API Gateway 로그 데이터를 집계하여 ObpGwMetric 엔티티로 저장 + */ +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +public class ObpGwMetricManService extends BaseService { + + private static final Logger log = LoggerFactory.getLogger(ObpGwMetricManService.class); + + /** + * 집계 범위 시간 (단위: 시간) + * - 1: 직전 1시간만 집계 + * - 5: 직전 5시간까지 각각 1시간 단위로 집계 + */ + private static final int AGGREGATION_HOUR_RANGE = 1; + + private static final DateTimeFormatter TIMESLICE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH0000000"); + private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); + private static final DateTimeFormatter YYYYMMDD_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + + private final ObpGwMetricDAO obpGwMetricDAO; + private final ObpGwMetricService obpGwMetricService; + + public ObpGwMetricManService(ObpGwMetricDAO obpGwMetricDAO, ObpGwMetricService obpGwMetricService) { + this.obpGwMetricDAO = obpGwMetricDAO; + this.obpGwMetricService = obpGwMetricService; + } + + /** + * 다중 시간대 집계 실행 (Job에서 호출) + */ + public void executeHourlyAggregation() { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime baseHour = now.truncatedTo(ChronoUnit.HOURS); // 현재 시간의 정각 + + log.info("========== ObpGwMetric 집계 시작 =========="); + log.info("실행 시간: {}, AGGREGATION_HOUR_RANGE: {}", now, AGGREGATION_HOUR_RANGE); + + for (int i = 1; i <= AGGREGATION_HOUR_RANGE; i++) { + LocalDateTime targetHour = baseHour.minusHours(i); + log.info("집계 대상 시간대: {}", targetHour); + createHourlyData(targetHour); + } + + log.info("========== ObpGwMetric 집계 완료 =========="); + } + + /** + * 1시간 단위 ObpGwMetric 데이터 생성 (UPSERT) + */ + public void createHourlyData(LocalDateTime targetHour) { + long jobStartTime = System.currentTimeMillis(); + log.info("ObpGwMetric 집계 시작: targetHour={}", targetHour); + + try { + String timeslice = targetHour.format(TIMESLICE_FORMATTER); + String yyyymmdd = targetHour.format(YYYYMMDD_FORMATTER); + String tableName = CommonUtil.getLogTable(yyyymmdd, true); + String startTime = targetHour.format(TIMESTAMP_FORMATTER); + String endTime = targetHour.plusHours(1).minusNanos(1).format(TIMESTAMP_FORMATTER); + + // ═══════════════════════════════════════════════════════════════════ + // 1단계: GW DB에서 EAIBZWKDSTCD 코드 목록 조회 + // ═══════════════════════════════════════════════════════════════════ + long step1Start = System.currentTimeMillis(); + DataSourceType apigwDataSourceType = DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW); + DataSourceContextHolder.setDataSourceType(apigwDataSourceType); + + List bzwkCodes = obpGwMetricDAO.selectAllBzwkCodes(apigwDataSourceType.getSchema()); + log.info("[1단계] EAIBZWKDSTCD 코드 조회 완료: count={}, elapsed={}ms", + bzwkCodes.size(), System.currentTimeMillis() - step1Start); + + // ═══════════════════════════════════════════════════════════════════ + // 2단계: 코드별 개별 쿼리 실행 후 결과 병합 + // ═══════════════════════════════════════════════════════════════════ + long step2Start = System.currentTimeMillis(); + Map aggregatedMap = new HashMap<>(); + int totalLogCount = 0; + + for (String bzwkCode : bzwkCodes) { + long codeStart = System.currentTimeMillis(); + + HashMap paramMap = new HashMap<>(); + paramMap.put("schemaId", apigwDataSourceType.getSchema()); + paramMap.put("tableName", tableName); + paramMap.put("bzwkCode", bzwkCode); + paramMap.put("startTime", startTime); + paramMap.put("endTime", endTime); + paramMap.put("timeslice", timeslice); + + List partialResult = obpGwMetricDAO.selectHourlyMetricsByBzwkCode(paramMap); + + for (ObpGwMetricVO vo : partialResult) { + String key = vo.getAggregationKey(); + aggregatedMap.merge(key, vo, this::mergeMetricVO); + } + + if (!partialResult.isEmpty()) { + log.debug("[2단계] bzwkCode={}, 집계건수={}, elapsed={}ms", + bzwkCode, partialResult.size(), System.currentTimeMillis() - codeStart); + } + totalLogCount += partialResult.size(); + } + + List aggregatedList = new ArrayList<>(aggregatedMap.values()); + log.info("[2단계] 로그 집계 완료: 원본건수={}, 병합후건수={}, elapsed={}ms", + totalLogCount, aggregatedList.size(), System.currentTimeMillis() - step2Start); + + if (aggregatedList.isEmpty()) { + log.warn("집계 대상 데이터 없음: targetHour={}", targetHour); + return; + } + + // ═══════════════════════════════════════════════════════════════════ + // 3단계: 부가 정보 조회 (apiName, uri) - GW DB + // ═══════════════════════════════════════════════════════════════════ + long step3Start = System.currentTimeMillis(); + Set apiIds = aggregatedList.stream() + .map(ObpGwMetricVO::getApiId) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + + Map apiNameMap = obpGwMetricDAO.selectApiNames(apigwDataSourceType.getSchema(), apiIds); + Map uriMap = obpGwMetricDAO.selectUris(apigwDataSourceType.getSchema(), apiIds); + log.info("[3단계] 부가정보 조회 완료: apiCount={}, elapsed={}ms", + apiIds.size(), System.currentTimeMillis() - step3Start); + + // ═══════════════════════════════════════════════════════════════════ + // 4단계: 지표 DB로 전환 후 appId 조회 및 UPSERT + // ═══════════════════════════════════════════════════════════════════ + long step4Start = System.currentTimeMillis(); + DataSourceContextHolder.setDataSourceType( + DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.MONITORING)); + + Set orgIds = aggregatedList.stream() + .map(ObpGwMetricVO::getOrgId) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + Map appIdMap = obpGwMetricDAO.selectAppIdsByOrgIds(orgIds); + + int insertCount = 0; + int updateCount = 0; + + for (ObpGwMetricVO vo : aggregatedList) { + LocalDateTime timesliceDateTime = vo.getTimesliceAsLocalDateTime(); + + Optional existing = obpGwMetricService.findByUniqueKey( + timesliceDateTime, + vo.getApiId(), + vo.getClientId(), + vo.getHostname(), + vo.getOrgId() + ); + + if (existing.isPresent()) { + // UPDATE: 기존 데이터 갱신 + ObpGwMetric entity = existing.get(); + entity.setAttemptedCount(vo.getAttemptedCount()); + entity.setCompletedCount(vo.getCompletedCount()); + entity.setApiName(apiNameMap.get(vo.getApiId())); + entity.setUri(uriMap.get(vo.getApiId())); + entity.setAppId(appIdMap.get(vo.getOrgId())); + entity.setUpdateCount(entity.getUpdateCount() + 1); // 보정 횟수 증가 + obpGwMetricService.save(entity); + updateCount++; + } else { + // INSERT: 신규 데이터 생성 + ObpGwMetric entity = convertToEntity(vo, apiNameMap, uriMap, appIdMap); + obpGwMetricService.save(entity); + insertCount++; + } + } + + log.info("[4단계] UPSERT 완료: INSERT={}, UPDATE={}, elapsed={}ms", + insertCount, updateCount, System.currentTimeMillis() - step4Start); + + long totalElapsed = System.currentTimeMillis() - jobStartTime; + log.info("ObpGwMetric 집계 완료: targetHour={}, 총 소요시간={}ms ({}초)", + targetHour, totalElapsed, totalElapsed / 1000.0); + + } catch (Exception e) { + log.error("ObpGwMetric 집계 실패: targetHour={}", targetHour, e); + throw e; + } + } + + /** + * ObpGwMetricVO 병합 (count 누적) + */ + private ObpGwMetricVO mergeMetricVO(ObpGwMetricVO existing, ObpGwMetricVO incoming) { + existing.setAttemptedCount( + (existing.getAttemptedCount() != null ? existing.getAttemptedCount() : 0L) + + (incoming.getAttemptedCount() != null ? incoming.getAttemptedCount() : 0L) + ); + existing.setCompletedCount( + (existing.getCompletedCount() != null ? existing.getCompletedCount() : 0L) + + (incoming.getCompletedCount() != null ? incoming.getCompletedCount() : 0L) + ); + return existing; + } + + /** + * VO → Entity 변환 + */ + private ObpGwMetric convertToEntity(ObpGwMetricVO vo, Map apiNameMap, + Map uriMap, Map appIdMap) { + ObpGwMetric entity = new ObpGwMetric(); + entity.setClientId(vo.getClientId()); + entity.setHostname(vo.getHostname()); + entity.setTimeslice(vo.getTimesliceAsLocalDateTime()); + entity.setApiId(vo.getApiId()); + entity.setOrgId(vo.getOrgId()); + entity.setAttemptedCount(vo.getAttemptedCount()); + entity.setCompletedCount(vo.getCompletedCount()); + entity.setApiName(apiNameMap.get(vo.getApiId())); + entity.setUri(uriMap.get(vo.getApiId())); + entity.setAppId(appIdMap.get(vo.getOrgId())); + entity.setUpdateCount(0); + return entity; + } + + /** + * 특정 시간대의 GwMetric 데이터 조회 (REST API용) + */ + public List findByTimeslice(LocalDateTime timeslice) { + DataSourceContextHolder.setDataSourceType( + DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.MONITORING)); + + List entities = obpGwMetricService.findByTimeslice(timeslice); + return entities.stream() + .map(ObpGwMetricDTO::from) + .collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java new file mode 100644 index 0000000..35befd3 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java @@ -0,0 +1,56 @@ +package com.eactive.eai.rms.onl.common.service; + +import com.eactive.eai.rms.common.context.MonitoringContext; +import com.eactive.eai.rms.common.util.CommonUtil; +import com.eactive.eai.rms.onl.apim.obp.ObpGwMetricManService; +import com.eactive.eai.rms.onl.common.util.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.SchedulerException; +import org.springframework.context.ApplicationContext; + +/** + * ObpGwMetric Hour Job - Quartz Job + * API Gateway 로그 데이터를 1시간 단위로 집계하여 ObpGwMetric 테이블에 저장 + * + *

Cron Schedule 권장:

+ *
    + *
  • 기본: 0 5 * * * ? (매시 05분 1회 실행)
    • + *
  • 보정 (15분): 0 5,20,35,50 * * * ? (15분 간격 4회 실행)
    • + *
  • 보정 (10분): 0 5,15,25,35,45,55 * * * ? (10분 간격 6회 실행)
    • + *
+ */ +public class ObpGwMetricHourJob implements Job { + + private static final Logger log = LoggerFactory.getLogger(ObpGwMetricHourJob.class); + + private transient MonitoringContext monitoringContext; + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException { + log.info("*** START ObpGwMetricHourJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); + + ApplicationContext appContext = null; + try { + appContext = (ApplicationContext) context.getScheduler().getContext().get("applicationContext"); + } catch (SchedulerException e) { + log.error("applicationContext get module error", e); + return; + } + + monitoringContext = (MonitoringContext) appContext.getBean("monitoringContext"); + ObpGwMetricManService obpGwMetricManService = appContext.getBean(ObpGwMetricManService.class); + + try { + obpGwMetricManService.executeHourlyAggregation(); + } catch (Exception e) { + log.error("ObpGwMetricHourJob execution failed", e); + throw new JobExecutionException(e); + } + + log.info("*** END ObpGwMetricHourJob run({})", DateUtil.getDateTime("yyyy-MM-dd HH:mm")); + } +} diff --git a/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml b/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml new file mode 100644 index 0000000..caeb659 --- /dev/null +++ b/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml @@ -0,0 +1,91 @@ + + + + + + + + SELECT EAIBZWKDSTCD + FROM $schemaId$.TSEAICM01 + ORDER BY EAIBZWKDSTCD + + + + + + + + + + + + + + + + SELECT + EAISVCNAME AS API_ID, + CLIENTID AS CLIENT_ID, + EAISEVRINSTNCNAME AS HOSTNAME, + ORGID AS ORG_ID, + '$timeslice$' AS TIMESLICE, + SUM(CASE WHEN LOGPRCSSSERNO = '100' THEN 1 ELSE 0 END) AS ATTEMPTED_COUNT, + SUM(CASE WHEN LOGPRCSSSERNO = '400' + AND (RSPNSERRCDNAME IS NULL + OR (RSPNSERRCDNAME NOT LIKE 'RE%' AND RSPNSERRCDNAME NOT LIKE 'RF%')) + THEN 1 ELSE 0 END) AS COMPLETED_COUNT + FROM $schemaId$.$tableName$ + WHERE EAIBZWKDSTCD = #bzwkCode# + AND MSGDPSTYMS BETWEEN #startTime# AND #endTime# + GROUP BY EAISVCNAME, CLIENTID, EAISEVRINSTNCNAME, ORGID + HAVING SUM(CASE WHEN LOGPRCSSSERNO = '100' THEN 1 ELSE 0 END) > 0 + OR SUM(CASE WHEN LOGPRCSSSERNO = '400' THEN 1 ELSE 0 END) > 0 + + + + + SELECT + EAISVCNAME AS API_ID, + EAISVCDESC AS API_NAME + FROM $schemaId$.TSEAIHE01 + WHERE EAISVCNAME IN + + #apiIds[]# + + + + + + SELECT + EAISVCNAME AS API_ID, + BZWKSVCKEYNAME AS URI + FROM $schemaId$.TSEAIHS04 + WHERE EAISVCNAME IN + + #apiIds[]# + + + + + + SELECT + ORG_ID, + ID AS APP_ID + FROM PTL_APP_REQUEST + WHERE ORG_ID IN + + #orgIds[]# + + + + From a90b481120b206a315f970fe0865523de86a716d Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 15:12:42 +0900 Subject: [PATCH 04/15] =?UTF-8?q?OBP=20GwMetric=20=EA=B2=80=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kjb-docs/GwMetricHourJob.md | 5 + readme.md | 5 +- .../entity/onl/apim/obp/ObpGwMetricDAO.java | 52 ++++++---- .../onl/apim/obp/ObpGwMetricService.java | 19 ++-- .../entity/onl/apim/obp/ObpGwMetricVO.java | 2 +- .../onl/apim/obp/ObpGwMetricManService.java | 29 +++++- .../common/service/ObpGwMetricHourJob.java | 99 ++++++++++++++++++- .../eai/apim/obp/ObpGwMetric-oracle.xml | 13 ++- 8 files changed, 175 insertions(+), 49 deletions(-) create mode 100644 kjb-docs/GwMetricHourJob.md diff --git a/kjb-docs/GwMetricHourJob.md b/kjb-docs/GwMetricHourJob.md new file mode 100644 index 0000000..efce18f --- /dev/null +++ b/kjb-docs/GwMetricHourJob.md @@ -0,0 +1,5 @@ +# ObpGwMetricHourJob +- Job명 : ObpGwMetricHourJob +- 설명 : GW 시간당 거래 지표 - OBP 과금기초데이터 +- com.eactive.eai.rms.onl.common.service.ObpGwMetricHourJob +- aggregation.hour.range : 집계 범위(최대 24로 제한) \ No newline at end of file diff --git a/readme.md b/readme.md index 684f7b1..7ea3719 100644 --- a/readme.md +++ b/readme.md @@ -668,7 +668,4 @@ insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Mon insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.obp.query_partnercode_uri', '/api/customer/findCustomerByBusinessManRegistrationNo/%s'); insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', 'kjb.obp.create_partnercode_uri', '/not-yet-implement/%s'); commit; -``` -## 라이선스 - -© 광주은행 (Kwangju Bank) +``` \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java index b61fbac..ca3d661 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.rms.data.entity.onl.apim.obp; import com.eactive.eai.rms.common.base.SqlMapClientTemplateDao; import org.springframework.stereotype.Repository; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,16 +45,19 @@ public class ObpGwMetricDAO extends SqlMapClientTemplateDao { HashMap paramMap = new HashMap<>(); paramMap.put("schemaId", schemaId); - paramMap.put("apiIds", apiIds); + paramMap.put("apiIds", new ArrayList<>(apiIds)); // Set → List 변환 (iBATIS iterate 호환) List> resultList = this.template.queryForList("ObpGwMetric.selectApiNames", paramMap); - return resultList.stream() - .collect(Collectors.toMap( - m -> m.get("API_ID"), - m -> m.get("API_NAME"), - (v1, v2) -> v1 - )); + Map result = new HashMap<>(); + for (Map m : resultList) { + String apiId = m.get("API_ID"); + String apiName = m.get("API_NAME"); + if (apiId != null && apiName != null) { + result.put(apiId, apiName); + } + } + return result; } /** @@ -67,16 +71,19 @@ public class ObpGwMetricDAO extends SqlMapClientTemplateDao { HashMap paramMap = new HashMap<>(); paramMap.put("schemaId", schemaId); - paramMap.put("apiIds", apiIds); + paramMap.put("apiIds", new ArrayList<>(apiIds)); // Set → List 변환 (iBATIS iterate 호환) List> resultList = this.template.queryForList("ObpGwMetric.selectUris", paramMap); - return resultList.stream() - .collect(Collectors.toMap( - m -> m.get("API_ID"), - m -> m.get("URI"), - (v1, v2) -> v1 - )); + Map result = new HashMap<>(); + for (Map m : resultList) { + String apiId = m.get("API_ID"); + String uri = m.get("URI"); + if (apiId != null && uri != null) { + result.put(apiId, uri); + } + } + return result; } /** @@ -89,15 +96,18 @@ public class ObpGwMetricDAO extends SqlMapClientTemplateDao { } HashMap paramMap = new HashMap<>(); - paramMap.put("orgIds", orgIds); + paramMap.put("orgIds", new ArrayList<>(orgIds)); // Set → List 변환 (iBATIS iterate 호환) List> resultList = this.template.queryForList("ObpGwMetric.selectAppIdsByOrgIds", paramMap); - return resultList.stream() - .collect(Collectors.toMap( - m -> m.get("ORG_ID"), - m -> m.get("APP_ID"), - (v1, v2) -> v1 - )); + Map result = new HashMap<>(); + for (Map m : resultList) { + String orgId = m.get("ORG_ID"); + String appId = m.get("APP_ID"); + if (orgId != null && appId != null) { + result.put(orgId, appId); + } + } + return result; } } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java index 79d3022..be973ab 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java @@ -1,7 +1,6 @@ package com.eactive.eai.rms.data.entity.onl.apim.obp; import com.eactive.apim.portal.obp.entity.ObpGwMetric; -import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,13 +13,19 @@ import java.util.Optional; */ @Service @Transactional(transactionManager = "transactionManagerForEMS") -public class ObpGwMetricService extends AbstractEMSDataSerivce { +public class ObpGwMetricService { + + private final ObpGwMetricRepository repository; + + public ObpGwMetricService(ObpGwMetricRepository repository) { + this.repository = repository; + } /** * UPSERT 판단을 위한 기존 데이터 조회 */ public Optional findByUniqueKey(LocalDateTime timeslice, String apiId, String clientId, String hostname, String orgId) { - return getRepository().findByTimesliceAndApiIdAndClientIdAndHostnameAndOrgId( + return repository.findByTimesliceAndApiIdAndClientIdAndHostnameAndOrgId( timeslice, apiId, clientId, hostname, orgId); } @@ -28,27 +33,27 @@ public class ObpGwMetricService extends AbstractEMSDataSerivce findByTimeslice(LocalDateTime timeslice) { - return getRepository().findByTimeslice(timeslice); + return repository.findByTimeslice(timeslice); } /** * 특정 시간 범위의 GwMetric 데이터 조회 */ public List findByTimesliceBetween(LocalDateTime startTime, LocalDateTime endTime) { - return getRepository().findByTimesliceBetween(startTime, endTime); + return repository.findByTimesliceBetween(startTime, endTime); } /** * 엔티티 저장 (INSERT 또는 UPDATE) */ public ObpGwMetric save(ObpGwMetric entity) { - return getRepository().save(entity); + return repository.save(entity); } /** * 엔티티 목록 저장 */ public List saveAll(List entities) { - return getRepository().saveAll(entities); + return repository.saveAll(entities); } } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java index 20adc9a..db55110 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricVO.java @@ -45,7 +45,7 @@ public class ObpGwMetricVO { if (timeslice == null || timeslice.isEmpty()) { return null; } - // yyyyMMddHH0000000 형식에서 앞 10자리(yyyyMMddHH)만 사용 + // "yyyyMMddHH0000000" 형식에서 앞 10자리(yyyyMMddHH)만 사용 String dateTimeStr = timeslice.substring(0, 10) + "0000"; return LocalDateTime.parse(dateTimeStr, DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java index 8543dec..f4a458f 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/obp/ObpGwMetricManService.java @@ -31,11 +31,13 @@ public class ObpGwMetricManService extends BaseService { private static final Logger log = LoggerFactory.getLogger(ObpGwMetricManService.class); /** - * 집계 범위 시간 (단위: 시간) + * 기본 집계 범위 시간 (단위: 시간) * - 1: 직전 1시간만 집계 * - 5: 직전 5시간까지 각각 1시간 단위로 집계 + * + *

Job 파라미터로 오버라이드 가능 (aggregation.hour.range)

*/ - private static final int AGGREGATION_HOUR_RANGE = 1; + public static final int DEFAULT_AGGREGATION_HOUR_RANGE = 1; private static final DateTimeFormatter TIMESLICE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH0000000"); private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); @@ -50,22 +52,35 @@ public class ObpGwMetricManService extends BaseService { } /** - * 다중 시간대 집계 실행 (Job에서 호출) + * 다중 시간대 집계 실행 (Job에서 호출) - 기본 집계 범위 사용 */ public void executeHourlyAggregation() { + executeHourlyAggregation(DEFAULT_AGGREGATION_HOUR_RANGE); + } + + /** + * 다중 시간대 집계 실행 (Job에서 호출) + * + * @param aggregationHourRange 집계 범위 시간 (단위: 시간) + * 예: 1=직전 1시간, 3=직전 3시간 각각 집계 + */ + public void executeHourlyAggregation(int aggregationHourRange) { + long totalStartTime = System.currentTimeMillis(); LocalDateTime now = LocalDateTime.now(); LocalDateTime baseHour = now.truncatedTo(ChronoUnit.HOURS); // 현재 시간의 정각 log.info("========== ObpGwMetric 집계 시작 =========="); - log.info("실행 시간: {}, AGGREGATION_HOUR_RANGE: {}", now, AGGREGATION_HOUR_RANGE); + log.info("실행 시간: {}, aggregationHourRange: {}", now, aggregationHourRange); - for (int i = 1; i <= AGGREGATION_HOUR_RANGE; i++) { + for (int i = 1; i <= aggregationHourRange; i++) { LocalDateTime targetHour = baseHour.minusHours(i); log.info("집계 대상 시간대: {}", targetHour); createHourlyData(targetHour); } + long totalElapsed = System.currentTimeMillis() - totalStartTime; log.info("========== ObpGwMetric 집계 완료 =========="); + log.info("전체 집계 소요시간: {}ms ({}초)", totalElapsed, String.format("%.2f", totalElapsed / 1000.0)); } /** @@ -184,6 +199,8 @@ public class ObpGwMetricManService extends BaseService { entity.setUri(uriMap.get(vo.getApiId())); entity.setAppId(appIdMap.get(vo.getOrgId())); entity.setUpdateCount(entity.getUpdateCount() + 1); // 보정 횟수 증가 + entity.setUpdatedAt(LocalDateTime.now()); + entity.setUpdatedBy("GwMetricHourJob"); obpGwMetricService.save(entity); updateCount++; } else { @@ -239,6 +256,8 @@ public class ObpGwMetricManService extends BaseService { entity.setUri(uriMap.get(vo.getApiId())); entity.setAppId(appIdMap.get(vo.getOrgId())); entity.setUpdateCount(0); + entity.setCreatedAt(LocalDateTime.now()); + entity.setCreatedBy("GwMetricHourJob"); return entity; } diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java index 35befd3..7b93297 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ObpGwMetricHourJob.java @@ -4,12 +4,13 @@ import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.common.util.CommonUtil; import com.eactive.eai.rms.onl.apim.obp.ObpGwMetricManService; import com.eactive.eai.rms.onl.common.util.DateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.quartz.Job; +import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.quartz.SchedulerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; /** @@ -22,18 +23,45 @@ import org.springframework.context.ApplicationContext; *
  • 보정 (15분): 0 5,20,35,50 * * * ? (15분 간격 4회 실행)
    • *
  • 보정 (10분): 0 5,15,25,35,45,55 * * * ? (10분 간격 6회 실행)
    • * + * + *

    Job 파라미터 (JobDataMap):

    + *
      + *
    • aggregation.hour.range: 집계 범위 시간 (단위: 시간, 기본값: 1) + *
        + *
      • 1: 직전 1시간만 집계
        • + *
      • 3: 직전 3시간 각각 집계
        • + *
      • 5: 직전 5시간 각각 집계
        • + *
      + *
      • + *
    + * + *

    예시 (Quartz 스케줄 등록 시):

    + * 
    + * JobDataMap jobDataMap = new JobDataMap();
+ * jobDataMap.put("aggregation.hour.range", "3");
+ *
    */ public class ObpGwMetricHourJob implements Job { private static final Logger log = LoggerFactory.getLogger(ObpGwMetricHourJob.class); + /** Job 파라미터 키: 집계 범위 시간 */ + public static final String PARAM_AGGREGATION_HOUR_RANGE = "aggregation.hour.range"; + + /** 기본 집계 범위 시간 (시간 단위) */ + public static final int DEFAULT_AGGREGATION_HOUR_RANGE = 1; + private transient MonitoringContext monitoringContext; @Override public void execute(JobExecutionContext context) throws JobExecutionException { log.info("*** START ObpGwMetricHourJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); - ApplicationContext appContext = null; + // Job 파라미터 로깅 + JobDataMap jobDataMap = context.getJobDetail().getJobDataMap(); + logJobParameters(jobDataMap); + + ApplicationContext appContext; try { appContext = (ApplicationContext) context.getScheduler().getContext().get("applicationContext"); } catch (SchedulerException e) { @@ -44,8 +72,11 @@ public class ObpGwMetricHourJob implements Job { monitoringContext = (MonitoringContext) appContext.getBean("monitoringContext"); ObpGwMetricManService obpGwMetricManService = appContext.getBean(ObpGwMetricManService.class); + // 집계 범위 시간 파라미터 파싱 + int aggregationHourRange = parseAggregationHourRange(jobDataMap); + try { - obpGwMetricManService.executeHourlyAggregation(); + obpGwMetricManService.executeHourlyAggregation(aggregationHourRange); } catch (Exception e) { log.error("ObpGwMetricHourJob execution failed", e); throw new JobExecutionException(e); @@ -53,4 +84,64 @@ public class ObpGwMetricHourJob implements Job { log.info("*** END ObpGwMetricHourJob run({})", DateUtil.getDateTime("yyyy-MM-dd HH:mm")); } + + /** + * Job 파라미터 로깅 + */ + private void logJobParameters(JobDataMap jobDataMap) { + if (jobDataMap == null || jobDataMap.isEmpty()) { + log.debug("Job 파라미터 없음 (기본값 사용)"); + return; + } + + StringBuilder sb = new StringBuilder("Job 파라미터: "); + for (String key : jobDataMap.getKeys()) { + sb.append(key).append("=").append(jobDataMap.getString(key)).append(", "); + } + log.info(sb.toString()); + } + + /** + * 집계 범위 시간 파라미터 파싱 + * + * @param jobDataMap Job 파라미터 맵 + * @return 집계 범위 시간 (파싱 실패 시 기본값 반환) + */ + private int parseAggregationHourRange(JobDataMap jobDataMap) { + if (jobDataMap == null) { + return DEFAULT_AGGREGATION_HOUR_RANGE; + } + + try { + String value = jobDataMap.getString(PARAM_AGGREGATION_HOUR_RANGE); + if (value != null && !value.trim().isEmpty()) { + int parsedValue = Integer.parseInt(value.trim()); + if (parsedValue < 1) { + log.warn("aggregation.hour.range 값이 1 미만입니다. 기본값({}) 사용: input={}", + DEFAULT_AGGREGATION_HOUR_RANGE, parsedValue); + return DEFAULT_AGGREGATION_HOUR_RANGE; + } + // 개발 모드(D)가 아닌 경우에만 24시간 제한 적용 + if (parsedValue > 24 && !isDevMode()) { + log.warn("aggregation.hour.range 값이 24 초과입니다. 24로 제한: input={}", parsedValue); + return 24; + } + return parsedValue; + } + } catch (NumberFormatException e) { + log.warn("aggregation.hour.range 파싱 실패, 기본값({}) 사용: {}", + DEFAULT_AGGREGATION_HOUR_RANGE, e.getMessage()); + } + + return DEFAULT_AGGREGATION_HOUR_RANGE; + } + + /** + * 개발 모드 여부 확인 + * @return eai.systemmode=D 이면 true + */ + private boolean isDevMode() { + String systemMode = System.getProperty("eai.systemmode", ""); + return "D".equalsIgnoreCase(systemMode); + } } diff --git a/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml b/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml index caeb659..ab42299 100644 --- a/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml +++ b/src/main/resources/com/eactive/eai/apim/obp/ObpGwMetric-oracle.xml @@ -24,9 +24,9 @@ + SELECT EAISVCNAME AS API_ID, - BZWKSVCKEYNAME AS URI + APIFULLPATH AS URI FROM $schemaId$.TSEAIHS04 WHERE EAISVCNAME IN From 38f37adc1071eae5aafc08521a05a740b4674f69 Mon Sep 17 00:00:00 2001 From: "Yunsam.Eo" Date: Wed, 10 Dec 2025 20:21:05 +0900 Subject: [PATCH 05/15] =?UTF-8?q?API=EB=93=B1=EB=A1=9D=EC=8B=9C=20HTTP=20I?= =?UTF-8?q?nbound=20Adapter=20=ED=97=88=EC=9A=A9.=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/onl/transaction/apim/apiInterfaceManDetail.jsp | 10 +++++----- .../rms/onl/transaction/apim/ApiInterfaceService.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp index 62702a9..a87c12f 100644 --- a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp +++ b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp @@ -313,9 +313,9 @@ return name + '=' + value; }).join(';'); if(headerValues.length > 0){ - $("#headerRoutingButton").text('Headers ['+label+']'); + $("#headerRoutingButton").text('MessageKey ['+label+']'); }else{ - $("#headerRoutingButton").text('HTTP 헤더 라우팅 정보 없음'); + $("#headerRoutingButton").text('MessageKey 라우팅 정보 없음'); } } @@ -382,7 +382,7 @@ '' + '' + '
    ' + - '' + + '' + '
    ' + ''; $('#headerPairs').append(newPairHtml); @@ -1632,7 +1632,7 @@
    diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java index 37345a5..cd66ffa 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java @@ -617,9 +617,9 @@ public class ApiInterfaceService extends OnlBaseService { } - - if (!"RST".equals(adapterGroup.getAdptrcd())) { - throw new RuntimeException("인바운드 어댑터가 타입이 REST가 아닙니다. 타입을 확인하세요"); + // HTTP 어댑터도 등록 가능하도록 수정. + if (!"RST".equals(adapterGroup.getAdptrcd())&&!"HTT".equals(adapterGroup.getAdptrcd())) { + throw new RuntimeException("인바운드 어댑터가 타입이 REST/HTTP가 아닙니다. 타입을 확인하세요"); } StandardMessageInfo standardMessageInfo = apiInterfaceUIMapper.toStandardMessageInfo(vo); From adf1fd63fb7989993458014b542d4b5fc1318e32 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 21:27:11 +0900 Subject: [PATCH 06/15] =?UTF-8?q?kjbproperty=20=EB=A1=9C=EB=94=A9=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B0=8F=20NPE=20=EB=AC=B8=EC=A0=9C=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 --- .../service/MonitoringPropertyService.java | 11 ++++--- .../service/ums/UmsDispatchService.java | 22 +++++-------- .../ext/kjb/util/KjbPropertyInjector.java | 31 ++++++++++++++----- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java index bbd3e0d..02791b6 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java @@ -41,12 +41,13 @@ public class MonitoringPropertyService id.setPrptyName(prptyName); Optional property = repository.findById(id); - if (property.isPresent() && !property.get().getPrpty2Val().isEmpty()) { - return property.get().getPrpty2Val(); - } else { - return defaultValue; + if (property.isPresent()) { + String value = property.get().getPrpty2Val(); + if (value != null && !value.isEmpty()) { + return value; + } } - + return defaultValue; } public Iterable findAllByIdPrptyName(String prptyName) { diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java index 5211520..5b30d91 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java @@ -17,13 +17,14 @@ import org.springframework.transaction.support.TransactionTemplate; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import java.io.IOException; import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import javax.annotation.PostConstruct; + @Slf4j @Service @@ -55,11 +56,7 @@ public class UmsDispatchService { MessageRequestRepository messageRequestRepository ) { this.kjbPropertyInjector = new KjbPropertyInjector(monitoringPropertyService, PROP_GORUP_ID); - this.messageRequestRepository = messageRequestRepository; -// this.kjbEmailService = kjbEmailService; -// this.kjbSafedbWrapper = kjbSafedbWrapper; -// this.monitoringPropertyService = monitoringPropertyService; this.executorService = new ThreadPoolExecutor( CORE_POOL_SIZE, @@ -72,21 +69,16 @@ public class UmsDispatchService { this.transactionTemplate = new TransactionTemplate(transactionManager); log.debug("UmsDispatchService initialized with thread pool - core: {}, max: {}, queue: {}", CORE_POOL_SIZE, MAX_POOL_SIZE, QUEUE_CAPACITY); + } - - KjbProperty prop = new KjbProperty(); -// prop.setEaiBatchUrl(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.url")); -// prop.setUmsEaiBatchSendDir(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.send_dir")); -// prop.setUmsEaiBatchBackupDir(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.backup_dir")); -// prop.setUmsEaiBatchInterfaceId(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.interface_id")); -// prop.setUmsHostUrl(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.host_url")); -// prop.setUmsApiKey(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.api_key")); - prop = kjbPropertyInjector.inject(prop); + @PostConstruct + public void init() { + KjbProperty prop = kjbPropertyInjector.inject(new KjbProperty()); try { this.kjbUmsService = new KjbUmsService(prop); - this.kjbEmailSendModule = KjbEmailSendModule.getInstance(prop, messageRequestRepository); + log.info("KjbUmsService and KjbEmailSendModule initialized successfully"); } catch (Exception e) { log.error("Failed to initialize KjbUmsService or KjbEmailSendModule: {}", e.getMessage(), e); } diff --git a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java index 8b4ac6c..d0074e5 100644 --- a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java +++ b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java @@ -30,6 +30,11 @@ public class KjbPropertyInjector { String rawValue = monitoringPropertyService.getPropertyValue(groupId, key, anno.defaultValue()); Object convertedValue = convertValue(field.getType(), rawValue); + // null이면 필드의 기본값 유지 (primitive 타입에 null 할당 방지) + if (convertedValue == null) { + continue; + } + field.setAccessible(true); try { field.set(property, convertedValue); @@ -46,16 +51,26 @@ public class KjbPropertyInjector { private static Object convertValue(Class type, String rawValue) { if (rawValue == null) return null; - if (StringUtils.isEmpty(rawValue)) return ""; if (type == String.class) return rawValue; - if (type == Integer.class || type == int.class) return Integer.valueOf(rawValue); - if (type == Long.class || type == long.class) return Long.valueOf(rawValue); - if (type == Double.class || type == double.class) return Double.valueOf(rawValue); - if (type == Boolean.class || type == boolean.class) return Boolean.valueOf(rawValue); - if (type == Float.class || type == float.class) return Float.valueOf(rawValue); - if (type == Short.class || type == short.class) return Short.valueOf(rawValue); - if (type == Byte.class || type == byte.class) return Byte.valueOf(rawValue); + + // 빈 문자열인 경우 primitive 타입은 null 반환 (필드의 기본값 유지) + if (StringUtils.isEmpty(rawValue)) { + return null; + } + + try { + if (type == Integer.class || type == int.class) return Integer.valueOf(rawValue); + if (type == Long.class || type == long.class) return Long.valueOf(rawValue); + if (type == Double.class || type == double.class) return Double.valueOf(rawValue); + if (type == Boolean.class || type == boolean.class) return Boolean.valueOf(rawValue); + if (type == Float.class || type == float.class) return Float.valueOf(rawValue); + if (type == Short.class || type == short.class) return Short.valueOf(rawValue); + if (type == Byte.class || type == byte.class) return Byte.valueOf(rawValue); + } catch (NumberFormatException e) { + log.warn("Failed to convert value '{}' to type {}, returning null", rawValue, type.getSimpleName()); + return null; + } return rawValue; } From 962e54ec936207ca427b89f74b1e9802c5b18ebe Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 21:48:19 +0900 Subject: [PATCH 07/15] =?UTF-8?q?KjbProperty=20=EC=9E=AC=EB=A1=9C=EB=94=A9?= =?UTF-8?q?=20=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ums/UmsDispatchService.java | 33 +++++++++++++-- .../ext/kjb/util/KjbPropertyInjector.java | 42 +++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java index 5b30d91..4a42c9c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java @@ -47,6 +47,7 @@ public class UmsDispatchService { private KjbUmsService kjbUmsService; private KjbEmailSendModule kjbEmailSendModule; private final KjbPropertyInjector kjbPropertyInjector; + private KjbProperty kjbProperty; @Autowired @@ -73,23 +74,47 @@ public class UmsDispatchService { @PostConstruct public void init() { - KjbProperty prop = kjbPropertyInjector.inject(new KjbProperty()); + this.kjbProperty = kjbPropertyInjector.inject(new KjbProperty()); try { - this.kjbUmsService = new KjbUmsService(prop); - this.kjbEmailSendModule = KjbEmailSendModule.getInstance(prop, messageRequestRepository); + this.kjbUmsService = new KjbUmsService(kjbProperty); + this.kjbEmailSendModule = KjbEmailSendModule.getInstance(kjbProperty, messageRequestRepository); log.info("KjbUmsService and KjbEmailSendModule initialized successfully"); } catch (Exception e) { log.error("Failed to initialize KjbUmsService or KjbEmailSendModule: {}", e.getMessage(), e); } } + /** + * URL 설정값이 비어있을 경우 DB에서 재로딩 후 서비스 재초기화 + */ + private void reloadPropertyIfNeeded() { + if (!kjbPropertyInjector.isUrlConfigured(kjbProperty)) { + log.info("KjbProperty URL 값이 비어있어 재로딩 시도"); + KjbProperty reloaded = kjbPropertyInjector.reloadIfUrlEmpty(kjbProperty); + + if (reloaded != kjbProperty && kjbPropertyInjector.isUrlConfigured(reloaded)) { + this.kjbProperty = reloaded; + try { + this.kjbUmsService = new KjbUmsService(kjbProperty); + this.kjbEmailSendModule = KjbEmailSendModule.getInstance(kjbProperty, messageRequestRepository); + log.info("KjbProperty 재로딩 후 서비스 재초기화 완료"); + } catch (Exception e) { + log.error("KjbProperty 재로딩 후 서비스 재초기화 실패: {}", e.getMessage(), e); + } + } + } + } + @SuppressWarnings("unchecked") @Transactional(transactionManager = "transactionManagerForEMS") public void processMessages() { log.info("Starting to process pending messages"); - // 상태가 PENDING인 메시지들을 조회하고 바로 PROCESSING으로 변경 + // URL 설정값이 비어있을 경우 DB에서 재로딩 시도 + reloadPropertyIfNeeded(); + + // 상태가 PENDING인 메시지들을 조회하고 바로 PROCESSING으로 변경 List pendingMessages = entityManager.createQuery( "SELECT m FROM MessageRequest m WHERE m.requestStatus = :status " + "ORDER BY m.requestDate ASC") diff --git a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java index d0074e5..9173847 100644 --- a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java +++ b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java @@ -19,6 +19,48 @@ public class KjbPropertyInjector { this.groupId = groupId; } + /** + * KjbProperty의 URL 값들이 설정되어 있는지 확인 + * @param property 검사할 KjbProperty 객체 + * @return URL 값들이 모두 설정되어 있으면 true + */ + public boolean isUrlConfigured(KjbProperty property) { + if (property == null) return false; + + // 주요 URL 값들 중 하나라도 설정되어 있으면 true + return StringUtils.isNotEmpty(property.getEaiBatchUrl()) + || StringUtils.isNotEmpty(property.getUmsHostUrl()) + || StringUtils.isNotEmpty(property.getObpUrl()); + } + + /** + * URL 값이 비어있을 경우 DB에서 재로딩 시도 + * @param property 기존 KjbProperty 객체 + * @return 재로딩된 KjbProperty 객체 (재로딩 실패 시 기존 객체 반환) + */ + public KjbProperty reloadIfUrlEmpty(KjbProperty property) { + if (property == null) { + return inject(new KjbProperty()); + } + + if (!isUrlConfigured(property)) { + log.info("KjbProperty URL 값이 비어있어 DB에서 재로딩 시도"); + try { + KjbProperty reloaded = inject(new KjbProperty()); + if (isUrlConfigured(reloaded)) { + log.info("KjbProperty 재로딩 성공"); + return reloaded; + } else { + log.warn("KjbProperty 재로딩 후에도 URL 값이 비어있음"); + } + } catch (Exception e) { + log.error("KjbProperty 재로딩 실패: {}", e.getMessage(), e); + } + } + + return property; + } + public T inject(T property) { Class clazz = property.getClass(); From 85a5c630b52966d187f2e2e6ba0386e6ca408420 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:04:47 +0900 Subject: [PATCH 08/15] =?UTF-8?q?Property=20=ED=95=A8=EC=88=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitoringProperty/service/MonitoringPropertyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java index 02791b6..2956b26 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java @@ -20,7 +20,7 @@ public class MonitoringPropertyService public String findPrpty2ValById(String prptyGroupName, String key) { MonitoringPropertyId id = new MonitoringPropertyId(); id.setPrptyGroupName(prptyGroupName); - id.setPrptyGroupName(key); + id.setPrptyName(key); Optional property = repository.findById(id); return property.map(MonitoringProperty::getPrpty2Val).orElse(null); From 7136a36e78e182e7041302140fb4f6e8d92cab41 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:13:23 +0900 Subject: [PATCH 09/15] =?UTF-8?q?MonitoringProperty=20=EB=A1=9C=EA=B1=B0?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MonitoringPropertyService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java index 2956b26..6ce6042 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java @@ -2,6 +2,7 @@ package com.eactive.eai.rms.data.entity.man.monitoringProperty.service; import java.util.Optional; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,6 +15,7 @@ import com.querydsl.core.types.dsl.BooleanExpression; @Service @Transactional +@Slf4j public class MonitoringPropertyService extends AbstractDataService { @@ -44,9 +46,12 @@ public class MonitoringPropertyService if (property.isPresent()) { String value = property.get().getPrpty2Val(); if (value != null && !value.isEmpty()) { + log.debug("getPropertyValue - {} : {}", prptyName, value); return value; } } + + log.debug("getPropertyValue - {} : {} (defaultValue)", prptyName, defaultValue); return defaultValue; } From 9868547459aa177c8417ca88ccd48592edfe0f9e Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:22:06 +0900 Subject: [PATCH 10/15] =?UTF-8?q?KjbPropertyInjector=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/eactive/ext/kjb/util/KjbPropertyInjector.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java index 9173847..dd2c738 100644 --- a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java +++ b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java @@ -94,12 +94,12 @@ public class KjbPropertyInjector { private static Object convertValue(Class type, String rawValue) { if (rawValue == null) return null; - if (type == String.class) return rawValue; - - // 빈 문자열인 경우 primitive 타입은 null 반환 (필드의 기본값 유지) + // 빈 문자열인 경우 null 반환 (필드의 기본값 유지) if (StringUtils.isEmpty(rawValue)) { return null; } + + if (type == String.class) return rawValue; try { if (type == Integer.class || type == int.class) return Integer.valueOf(rawValue); From 27fac38c4414b6f145a3341b72df94112ab8a7e8 Mon Sep 17 00:00:00 2001 From: daekuk Date: Thu, 11 Dec 2025 10:04:25 +0900 Subject: [PATCH 11/15] =?UTF-8?q?inflow=20group=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/common/include/script.jsp | 205 +++++ .../admin/inflow/inflowGroupControlMan.jsp | 195 ++++ .../inflow/inflowGroupControlManDetail.jsp | 865 ++++++++++++++++++ .../InflowControlGroupMappingRepository.java | 25 + .../inflow/InflowControlGroupRepository.java | 8 + .../InflowGroupControlManController.java | 185 ++++ .../group/InflowGroupControlManMapper.java | 29 + .../group/InflowGroupControlManService.java | 253 +++++ .../inflow/group/InflowGroupControlManUI.java | 60 ++ .../inflow/group/InflowGroupMappingUI.java | 37 + 10 files changed, 1862 insertions(+) create mode 100644 WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp create mode 100644 WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupMappingRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManMapper.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManUI.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupMappingUI.java diff --git a/WebContent/jsp/common/include/script.jsp b/WebContent/jsp/common/include/script.jsp index 80ed3ec..873de95 100644 --- a/WebContent/jsp/common/include/script.jsp +++ b/WebContent/jsp/common/include/script.jsp @@ -362,4 +362,209 @@ console.error('Download failed:', error); } } + + /** + * 스타일링된 Alert 모달 + * @param {string} message - 표시할 메시지 + * @param {object} options - 옵션 (type: 'info'|'warning'|'error'|'success', title: string, onClose: function) + */ + function showAlert(message, options) { + options = options || {}; + var type = options.type || 'info'; + var title = options.title || getAlertTitle(type); + var onClose = options.onClose || function(){}; + + // 기존 모달 제거 + $('#commonAlertModal').remove(); + + var iconHtml = getAlertIcon(type); + var colorClass = 'alert-' + type; + + var modalHtml = + '
    ' + + '
    ' + + '
    ' + + '' + iconHtml + '' + + '' + title + '' + + '
    ' + + '
    ' + + '

    ' + message + '

    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '
    ' + + '
    '; + + $('body').append(modalHtml); + + // 애니메이션 효과 + setTimeout(function() { + $('#commonAlertModal').addClass('show'); + }, 10); + + // 닫기 이벤트 + $('#commonAlertOkBtn').on('click', function() { + closeCommonAlert(onClose); + }); + + // ESC 키로 닫기 + $(document).on('keydown.commonAlert', function(e) { + if (e.keyCode === 27) { + closeCommonAlert(onClose); + } + }); + + // Enter 키로 확인 + $(document).on('keydown.commonAlertEnter', function(e) { + if (e.keyCode === 13) { + closeCommonAlert(onClose); + } + }); + } + + function closeCommonAlert(callback) { + $('#commonAlertModal').removeClass('show'); + setTimeout(function() { + $('#commonAlertModal').remove(); + $(document).off('keydown.commonAlert'); + $(document).off('keydown.commonAlertEnter'); + if (typeof callback === 'function') { + callback(); + } + }, 200); + } + + function getAlertTitle(type) { + switch(type) { + case 'error': return '오류'; + case 'warning': return '경고'; + case 'success': return '완료'; + default: return '알림'; + } + } + + function getAlertIcon(type) { + switch(type) { + case 'error': return 'error'; + case 'warning': return 'warning'; + case 'success': return 'check_circle'; + default: return 'info'; + } + } + + /** + * 스타일링된 Confirm 모달 + * @param {string} message - 표시할 메시지 + * @param {object} options - 옵션 (type, title, confirmText, cancelText, onConfirm, onCancel) + */ + function showConfirm(message, options) { + options = options || {}; + var type = options.type || 'info'; + var title = options.title || '확인'; + var confirmText = options.confirmText || '확인'; + var cancelText = options.cancelText || '취소'; + var onConfirm = options.onConfirm || function(){}; + var onCancel = options.onCancel || function(){}; + + // 기존 모달 제거 + $('#commonConfirmModal').remove(); + + var iconHtml = getAlertIcon(type); + var colorClass = 'alert-' + type; + + var modalHtml = + '
    ' + + '
    ' + + '
    ' + + '' + iconHtml + '' + + '' + title + '' + + '
    ' + + '
    ' + + '

    ' + message + '

    ' + + '
    ' + + '
    ' + + '' + + '' + + '
    ' + + '
    ' + + '
    '; + + $('body').append(modalHtml); + + setTimeout(function() { + $('#commonConfirmModal').addClass('show'); + }, 10); + + // 확인 버튼 + $('#commonConfirmOkBtn').on('click', function() { + closeCommonConfirm(onConfirm); + }); + + // 취소 버튼 + $('#commonConfirmCancelBtn').on('click', function() { + closeCommonConfirm(onCancel); + }); + + // ESC 키로 취소 + $(document).on('keydown.commonConfirm', function(e) { + if (e.keyCode === 27) { + closeCommonConfirm(onCancel); + } + }); + } + + function closeCommonConfirm(callback) { + $('#commonConfirmModal').removeClass('show'); + setTimeout(function() { + $('#commonConfirmModal').remove(); + $(document).off('keydown.commonConfirm'); + if (typeof callback === 'function') { + callback(); + } + }, 200); + } + + + diff --git a/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp new file mode 100644 index 0000000..02a845e --- /dev/null +++ b/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp @@ -0,0 +1,195 @@ +<%@ page language="java" contentType="text/html; charset=utf-8"%> +<%@ page import="java.io.*"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> +<%@ include file="/jsp/common/include/localemessage.jsp" %> +<% + response.setHeader("Pragma", "No-cache"); + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Expires", "0"); + +%> + + + + + + + + + + +
    +
    + +
    +
    +
    + + +
    +
    유량제어 그룹 관리유량제어 그룹 관리
    + + + + + + + + +
    그룹명
    + +
    +
    + +
    +
    + + diff --git a/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp new file mode 100644 index 0000000..5c8d399 --- /dev/null +++ b/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp @@ -0,0 +1,865 @@ +<%@ page language="java" contentType="text/html; charset=utf-8"%> +<%@ page import="java.io.*"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> +<%@ include file="/jsp/common/include/localemessage.jsp" %> +<% + response.setHeader("Pragma", "No-cache"); + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Expires", "0"); +%> + + + + + + + + + + + + + +
    +
    + +
    +
    +
    + + + + +
    +
    +
    유량제어 그룹 관리유량제어 그룹 관리
    + +
    + +
    + + + + + + + + + + + + + + + + + + + +
    그룹명 *
    사용여부 +
    + + 사용 +
    +
    + + + 유량제어 설정 + + + + + + + + + + + + + + + +
    + 초당 임계치 + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
    + + req/sec +
    +
    + 추가 임계치 + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
    + + + requests +
    +
    + + + API 매핑 +
    + 매핑된 API 0개 + +
    +
    + + + + + + + + + + + + + + + + + + +
    API ID설명관리
    inbox 매핑된 API가 없습니다
    +
    +
    + +
    +
    + + +
    +
    +
    +

    API 선택

    + +
    +
    +
    + + +
    +
    + + + + + + + + + + +
    API ID설명
    검색 결과가 없습니다
    +
    +
    + 총 0건 +
    + +
    + +
    +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    +

    유량제어 임계치 설명

    + +
    +
    +

    개요

    +

    유량제어는 Token Bucket 알고리즘 기반으로 동작합니다. + 설정된 임계치만큼 토큰이 주기적으로 리필되며, 요청 1건당 토큰 1개를 소비합니다. + 토큰이 부족하면 요청이 거부됩니다.

    + +

    초당 임계치 (thresholdPerSecond)

    +

    1초 단위의 순간적인 트래픽 급증(spike)을 방어합니다.

    +
    +
    예시: 초당 임계치 = 100
    +
      +
    • 매 1초마다 토큰 100개 리필
      • +
    • 1초 내 100건까지 처리 가능
      • +
    • 101번째 요청부터 차단
      • +
    +
    + +

    추가 임계치 (threshold) + 시간단위

    +

    장시간 누적 트래픽을 제어합니다. 시간단위에 따라 토큰 리필 주기가 결정됩니다.

    + + + + + + + +
    시간단위설명예시
    SEC초1초당 N건
    MIN분1분당 N건
    HOU시1시간당 N건
    DAY일1일당 N건
    MON월1개월당 N건
    +
    +
    예시: 추가 임계치 = 10,000 / 시간단위 = HOU
    +
      +
    • 매 1시간마다 토큰 10,000개 리필
      • +
    • 1시간 내 10,000건까지 처리 가능
      • +
    • 10,001번째 요청부터 차단
      • +
    +
    + +

    두 임계치 조합 (권장)

    +

    두 조건을 함께 설정하면 이중 보호가 적용됩니다.

    +
    +
    예시: 초당 100건 + 시간당 50,000건
    +
      +
    • 순간 폭주 방지: 초당 100건 제한 → 1초 내 101번째 요청부터 차단
      • +
    • 장기 누적 제한: 시간당 50,000건 제한 → 시간 내 50,001번째 요청부터 차단
      • +
    • 두 조건 중 하나라도 초과 시 차단 (둘 다 충족해야 통과)
      • +
    +
    + +
    + 참고: 그룹에 매핑된 인터페이스들은 개별 유량제어 대신 그룹 유량제어가 적용됩니다. + 그룹 내 모든 인터페이스의 호출이 합산되어 임계치와 비교됩니다. +
    +
    +
    +
    + + diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupMappingRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupMappingRepository.java new file mode 100644 index 0000000..618a1e2 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupMappingRepository.java @@ -0,0 +1,25 @@ +package com.eactive.eai.rms.data.entity.onl.inflow; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroupMapping; +import com.eactive.eai.data.jpa.BaseRepository; + +public interface InflowControlGroupMappingRepository extends BaseRepository { + + List findByGroupId(String groupId); + + @Modifying + @Query("DELETE FROM InflowControlGroupMapping m WHERE m.groupId = :groupId") + void deleteByGroupId(@Param("groupId") String groupId); + + /** + * 인터페이스 ID로 매핑 조회 (중복 체크용) + */ + Optional findByInterfaceId(String interfaceId); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupRepository.java new file mode 100644 index 0000000..d267d5c --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlGroupRepository.java @@ -0,0 +1,8 @@ +package com.eactive.eai.rms.data.entity.onl.inflow; + +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroup; +import com.eactive.eai.data.jpa.BaseRepository; + +public interface InflowControlGroupRepository extends BaseRepository { + +} diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java new file mode 100644 index 0000000..a14f5ea --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java @@ -0,0 +1,185 @@ +package com.eactive.eai.rms.onl.manage.inflow.group; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import com.eactive.eai.agent.command.CommonCommand; +import com.eactive.eai.rms.common.base.OnlBaseAnnotationController; +import com.eactive.eai.rms.common.combo.ComboService; +import com.eactive.eai.rms.common.combo.ComboVo; +import com.eactive.eai.rms.common.vo.GridResponse; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Controller +public class InflowGroupControlManController extends OnlBaseAnnotationController { + + @Autowired + private InflowGroupControlManService service; + + @Autowired + private ComboService comboService; + + private ObjectMapper objectMapper = new ObjectMapper(); + + // ========== View Mappings ========== + + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.view") + public String viewList() { + return "/onl/admin/inflow/inflowGroupControlMan"; + } + + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.view", params = "cmd=DETAIL") + public String viewDetail() { + return "/onl/admin/inflow/inflowGroupControlManDetail"; + } + + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.view", params = "cmd=INTERFACE_POPUP") + public String viewInterfacePopup() { + return "/onl/admin/inflow/inflowGroupInterfacePopup"; + } + + // ========== JSON API Mappings ========== + + /** + * 그룹 목록 조회 + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=LIST") + public ResponseEntity> selectList(HttpServletRequest request, + Pageable pageVo, String searchGroupName) { + Page uiPage = service.selectGroupList(pageVo, searchGroupName); + return ResponseEntity.ok(new GridResponse<>(uiPage)); + } + + /** + * 그룹 상세 조회 + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=DETAIL") + public ResponseEntity selectDetail(HttpServletRequest request, + HttpServletResponse response, String groupId) { + InflowGroupControlManUI ui = service.selectGroupDetail(groupId); + return ResponseEntity.ok(ui); + } + + /** + * 그룹 저장 (INSERT) + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=INSERT") + public String insert(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, + @RequestParam(value = "interfaceListJson", required = false) String interfaceListJson) throws Exception { + parseInterfaceList(ui, interfaceListJson); + String modifiedBy = getSessionUserId(request); + service.mergeGroup(ui, modifiedBy); + + // Agent Command 전송 + CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.ReloadInflowGroupControlCommand", + ui.getGroupId()); + agentUtilService.broadcast(command); + return null; + } + + /** + * 그룹 저장 (UPDATE) + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=UPDATE") + public String update(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, + @RequestParam(value = "interfaceListJson", required = false) String interfaceListJson) throws Exception { + parseInterfaceList(ui, interfaceListJson); + String modifiedBy = getSessionUserId(request); + service.mergeGroup(ui, modifiedBy); + + // Agent Command 전송 + CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.ReloadInflowGroupControlCommand", + ui.getGroupId()); + agentUtilService.broadcast(command); + return null; + } + + /** + * 그룹 삭제 + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=DELETE") + public String delete(HttpServletRequest request, HttpServletResponse response, String groupId) throws Exception { + service.deleteGroup(groupId); + + // Agent Command 전송 + CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.RemoveInflowGroupControlCommand", + groupId); + agentUtilService.broadcast(command); + return null; + } + + /** + * 콤보박스 초기화 데이터 + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=LIST_INIT_COMBO") + public ModelAndView initCombo(HttpServletRequest request, HttpServletResponse response) { + List useYnRows = comboService.getFromCode("USE_YN"); + List timeUnitRows = comboService.getFromCode("INFLOW_CTRL_TIME_UNIT"); + + Map> resultMap = new HashMap<>(); + resultMap.put("useYnRows", useYnRows); + resultMap.put("timeUnitRows", timeUnitRows); + + return new ModelAndView("jsonView", resultMap); + } + + /** + * 인터페이스 목록 조회 (팝업용) + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=INTERFACE_LIST") + public ResponseEntity> selectInterfaceList(HttpServletRequest request, + Pageable pageVo, String searchName) { + Page uiPage = service.selectInterfaceListForPopup(pageVo, searchName); + return ResponseEntity.ok(new GridResponse<>(uiPage)); + } + + /** + * 인터페이스 중복 등록 체크 + */ + @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=LIST_CHECK_DUPLICATE") + public ModelAndView checkDuplicate(HttpServletRequest request, HttpServletResponse response, + @RequestParam("interfaceId") String interfaceId, + @RequestParam(value = "groupId", required = false) String groupId) { + String existingGroupName = service.checkInterfaceDuplicate(interfaceId, groupId); + + Map resultMap = new HashMap<>(); + resultMap.put("duplicate", existingGroupName != null); + resultMap.put("groupName", existingGroupName); + + return new ModelAndView("jsonView", resultMap); + } + + /** + * JSON 문자열을 인터페이스 목록으로 변환 + */ + private void parseInterfaceList(InflowGroupControlManUI ui, String interfaceListJson) throws Exception { + if (interfaceListJson != null && !interfaceListJson.isEmpty()) { + List interfaceList = objectMapper.readValue(interfaceListJson, + new TypeReference>() { + }); + ui.setInterfaceList(interfaceList); + } + } + + /** + * 세션에서 사용자 ID 조회 + */ + private String getSessionUserId(HttpServletRequest request) { + Object userId = request.getSession().getAttribute("userId"); + return userId != null ? userId.toString() : "SYSTEM"; + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManMapper.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManMapper.java new file mode 100644 index 0000000..83cf138 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManMapper.java @@ -0,0 +1,29 @@ +package com.eactive.eai.rms.onl.manage.inflow.group; + +import org.mapstruct.BeanMapping; +import org.mapstruct.Mapper; +import org.mapstruct.MappingTarget; +import org.mapstruct.NullValuePropertyMappingStrategy; +import org.mapstruct.ReportingPolicy; + +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroup; +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroupMapping; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface InflowGroupControlManMapper { + + InflowGroupControlManUI toVo(InflowControlGroup entity); + + InflowControlGroup toEntity(InflowGroupControlManUI vo); + + @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) + void updateToEntity(InflowGroupControlManUI vo, @MappingTarget InflowControlGroup entity); + + // Mapping Entity <-> UI + InflowGroupMappingUI toMappingVo(InflowControlGroupMapping entity); + + InflowControlGroupMapping toMappingEntity(InflowGroupMappingUI vo); + + @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) + void updateToMappingEntity(InflowGroupMappingUI vo, @MappingTarget InflowControlGroupMapping entity); +} diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java new file mode 100644 index 0000000..625ede1 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java @@ -0,0 +1,253 @@ +package com.eactive.eai.rms.onl.manage.inflow.group; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroup; +import com.eactive.eai.data.entity.onl.inflow.InflowControlGroupMapping; +import com.eactive.eai.data.entity.onl.inflow.QInflowControlGroup; +import com.eactive.eai.data.entity.onl.inflow.QInflowControlGroupMapping; +import com.eactive.eai.data.entity.onl.message.QEAIMessageEntity; +import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlGroupMappingRepository; +import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlGroupRepository; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.Tuple; +import com.querydsl.jpa.impl.JPAQueryFactory; + +@Service +public class InflowGroupControlManService extends BaseService { + + @PersistenceContext + EntityManager entityManager; + + @Autowired + private InflowControlGroupRepository groupRepository; + + @Autowired + private InflowControlGroupMappingRepository mappingRepository; + + @Autowired + private InflowGroupControlManMapper mapper; + + /** + * 그룹 목록 조회 + */ + public Page selectGroupList(Pageable pageable, String searchGroupName) { + JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager); + QInflowControlGroup qGroup = QInflowControlGroup.inflowControlGroup; + + BooleanBuilder boolBuilder = new BooleanBuilder(); + if (!StringUtils.isEmpty(searchGroupName)) { + boolBuilder.and(qGroup.groupName.contains(searchGroupName)); + } + + List groupList = jpaQueryFactory + .selectFrom(qGroup) + .where(boolBuilder) + .orderBy(qGroup.groupId.asc()) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch(); + + List uiList = groupList.stream() + .map(mapper::toVo) + .collect(Collectors.toList()); + + long totalCount = jpaQueryFactory + .select(qGroup.groupId.count()) + .from(qGroup) + .where(boolBuilder) + .fetchOne(); + + return new PageImpl<>(uiList, pageable, totalCount); + } + + /** + * 그룹 상세 조회 (매핑된 인터페이스 포함) + */ + public InflowGroupControlManUI selectGroupDetail(String groupId) { + Optional groupOpt = groupRepository.findById(groupId); + if (!groupOpt.isPresent()) { + return null; + } + + InflowGroupControlManUI ui = mapper.toVo(groupOpt.get()); + + // 매핑된 인터페이스 목록 조회 (인터페이스 설명 포함) + List mappingList = selectMappingListWithDesc(groupId); + ui.setInterfaceList(mappingList); + + return ui; + } + + /** + * 그룹에 매핑된 인터페이스 목록 조회 (인터페이스 설명 포함) + */ + private List selectMappingListWithDesc(String groupId) { + JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager); + QInflowControlGroupMapping qMapping = QInflowControlGroupMapping.inflowControlGroupMapping; + QEAIMessageEntity qMessage = QEAIMessageEntity.eAIMessageEntity; + + List tupleList = jpaQueryFactory + .select(qMapping, qMessage.eaisvcdesc) + .from(qMapping) + .leftJoin(qMessage).on(qMapping.interfaceId.eq(qMessage.eaisvcname)) + .where(qMapping.groupId.eq(groupId)) + .orderBy(qMapping.interfaceId.asc()) + .fetch(); + + return tupleList.stream() + .map(tuple -> { + InflowGroupMappingUI mappingUI = mapper.toMappingVo(tuple.get(qMapping)); + mappingUI.setInterfaceDesc(tuple.get(qMessage.eaisvcdesc)); + return mappingUI; + }) + .collect(Collectors.toList()); + } + + /** + * 그룹 저장 (INSERT/UPDATE) + */ + @Transactional + public void mergeGroup(InflowGroupControlManUI ui, String modifiedBy) { + String groupId = ui.getGroupId(); + boolean isNew = StringUtils.isEmpty(groupId); + + InflowControlGroup entity; + if (!isNew) { + Optional groupOpt = groupRepository.findById(groupId); + if (groupOpt.isPresent()) { + entity = groupOpt.get(); + mapper.updateToEntity(ui, entity); + } else { + entity = mapper.toEntity(ui); + } + } else { + entity = mapper.toEntity(ui); + } + entity.setModifiedBy(modifiedBy); + entity.setModifiedAt(LocalDateTime.now()); + InflowControlGroup savedEntity = groupRepository.saveAndFlush(entity); + + // 저장된 엔티티의 groupId 사용 (신규 생성 시 시퀀스에서 생성된 ID) + String savedGroupId = savedEntity.getGroupId(); + + // 매핑 정보 저장 + saveMappings(savedGroupId, ui.getInterfaceList(), modifiedBy); + } + + /** + * 그룹-인터페이스 매핑 저장 + */ + @Transactional + public void saveMappings(String groupId, List interfaceList, String modifiedBy) { + // 기존 매핑 삭제 + mappingRepository.deleteByGroupId(groupId); + + // 새로운 매핑 저장 + if (interfaceList != null && !interfaceList.isEmpty()) { + for (InflowGroupMappingUI mappingUI : interfaceList) { + InflowControlGroupMapping mapping = new InflowControlGroupMapping(); + mapping.setInterfaceId(mappingUI.getInterfaceId()); + mapping.setGroupId(groupId); + mapping.setUseYn("1"); + mapping.setModifiedBy(modifiedBy); + mapping.setModifiedAt(LocalDateTime.now()); + mappingRepository.save(mapping); + } + } + } + + /** + * 그룹 삭제 + */ + @Transactional + public void deleteGroup(String groupId) { + // 매핑 먼저 삭제 + mappingRepository.deleteByGroupId(groupId); + // 그룹 삭제 + groupRepository.deleteById(groupId); + } + + /** + * 인터페이스 중복 등록 체크 (다른 그룹에 등록 여부) + * @param interfaceId 체크할 인터페이스 ID + * @param currentGroupId 현재 그룹 ID (수정 시 자기 그룹 제외, 신규 시 null) + * @return 등록된 그룹명 (미등록 시 null) + */ + public String checkInterfaceDuplicate(String interfaceId, String currentGroupId) { + Optional mappingOpt = mappingRepository.findByInterfaceId(interfaceId); + if (!mappingOpt.isPresent()) { + return null; + } + + InflowControlGroupMapping mapping = mappingOpt.get(); + String existingGroupId = mapping.getGroupId(); + + // 현재 그룹과 동일하면 중복 아님 (수정 시) + if (existingGroupId.equals(currentGroupId)) { + return null; + } + + // 그룹명 조회 + Optional groupOpt = groupRepository.findById(existingGroupId); + if (groupOpt.isPresent()) { + return groupOpt.get().getGroupName(); + } + return existingGroupId; // 그룹명 없으면 ID 반환 + } + + /** + * 인터페이스 목록 조회 (팝업용) + */ + public Page selectInterfaceListForPopup(Pageable pageable, String searchName) { + JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager); + QEAIMessageEntity qMessage = QEAIMessageEntity.eAIMessageEntity; + + BooleanBuilder boolBuilder = new BooleanBuilder(); + if (!StringUtils.isEmpty(searchName)) { + boolBuilder.and(qMessage.eaisvcname.containsIgnoreCase(searchName) + .or(qMessage.eaisvcdesc.containsIgnoreCase(searchName))); + } + + List tupleList = jpaQueryFactory + .select(qMessage.eaisvcname, qMessage.eaisvcdesc) + .from(qMessage) + .where(boolBuilder) + .orderBy(qMessage.eaisvcname.asc()) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch(); + + List uiList = tupleList.stream() + .map(tuple -> { + InflowGroupMappingUI ui = new InflowGroupMappingUI(); + ui.setInterfaceId(tuple.get(qMessage.eaisvcname)); + ui.setInterfaceDesc(tuple.get(qMessage.eaisvcdesc)); + return ui; + }) + .collect(Collectors.toList()); + + long totalCount = jpaQueryFactory + .select(qMessage.eaisvcname.count()) + .from(qMessage) + .where(boolBuilder) + .fetchOne(); + + return new PageImpl<>(uiList, pageable, totalCount); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManUI.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManUI.java new file mode 100644 index 0000000..2dac454 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManUI.java @@ -0,0 +1,60 @@ +package com.eactive.eai.rms.onl.manage.inflow.group; + +import java.time.LocalDateTime; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +@Data +public class InflowGroupControlManUI { + /** + * 그룹 ID + */ + @JsonProperty("GROUPID") + private String groupId; + + /** + * 그룹명 + */ + @JsonProperty("GROUPNAME") + private String groupName; + + /** + * 임계치 + */ + @JsonProperty("THRESHOLD") + private Integer threshold; + + /** + * 초당 임계치 + */ + @JsonProperty("THRESHOLDPERSECOND") + private Integer thresholdPerSecond; + + /** + * 임계치 TimeUnit + */ + @JsonProperty("THRESHOLDTIMEUNIT") + private String thresholdTimeUnit; + + /** + * 사용여부 + */ + @JsonProperty("USEYN") + private String useYn; + + /** + * 수정일시 + */ + @JsonProperty("MODIFIEDAT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime modifiedAt; + + /** + * 매핑된 인터페이스 목록 (저장용) + */ + private List interfaceList; +} diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupMappingUI.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupMappingUI.java new file mode 100644 index 0000000..1fdc8a4 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupMappingUI.java @@ -0,0 +1,37 @@ +package com.eactive.eai.rms.onl.manage.inflow.group; + +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +@Data +public class InflowGroupMappingUI { + /** + * 인터페이스 ID + */ + @JsonProperty("INTERFACEID") + @JsonAlias("interfaceId") + private String interfaceId; + + /** + * 인터페이스 설명 (조회용) + */ + @JsonProperty("INTERFACEDESC") + @JsonAlias("interfaceDesc") + private String interfaceDesc; + + /** + * 그룹 ID + */ + @JsonProperty("GROUPID") + @JsonAlias("groupId") + private String groupId; + + /** + * 사용여부 + */ + @JsonProperty("USEYN") + @JsonAlias("useYn") + private String useYn; +} From 10a8918bb654f50baa02508b7db83f5e8129b5ce Mon Sep 17 00:00:00 2001 From: daekuk Date: Thu, 11 Dec 2025 11:04:00 +0900 Subject: [PATCH 12/15] =?UTF-8?q?feat:=20=EC=9C=A0=EB=9F=89=EC=A0=9C?= =?UTF-8?q?=EC=96=B4=20=EA=B7=B8=EB=A3=B9=20=EB=B2=84=ED=82=B7=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20=ED=98=84=ED=99=A9=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CustomGroupBucket 클래스 신규 생성: 초당/추가 임계치를 별도 LocalBucket으로 분리하여 개별 토큰 조회 가능 - InflowControlManager 수정: groupBucketList 타입을 CustomGroupBucket으로 변경, makeGroupBucket() 메서드 추가 - InflowGroupBucketService 단순화: 복잡한 리플렉션 로직 제거, CustomGroupBucket 직접 메서드 사용 - 현황 탭에 전체 인스턴스 합산 요약 추가 (활성 인스턴스 수, 초당/추가 임계치 합산) - 추가 임계치 시간단위에서 '초(SEC)' 옵션 제거 - 저장 완료 후 리스트 화면 이동 제거 --- .../inflow/inflowGroupControlManDetail.jsp | 292 +++++++++++++++++- .../InflowGroupControlManController.java | 14 + .../group/InflowGroupControlManService.java | 61 ++++ 3 files changed, 362 insertions(+), 5 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp index 5c8d399..d0e7dab 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowGroupControlManDetail.jsp @@ -96,6 +96,57 @@ .interface-empty { padding:30px 20px; text-align:center; color:#999; font-size:12px; } .interface-empty i { vertical-align:middle; margin-right:4px; font-size:18px; } +/* 탭 스타일 */ +.detail-tabs { display:flex; gap:0; border-bottom:2px solid rgba(0,128,128,0.3); margin-bottom:20px; } +.detail-tab { padding:10px 24px; font-size:13px; font-weight:bold; color:#666; cursor:pointer; border:none; background:transparent; border-bottom:2px solid transparent; margin-bottom:-2px; transition:all 0.2s; } +.detail-tab:hover { color:rgba(0,128,128,0.8); background:rgba(0,128,128,0.05); } +.detail-tab.active { color:rgba(0,128,128,1); border-bottom-color:rgba(0,128,128,0.8); background:rgba(0,128,128,0.05); } +.detail-tab i { vertical-align:middle; margin-right:4px; font-size:18px; } +.tab-content { display:none; } +.tab-content.active { display:block; } + +/* 버킷 현황 스타일 */ +.bucket-status-wrap { margin-top:10px; } +.bucket-refresh-bar { display:flex; justify-content:space-between; align-items:center; margin-bottom:15px; } +.bucket-refresh-bar .last-refresh { font-size:11px; color:#999; } +.bucket-server-list { display:flex; flex-wrap:wrap; gap:15px; } +.bucket-server-card { flex:0 0 calc(33.333% - 10px); min-width:280px; border:1px solid #ddd; border-radius:5px; overflow:hidden; } +.bucket-server-header { display:flex; justify-content:space-between; align-items:center; padding:10px 15px; background:#f9f9f9; border-bottom:1px solid #eee; } +.bucket-server-name { font-weight:bold; font-size:13px; } +.bucket-server-ip { font-size:11px; color:#888; font-family:Consolas, monospace; } +.bucket-server-status { font-size:11px; padding:3px 8px; border-radius:10px; } +.bucket-server-status.online { background:#e8f5e9; color:#2e7d32; } +.bucket-server-status.offline { background:#ffebee; color:#c62828; } +.bucket-server-status.no_data { background:#fff3e0; color:#ef6c00; } +.bucket-server-body { padding:15px; } +.bucket-info-grid { display:grid; grid-template-columns:repeat(auto-fit, minmax(280px, 1fr)); gap:15px; } +.bucket-card { background:#fafafa; border:1px solid #eee; border-radius:4px; padding:12px 15px; } +.bucket-card-header { display:flex; justify-content:space-between; align-items:center; margin-bottom:10px; } +.bucket-type { font-size:12px; font-weight:bold; color:#333; } +.bucket-type-badge { font-size:10px; padding:2px 6px; border-radius:3px; background:#e3f2fd; color:#1565c0; } +.bucket-progress-wrap { margin-bottom:8px; } +.bucket-progress-bar { height:8px; background:#e0e0e0; border-radius:4px; overflow:hidden; } +.bucket-progress-fill { height:100%; border-radius:4px; transition:width 0.3s ease; } +.bucket-progress-fill.low { background:linear-gradient(90deg, #4caf50, #66bb6a); } +.bucket-progress-fill.medium { background:linear-gradient(90deg, #ff9800, #ffa726); } +.bucket-progress-fill.high { background:linear-gradient(90deg, #f44336, #ef5350); } +.bucket-stats { display:flex; justify-content:space-between; font-size:11px; color:#666; } +.bucket-stats-value { font-family:Consolas, monospace; } +.bucket-empty-msg { padding:30px; text-align:center; color:#999; font-size:12px; } +.bucket-empty-msg i { font-size:36px; display:block; margin-bottom:10px; color:#ddd; } +.bucket-error-msg { color:#c62828; font-size:12px; } + +/* 전체 합산 요약 */ +.bucket-summary { background:linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); border:1px solid #dee2e6; border-radius:5px; padding:15px 20px; margin-bottom:20px; } +.bucket-summary-title { font-size:13px; font-weight:bold; color:#333; margin-bottom:12px; display:flex; align-items:center; gap:6px; } +.bucket-summary-title i { font-size:18px; color:rgba(0,128,128,0.8); } +.bucket-summary-grid { display:flex; gap:30px; flex-wrap:wrap; } +.bucket-summary-item { display:flex; flex-direction:column; } +.bucket-summary-label { font-size:11px; color:#666; margin-bottom:4px; } +.bucket-summary-value { font-size:18px; font-weight:bold; color:#333; font-family:Consolas, monospace; } +.bucket-summary-value .unit { font-size:12px; font-weight:normal; color:#888; margin-left:4px; } +.bucket-summary-sub { font-size:11px; color:#888; margin-top:2px; } + /* 도움말 모달 */ .help-modal-overlay { display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.4); z-index:9999; } .help-modal { position:fixed; top:50%; left:50%; transform:translate(-50%,-50%); background:#fff; border-radius:5px; box-shadow:0 4px 20px rgba(0,0,0,0.3); width:700px; max-height:80vh; overflow-y:auto; } @@ -412,6 +463,174 @@ function renderIfPagination() { }); } +// 탭 전환 기능 +function switchTab(tabName) { + $('.detail-tab').removeClass('active'); + $('.detail-tab[data-tab="' + tabName + '"]').addClass('active'); + $('.tab-content').removeClass('active'); + $('#tab' + tabName.charAt(0).toUpperCase() + tabName.slice(1) + 'Content').addClass('active'); + + if (tabName === 'status' && isDetail) { + loadBucketStatus(); + } +} + +// 버킷 현황 조회 +function loadBucketStatus() { + var groupId = $('input[name=groupId]').val(); + if (!groupId) return; + + $('#bucketServerList').html('
    hourglass_empty조회 중...
    '); + + $.ajax({ + type: 'POST', + url: url, + data: { cmd: 'LIST_BUCKET_STATUS', groupId: groupId }, + dataType: 'json', + success: function(result) { + renderBucketStatus(result.servers || []); + $('#lastRefreshTime').text(formatDateTime(new Date())); + }, + error: function(e) { + $('#bucketServerList').html('
    error_outline조회 실패: ' + e.statusText + '
    '); + } + }); +} + +function formatDateTime(date) { + var h = date.getHours(); + var m = date.getMinutes(); + var s = date.getSeconds(); + return (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); +} + +function renderBucketStatus(servers) { + var container = $('#bucketServerList'); + container.empty(); + + if (servers.length === 0) { + container.html('
    dns등록된 서버가 없습니다
    '); + $('#bucketSummary').hide(); + return; + } + + // 전체 합산 계산 + var onlineCount = 0; + var perSecondCapacity = 0; + var thresholdCapacity = 0; + var thresholdTimeUnit = ''; + + $.each(servers, function(i, server) { + if (server.status === 'online' && server.data && server.data.buckets) { + onlineCount++; + $.each(server.data.buckets, function(j, bucket) { + if (bucket.type === 'perSecond') { + perSecondCapacity += bucket.capacity || 0; + } else if (bucket.type === 'threshold') { + thresholdCapacity += bucket.capacity || 0; + if (!thresholdTimeUnit) thresholdTimeUnit = bucket.timeUnit; + } + }); + } + }); + + // 요약 영역 표시 + if (onlineCount > 0) { + $('#summaryInstanceCount').html(onlineCount + '개'); + + var configPerSecond = parseInt($('input[name=thresholdPerSecond]').val()) || 0; + var configThreshold = parseInt($('input[name=threshold]').val()) || 0; + + if (configPerSecond > 0) { + $('#summaryPerSecond').html(formatNumber(perSecondCapacity) + 'req/sec'); + $('#summaryPerSecondCalc').text(formatNumber(configPerSecond) + ' × ' + onlineCount + ' 인스턴스'); + $('#summaryPerSecondWrap').show(); + } else { + $('#summaryPerSecondWrap').hide(); + } + + if (configThreshold > 0) { + var timeUnitLabel = getTimeUnitText(thresholdTimeUnit); + $('#summaryThreshold').html(formatNumber(thresholdCapacity) + 'req/' + timeUnitLabel + ''); + $('#summaryThresholdCalc').text(formatNumber(configThreshold) + ' × ' + onlineCount + ' 인스턴스'); + $('#summaryThresholdWrap').show(); + } else { + $('#summaryThresholdWrap').hide(); + } + + $('#bucketSummary').show(); + } else { + $('#bucketSummary').hide(); + } + + $.each(servers, function(i, server) { + var statusClass = server.status || 'offline'; + var statusText = { online: '정상', offline: '오프라인', no_data: '데이터 없음' }; + + var card = '
    ' + + '
    ' + + '
    ' + + '' + server.serverName + ' ' + + '' + server.serverIp + ':' + server.serverPort + '' + + '
    ' + + '' + (statusText[statusClass] || statusClass) + '' + + '
    ' + + '
    ' + renderBucketBody(server) + '
    ' + + '
    '; + container.append(card); + }); +} + +function renderBucketBody(server) { + if (server.status === 'offline') { + return '
    ' + (server.message || '서버 연결 실패') + '
    '; + } + if (server.status === 'no_data') { + return '
    info_outline ' + (server.message || '그룹이 로드되지 않음') + '
    '; + } + + var data = server.data; + if (!data || !data.buckets || data.buckets.length === 0) { + return '
    버킷 정보 없음
    '; + } + + var html = '
    '; + $.each(data.buckets, function(j, bucket) { + var typeLabel = bucket.type === 'perSecond' ? '초당 임계치' : '추가 임계치'; + var timeUnitText = getTimeUnitText(bucket.timeUnit); + var usagePercent = bucket.usagePercent || 0; + var progressClass = usagePercent < 50 ? 'low' : (usagePercent < 80 ? 'medium' : 'high'); + + html += '
    ' + + '
    ' + + '' + typeLabel + '' + + '' + timeUnitText + '' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '사용량: ' + usagePercent.toFixed(1) + '%' + + '잔여: ' + formatNumber(bucket.availableTokens) + ' / ' + formatNumber(bucket.capacity) + '' + + '
    ' + + '
    '; + }); + html += '
    '; + return html; +} + +function getTimeUnitText(timeUnit) { + var units = { SEC: '초', MIN: '분', HOU: '시간', DAY: '일', MON: '월' }; + return units[timeUnit] || timeUnit || '-'; +} + +function formatNumber(num) { + if (num === undefined || num === null) return '-'; + return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); +} + function selectInterface() { if (!ifModalState.selectedItem) { alert('API를 선택하여 주십시오.'); @@ -520,10 +739,7 @@ $(document).ready(function() { success: function(args) { showAlert("<%= localeMessage.getString("common.saveMsg") %>", { type: 'success', - title: '저장 완료', - onClose: function() { - goNav(returnUrl); - } + title: '저장 완료' }); }, error: function(e) { @@ -611,6 +827,22 @@ $(document).ready(function() { buttonControl(isDetail); titleControl(isDetail); + // 탭 전환 이벤트 + $('.detail-tab').click(function() { + var tabName = $(this).data('tab'); + switchTab(tabName); + }); + + // 현황 탭 표시 (상세 조회 시에만) + if (isDetail) { + $('#tabStatus').show(); + } + + // 버킷 새로고침 버튼 + $('#btn_refresh_bucket').click(function() { + loadBucketStatus(); + }); + // 도움말 모달 $("#btn_help").click(function() { $("#helpModal").fadeIn(200); @@ -650,6 +882,18 @@ $(document).ready(function() {
    + +
    + + +
    + + +
    @@ -713,7 +957,6 @@ $(document).ready(function() {