From 0b341b85f1d1e12c1d955c3f78ea9aed4ebd036b Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 14 May 2026 11:17:55 +0900 Subject: [PATCH 01/45] =?UTF-8?q?=ED=8F=89=EA=B7=A0=EC=9D=91=EB=8B=B5?= =?UTF-8?q?=EC=86=8D=EB=8F=84=20=EA=B3=84=EC=82=B0=EC=8B=9C=20=EB=B6=84?= =?UTF-8?q?=EB=AA=A8=EB=A5=BC=20=EC=84=B1=EA=B3=B5=EA=B1=B4=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=B4=9D=EA=B1=B4=EC=88=98=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onl/kjb/statistics/ApiStatsDayService.java | 8 ++++---- .../onl/kjb/statistics/ApiStatsHourService.java | 13 ++++++------- .../onl/kjb/statistics/ApiStatsMonthService.java | 14 +++++++------- .../onl/kjb/statistics/ApiStatsYearService.java | 14 +++++++------- .../job/DailyToMonthlyAggregationJob.java | 6 +++--- .../job/HourlyToDailyAggregationJob.java | 6 +++--- .../job/MonthlyToYearlyAggregationJob.java | 6 +++--- 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsDayService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsDayService.java index ad7fc2e..efe1566 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsDayService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsDayService.java @@ -120,11 +120,11 @@ public class ApiStatsDayService q.seq900BizErrCnt.sum().as("seq900BizErrCnt"), q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), - // 가중 평균: SUM(avg * successCnt) / SUM(successCnt) + // 가중 평균: SUM(avg * totalCnt) / SUM(totalCnt) Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsHourService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsHourService.java index 91524a7..6d01415 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsHourService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsHourService.java @@ -211,11 +211,10 @@ public class ApiStatsHourService q.seq900BizErrCnt.sum().as("seq900BizErrCnt"), q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), - // 가중 평균: SUM(avg * successCnt) / SUM(successCnt) Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) @@ -293,9 +292,9 @@ public class ApiStatsHourService q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsMonthService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsMonthService.java index 4545eca..6bb2e3a 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsMonthService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsMonthService.java @@ -120,11 +120,11 @@ public class ApiStatsMonthService q.seq900BizErrCnt.sum().as("seq900BizErrCnt"), q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), - // 가중 평균: SUM(avg * successCnt) / SUM(successCnt) + // 가중 평균: SUM(avg * totalCnt) / SUM(totalCnt) Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) @@ -172,9 +172,9 @@ public class ApiStatsMonthService q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsYearService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsYearService.java index 65842b0..8d2f080 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsYearService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/kjb/statistics/ApiStatsYearService.java @@ -117,11 +117,11 @@ public class ApiStatsYearService q.seq900BizErrCnt.sum().as("seq900BizErrCnt"), q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), - // 가중 평균: SUM(avg * successCnt) / SUM(successCnt) + // 가중 평균: SUM(avg * totalCnt) / SUM(totalCnt) Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) @@ -169,9 +169,9 @@ public class ApiStatsYearService q.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), q.maxRespTime.max().castToNum(BigDecimal.class).as("maxRespTime"), Expressions.cases() - .when(q.successCnt.sum().gt(0)) - .then(q.avgRespTime.multiply(q.successCnt).sum() - .divide(q.successCnt.sum()).castToNum(BigDecimal.class)) + .when(q.totalCnt.sum().gt(0)) + .then(q.avgRespTime.multiply(q.totalCnt).sum() + .divide(q.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"))) .from(q) diff --git a/src/main/java/com/eactive/ext/kjb/statistics/job/DailyToMonthlyAggregationJob.java b/src/main/java/com/eactive/ext/kjb/statistics/job/DailyToMonthlyAggregationJob.java index cb25000..c6e56ba 100644 --- a/src/main/java/com/eactive/ext/kjb/statistics/job/DailyToMonthlyAggregationJob.java +++ b/src/main/java/com/eactive/ext/kjb/statistics/job/DailyToMonthlyAggregationJob.java @@ -138,9 +138,9 @@ public class DailyToMonthlyAggregationJob implements Job { qd.seq900SystemErrCnt.sum().as("seq900SystemErrCnt"), qd.seq900BizErrCnt.sum().as("seq900BizErrCnt"), Expressions.cases() - .when(qd.successCnt.sum().gt(0)) - .then(qd.avgRespTime.multiply(qd.successCnt).sum() - .divide(qd.successCnt.sum()).castToNum(BigDecimal.class)) + .when(qd.totalCnt.sum().gt(0)) + .then(qd.avgRespTime.multiply(qd.totalCnt).sum() + .divide(qd.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"), qd.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), diff --git a/src/main/java/com/eactive/ext/kjb/statistics/job/HourlyToDailyAggregationJob.java b/src/main/java/com/eactive/ext/kjb/statistics/job/HourlyToDailyAggregationJob.java index a71b783..97729b7 100644 --- a/src/main/java/com/eactive/ext/kjb/statistics/job/HourlyToDailyAggregationJob.java +++ b/src/main/java/com/eactive/ext/kjb/statistics/job/HourlyToDailyAggregationJob.java @@ -133,9 +133,9 @@ public class HourlyToDailyAggregationJob implements Job { qh.seq900SystemErrCnt.sum().as("seq900SystemErrCnt"), qh.seq900BizErrCnt.sum().as("seq900BizErrCnt"), Expressions.cases() - .when(qh.successCnt.sum().gt(0)) - .then(qh.avgRespTime.multiply(qh.successCnt).sum() - .divide(qh.successCnt.sum()).castToNum(BigDecimal.class)) + .when(qh.totalCnt.sum().gt(0)) + .then(qh.avgRespTime.multiply(qh.totalCnt).sum() + .divide(qh.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"), qh.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), diff --git a/src/main/java/com/eactive/ext/kjb/statistics/job/MonthlyToYearlyAggregationJob.java b/src/main/java/com/eactive/ext/kjb/statistics/job/MonthlyToYearlyAggregationJob.java index c3fe895..a7ebf6c 100644 --- a/src/main/java/com/eactive/ext/kjb/statistics/job/MonthlyToYearlyAggregationJob.java +++ b/src/main/java/com/eactive/ext/kjb/statistics/job/MonthlyToYearlyAggregationJob.java @@ -136,9 +136,9 @@ public class MonthlyToYearlyAggregationJob implements Job { qm.seq900SystemErrCnt.sum().as("seq900SystemErrCnt"), qm.seq900BizErrCnt.sum().as("seq900BizErrCnt"), Expressions.cases() - .when(qm.successCnt.sum().gt(0)) - .then(qm.avgRespTime.multiply(qm.successCnt).sum() - .divide(qm.successCnt.sum()).castToNum(BigDecimal.class)) + .when(qm.totalCnt.sum().gt(0)) + .then(qm.avgRespTime.multiply(qm.totalCnt).sum() + .divide(qm.totalCnt.sum()).castToNum(BigDecimal.class)) .otherwise((BigDecimal) null) .as("avgRespTime"), qm.minRespTime.min().castToNum(BigDecimal.class).as("minRespTime"), From 335c7ec53aa0fe198cb972fb13026779ccf33108 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 14 May 2026 11:19:55 +0900 Subject: [PATCH 02/45] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=A1=9C=EA=B7=B8=20>?= =?UTF-8?q?=20=EC=8B=9C=EA=B0=84=EB=B3=84=20=EC=A7=91=EA=B3=84=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=B0=B0=EC=B9=98=EC=9E=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../djb/job/ApiStatsHourlyAggregationJob.java | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java new file mode 100644 index 0000000..b29c7f3 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java @@ -0,0 +1,147 @@ +package com.eactive.eai.rms.ext.djb.job; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.SchedulerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +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.kjb.statistics.ApiStatsHourService; +import com.eactive.eai.rms.data.entity.onl.kjb.statistics.QApiStatsHour; + +/** + * API 로그 테이블을 시간별 통계로 집계하는 배치 작업 + * TSEAILGXX → API_STATS_HOUR + * 실행 주기: 매시 00:10 (당일 데이터 집계) + */ +@Component +public class ApiStatsHourlyAggregationJob implements Job { + private static final Logger log = LoggerFactory.getLogger(ApiStatsHourlyAggregationJob.class); + + @PersistenceContext + private EntityManager entityManager; + + private ApiStatsHourService apiStatsHourService; + + @Autowired + public void setApiStatsHourService(ApiStatsHourService apiStatsHourService) { + this.apiStatsHourService = apiStatsHourService; + } + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException { + ApplicationContext appContext = null; + final ApiStatsHourlyAggregationJob selfJob; + try { + appContext = (ApplicationContext) context.getScheduler().getContext().get("applicationContext"); + selfJob = appContext.getBean(ApiStatsHourlyAggregationJob.class); + } catch (SchedulerException e) { + log.error("applicationContext get module error", e); + return; + } + + DataSourceType dataType = DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW); + DataSourceContextHolder.setDataSourceType(dataType); + try { + LocalDate targetDate = LocalDate.now(); + if (LocalTime.now().isBefore(LocalTime.of(1, 0))) { + targetDate = targetDate.minusDays(1); + } + selfJob.executeManual(targetDate); + } catch (Exception e) { + throw new JobExecutionException(e); + } finally { + DataSourceContextHolder.clearDataSourceType(); + } + } + + /** + * 수동 실행 메서드 (날짜 지정) + */ + @Transactional + public int executeManual(LocalDate targetDate) { + long startTime = System.currentTimeMillis(); + log.info("=== 시간별 통계 집계 작업 시작 === 대상: {}", targetDate); + + String searchDate = targetDate.format(DateTimeFormatter.ofPattern("yyyyMMdd")); + String schemaEMS = System.getProperty("eai.tableowner", "EMSADM").toUpperCase(); + String logTableName = CommonUtil.getLogTable(searchDate, true); + + // 1. 기존 데이터 삭제 + QApiStatsHour q = QApiStatsHour.apiStatsHour; + long deletedCount = apiStatsHourService.getJPAQueryFactory() + .delete(q) + .where(q.statTime.goe(targetDate.atStartOfDay()) + .and(q.statTime.lt(targetDate.plusDays(1).atStartOfDay()))) + .execute(); + log.info("기존 데이터 삭제: {} 건", deletedCount); + + // 2. 집계 및 데이터 입력 + /** + * EAISVCSERNO로 그룹핑하여 1행으로 집계를 한 다음 + * 총건수 : EAISVCSERNO로 그룹핑한 총 건수 + * 성공건수 : seq = 400 and EAIERRCD = null 인 건수 + * Timeout : EAIERRCD in (공통코드 CODEGROUP = 'API_ERROR_CODE' and PARENTCODE = 'T') 인 건수 + * 업무오류 : EAIERRCD in (공통코드 CODEGROUP = 'API_ERROR_CODE' and PARENTCODE = 'B') 인 건수 + * 시스템오류 : (seq400 = null or EAIERRCD is not null) and 공통코드에 정의되지 않은 errorcode 인 건수 + */ + String sql = + "INSERT INTO API_STATS_HOUR" + + " (STAT_TIME, API_NAME, GW_INSTANCE_ID, BIZ_DIV_CODE, CLIENT_ID" + + " , INBOUND_ADAPTER, OUTBOUND_ADAPTER" + + ", TOTAL_CNT, SUCCESS_CNT, TIMEOUT_CNT, SYSTEM_ERR_CNT, BIZ_ERR_CNT" + + ", SEQ900_TIMEOUT_CNT, SEQ900_SYSTEM_ERR_CNT, SEQ900_BIZ_ERR_CNT" + + ", AVG_RESP_TIME, MIN_RESP_TIME, MAX_RESP_TIME, P50_RESP_TIME, P95_RESP_TIME)" + + " SELECT TO_TIMESTAMP(SUBSTR(DT,1,10) || '0000', 'YYYYMMDDHH24MISS')" + + " , API_NAME, GW_INSTANCE_ID, BIZ_DIV_CODE, NVL(A.CLIENT_ID, 'NONE')" + + " , INBOUND_ADAPTER, OUTBOUND_ADAPTER" + + " , COUNT(EAISVCSERNO)" + + " , SUM(CASE WHEN A.ERROR_CODE IS NULL AND E400 IS NOT NULL THEN 1 ELSE 0 END)" + + " , SUM(CASE WHEN B.PARENTCODE = 'T' THEN 1 ELSE 0 END)" + + " , SUM(CASE WHEN (A.E400 IS NULL OR A.ERROR_CODE IS NOT NULL) AND B.PARENTCODE IS NULL THEN 1 ELSE 0 END)" + + " , SUM(CASE WHEN B.PARENTCODE = 'B' THEN 1 ELSE 0 END)" + + " , 0, 0, 0" + + " , TRUNC(AVG(RESP_TIME)), MIN(RESP_TIME), MAX(RESP_TIME), 0, 0" + + " FROM (" + + " SELECT EAISVCSERNO" + + " , MAX(EAISVCNAME) AS API_NAME, MAX(EAISEVRINSTNCNAME) AS GW_INSTANCE_ID" + + " , MAX(EAIBZWKDSTCD) AS BIZ_DIV_CODE, MAX(CLIENTID) AS CLIENT_ID" + + " , MAX(CLIENTNAME) AS CLIENT_NAME, MAX(ORGID) AS ORG_ID, MAX(ORGNAME) AS ORG_NAME" + + " , MAX(GSTATSYSADPTRBZWKGROUPNAME) AS INBOUND_ADAPTER" + + " , MAX(PSVSYSADPTRBZWKGROUPNAME) AS OUTBOUND_ADAPTER" + + " , MIN(MSGDPSTYMS) AS DT" + + " , MAX(MSGPRCSSYMS) - MIN(MSGDPSTYMS) AS RESP_TIME" + + " , MAX(CASE WHEN LOGPRCSSSERNO = '400' THEN LOGPRCSSSERNO ELSE '' END) AS E400" + + " , MAX(EAIERRCD) AS ERROR_CODE" + + " FROM " + logTableName + + " WHERE MSGDPSTYMS LIKE :searchDate || '%'" + + " GROUP BY EAISVCSERNO" + + " ) A LEFT OUTER JOIN " + schemaEMS + ".TSEAIRM28 B ON A.ERROR_CODE = B.CODE AND B.CODEGROUP = 'API_ERROR_CODE'" + + " GROUP BY SUBSTR(DT,1,10), API_NAME, GW_INSTANCE_ID, BIZ_DIV_CODE, NVL(A.CLIENT_ID, 'NONE')" + + " , INBOUND_ADAPTER, OUTBOUND_ADAPTER"; + + int savedCount = entityManager.createNativeQuery(sql) + .setParameter("searchDate", searchDate) + .executeUpdate(); + + long elapsedTime = System.currentTimeMillis() - startTime; + log.info("=== 집계 완료 === (처리 건수: {}, 소요 시간: {}ms)", savedCount, elapsedTime); + return savedCount; + } +} From 45c6edbbebf6bd924d1f99fdf7915472ab95a6f2 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 14 May 2026 11:20:33 +0900 Subject: [PATCH 03/45] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=A1=9C=EA=B7=B8>?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=EB=B3=84=20=EC=88=98=EB=8F=99=EC=A7=91?= =?UTF-8?q?=EA=B3=84=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kjb/statistics/apiStatsAggregationMan.jsp | 77 ++++++++++++++++++- .../ApiStatsAggregationController.java | 51 ++++++++++++ 2 files changed, 125 insertions(+), 3 deletions(-) diff --git a/WebContent/jsp/onl/kjb/statistics/apiStatsAggregationMan.jsp b/WebContent/jsp/onl/kjb/statistics/apiStatsAggregationMan.jsp index 8322d71..cebd75b 100644 --- a/WebContent/jsp/onl/kjb/statistics/apiStatsAggregationMan.jsp +++ b/WebContent/jsp/onl/kjb/statistics/apiStatsAggregationMan.jsp @@ -82,6 +82,54 @@ + + + +
+
+ +
+
+
+ + +
+
API 사용현황
+ + + + + + + + + + + + + + + +
조회기간 + + ~ + + (최대 31일) +
조회구분 + + + + 제휴사명 + + API명 + +
+ +
+
+
+
+ + +
+
+ + diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsExcelExportService.java b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsExcelExportService.java new file mode 100644 index 0000000..b79aae2 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsExcelExportService.java @@ -0,0 +1,256 @@ +package com.eactive.eai.rms.data.ext.djb.statistics; + +import java.io.IOException; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.List; + +import javax.servlet.http.HttpServletResponse; + +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Service; + +import com.eactive.ext.kjb.statistics.ui.ApiStatsUI; + +import lombok.extern.slf4j.Slf4j; + +/** + * API 통계 Excel Export 서비스 + * Hour/Minute 통계 데이터를 Excel 파일로 생성 + */ +@Slf4j +@Service +public class ApiUseStatsExcelExportService { + + private static final String[] COLUMN_HEADERS = { + "구분", "총건수", "성공", "성공율(%)", "실패율(%)", "Timeout", "시스템오류", + "평균응답(ms)", "최소응답(ms)", "최대응답(ms)" + }; + + /** + * API 통계 데이터를 Excel 파일로 생성하여 HTTP 응답으로 전송 + * + * @param dataList API 통계 데이터 리스트 + * @param fileName 다운로드 파일명 + * @param response HTTP 응답 객체 + * @throws IOException 파일 생성 실패 시 + */ + public void exportApiStats(List dataList, String fileName, HttpServletResponse response) + throws IOException { + + log.info("Starting Excel export - rows: {}, filename: {}", dataList.size(), fileName); + + try (Workbook workbook = new XSSFWorkbook()) { + Sheet sheet = workbook.createSheet("API통계"); + log.debug("Excel sheet created"); + + // 스타일 생성 + CellStyle headerStyle = createHeaderStyle(workbook); + CellStyle stringStyle = createStringStyle(workbook); + CellStyle numberStyle = createNumberStyle(workbook); + CellStyle decimalStyle = createDecimalStyle(workbook); + log.debug("Excel styles created"); + + // 헤더 행 생성 + createHeaderRow(sheet, headerStyle); + log.debug("Header row created"); + + // 데이터 행 생성 + int rowNum = 1; + for (ApiStatsUI data : dataList) { + createDataRow(sheet, rowNum++, data, stringStyle, numberStyle, decimalStyle); + } + log.info("Data rows created - count: {}", dataList.size()); + + // 컬럼 너비 자동 조정 + autoSizeColumns(sheet); + log.debug("Column widths adjusted"); + + // HTTP 응답 설정 + setHttpResponse(response, fileName, workbook); + log.info("Excel file sent to response"); + + } catch (Exception e) { + log.error("Error creating Excel file", e); + throw new IOException("Excel file creation failed: " + e.getMessage(), e); + } + } + + /** + * 헤더 스타일 생성 (회색 배경, 볼드, 테두리) + */ + private CellStyle createHeaderStyle(Workbook workbook) { + CellStyle style = workbook.createCellStyle(); + + // 배경색 + style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + + // 테두리 + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + + // 정렬 + style.setAlignment(HorizontalAlignment.CENTER); + + // 폰트 (볼드) + Font font = workbook.createFont(); + font.setBold(true); + style.setFont(font); + + return style; + } + + /** + * 문자열 데이터 스타일 생성 (기본 테두리) + */ + private CellStyle createStringStyle(Workbook workbook) { + CellStyle style = workbook.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + return style; + } + + /** + * 숫자 데이터 스타일 생성 (우측정렬 + 쉼표 구분) + */ + private CellStyle createNumberStyle(Workbook workbook) { + CellStyle style = workbook.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setAlignment(HorizontalAlignment.RIGHT); + style.setDataFormat(workbook.createDataFormat().getFormat("#,##0")); + return style; + } + + /** + * 소수점 데이터 스타일 생성 (우측정렬 + 소수점 2자리) + */ + private CellStyle createDecimalStyle(Workbook workbook) { + CellStyle style = workbook.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setAlignment(HorizontalAlignment.RIGHT); + style.setDataFormat(workbook.createDataFormat().getFormat("0.00")); + return style; + } + + /** + * 헤더 행 생성 + */ + private void createHeaderRow(Sheet sheet, CellStyle headerStyle) { + Row headerRow = sheet.createRow(0); + + for (int i = 0; i < COLUMN_HEADERS.length; i++) { + Cell cell = headerRow.createCell(i); + cell.setCellValue(COLUMN_HEADERS[i]); + cell.setCellStyle(headerStyle); + } + } + + /** + * 데이터 행 생성 + */ + private void createDataRow(Sheet sheet, int rowNum, ApiStatsUI data, + CellStyle stringStyle, CellStyle numberStyle, CellStyle decimalStyle) { + + Row row = sheet.createRow(rowNum); + int colNum = 0; + + createStringCell(row, colNum++, data.getOrgName(), stringStyle); + createLongCell(row, colNum++, data.getTotalCnt(), numberStyle); + createLongCell(row, colNum++, data.getSuccessCnt(), numberStyle); + createDecimalCell(row, colNum++, data.getSuccessRate(), decimalStyle); + createDecimalCell(row, colNum++, data.getFailRate(), decimalStyle); + createLongCell(row, colNum++, data.getTimeoutCnt(), numberStyle); + createLongCell(row, colNum++, data.getSystemErrCnt(), numberStyle); + createDecimalCell(row, colNum++, data.getAvgRespTime(), numberStyle); + createDecimalCell(row, colNum++, data.getMinRespTime(), numberStyle); + createDecimalCell(row, colNum++, data.getMaxRespTime(), numberStyle); + } + + /** + * 문자열 셀 생성 + */ + private void createStringCell(Row row, int colNum, String value, CellStyle style) { + Cell cell = row.createCell(colNum); + cell.setCellValue(value != null ? value : ""); + cell.setCellStyle(style); + } + + /** + * Long 타입 숫자 셀 생성 + */ + private void createLongCell(Row row, int colNum, Long value, CellStyle style) { + Cell cell = row.createCell(colNum); + if (value != null) { + cell.setCellValue(value.doubleValue()); + } else { + cell.setCellValue(0); + } + cell.setCellStyle(style); + } + + /** + * BigDecimal 타입 소수점 셀 생성 + */ + private void createDecimalCell(Row row, int colNum, BigDecimal value, CellStyle style) { + Cell cell = row.createCell(colNum); + if (value != null) { + cell.setCellValue(value.doubleValue()); + } else { + cell.setCellValue(0.0); + } + cell.setCellStyle(style); + } + + /** + * 컬럼 너비 자동 조정 + */ + private void autoSizeColumns(Sheet sheet) { + for (int i = 0; i < COLUMN_HEADERS.length; i++) { + sheet.autoSizeColumn(i); + // 한글 문자 고려하여 약간 여유 공간 추가 + sheet.setColumnWidth(i, sheet.getColumnWidth(i) + 512); + } + } + + /** + * HTTP 응답 설정 및 파일 전송 + */ + private void setHttpResponse(HttpServletResponse response, String fileName, Workbook workbook) + throws IOException { + + // Content-Type 설정 + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + + // Content-Disposition 설정 (파일명 UTF-8 인코딩) + String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString()) + .replaceAll("\\+", "%20"); + response.setHeader("Content-Disposition", + "attachment; filename=\"" + encodedFileName + "\"; filename*=UTF-8''" + encodedFileName); + + // Workbook을 응답 스트림으로 전송 + workbook.write(response.getOutputStream()); + response.getOutputStream().flush(); + } +} diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsRepository.java b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsRepository.java new file mode 100644 index 0000000..055127d --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsRepository.java @@ -0,0 +1,12 @@ +package com.eactive.eai.rms.data.ext.djb.statistics; + +import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDay; +import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDayId; + +/** + * API 사용현황 Repository + */ +interface ApiUseStatsRepository extends BaseRepository { + +} diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsService.java b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsService.java new file mode 100644 index 0000000..e6923f6 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/ext/djb/statistics/ApiUseStatsService.java @@ -0,0 +1,211 @@ +package com.eactive.eai.rms.data.ext.djb.statistics; + +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.stream.Collectors; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; + +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.jpa.AbstractDataService; +import com.eactive.eai.rms.common.util.StringUtils; +import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDay; +import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDayId; +import com.eactive.ext.kjb.statistics.ui.ApiStatsSearch; +import com.eactive.ext.kjb.statistics.ui.ApiStatsUI; + +@Service +@Transactional +public class ApiUseStatsService + extends AbstractDataService { + + private static final int MAX_DAYS = 31; + + @PersistenceContext + private EntityManager entityManager; + + @SuppressWarnings("unchecked") + public Page selectList(ApiStatsSearch search, Pageable pageable) { + Query dataQuery = getDataQuery(search); + dataQuery.setFirstResult((int) pageable.getOffset()); + dataQuery.setMaxResults(pageable.getPageSize()); + + List rows = dataQuery.getResultList(); + List results = rows.stream() + .map(this::toVO) + .collect(Collectors.toList()); + + long records = rows.size() > 0 ? StringUtils.toLong(rows.get(0)[0]) : 0; + + return new PageImpl<>(results, pageable, records); + } + + + @SuppressWarnings("unchecked") + public List selectList(ApiStatsSearch search) { + Query dataQuery = getDataQuery(search); + List rows = dataQuery.getResultList(); + return rows.stream() + .map(this::toVO) + .collect(Collectors.toList()); + } + + + private Query getDataQuery(ApiStatsSearch search) { + + String schemaEms = System.getProperty("eai.tableowner", "EMSADM").toUpperCase(); + + StringBuilder where = buildNativeWhere(search); + + String dataSql = ""; + if ("ORG".equals(search.getSearchType())) { + dataSql = "SELECT COUNT(*) OVER () AS RECORDS " + + ", B.ORGNAME" + + ", SUM(A.TOTAL_CNT)" + + ", SUM(A.SUCCESS_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN (SUM(A.TOTAL_CNT) - SUM(A.SUCCESS_CNT)) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", SUM(A.TIMEOUT_CNT)" + + ", SUM(A.SYSTEM_ERR_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN TRUNC(SUM(A.TOTAL_CNT * A.AVG_RESP_TIME) / SUM(A.TOTAL_CNT)) ELSE NULL END" + + ", MIN(A.MIN_RESP_TIME)" + + ", MAX(A.MAX_RESP_TIME)" + + " FROM API_STATS_DAY A" + + " LEFT OUTER JOIN " + schemaEms + ".PTL_CREDENTIAL B ON A.CLIENT_ID = B.CLIENTID" + + " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME = C.EAISVCNAME " + + where + + " GROUP BY B.ORGNAME" + + " ORDER BY ORGNAME"; + } else if ("API".equals(search.getSearchType())) { + dataSql = "SELECT COUNT(*) OVER () AS RECORDS " + + ", C.EAISVCDESC" + + ", SUM(A.TOTAL_CNT)" + + ", SUM(A.SUCCESS_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN (SUM(A.TOTAL_CNT) - SUM(A.SUCCESS_CNT)) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", SUM(A.TIMEOUT_CNT)" + + ", SUM(A.SYSTEM_ERR_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN TRUNC(SUM(A.TOTAL_CNT * A.AVG_RESP_TIME) / SUM(A.TOTAL_CNT)) ELSE NULL END" + + ", MIN(A.MIN_RESP_TIME)" + + ", MAX(A.MAX_RESP_TIME)" + + " FROM API_STATS_DAY A " + + " LEFT OUTER JOIN " + schemaEms + ".PTL_CREDENTIAL B ON A.CLIENT_ID = B.CLIENTID" + + " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME = C.EAISVCNAME " + + where + + " GROUP BY C.EAISVCDESC" + + " ORDER BY EAISVCDESC"; + } else if ("DATE".equals(search.getSearchType())) { + dataSql = "SELECT COUNT(*) OVER () AS RECORDS " + + ", TO_CHAR(STAT_TIME,'YYYY-MM-DD') AS STAT_TIME " + + ", SUM(A.TOTAL_CNT)" + + ", SUM(A.SUCCESS_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN (SUM(A.TOTAL_CNT) - SUM(A.SUCCESS_CNT)) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + + ", SUM(A.TIMEOUT_CNT)" + + ", SUM(A.SYSTEM_ERR_CNT)" + + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN TRUNC(SUM(A.TOTAL_CNT * A.AVG_RESP_TIME) / SUM(A.TOTAL_CNT)) ELSE NULL END" + + ", MIN(A.MIN_RESP_TIME)" + + ", MAX(A.MAX_RESP_TIME)" + + " FROM API_STATS_DAY A " + + " LEFT OUTER JOIN " + schemaEms + ".PTL_CREDENTIAL B ON A.CLIENT_ID = B.CLIENTID" + + " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME = C.EAISVCNAME " + + where + + " GROUP BY TO_CHAR(STAT_TIME,'YYYY-MM-DD')" + + " ORDER BY STAT_TIME"; + } + + Query dataQuery = entityManager.createNativeQuery(dataSql); + if (search.getParsedStartDate() != null) { + dataQuery.setParameter("searchStartDate", search.getParsedStartDate()); + dataQuery.setParameter("searchEndDate", search.getParsedEndDate()); + } + if (StringUtils.isNotBlank(search.getSearchOrgName())) { + dataQuery.setParameter("searchOrgName", "%" + search.getSearchOrgName().toUpperCase() + "%"); + } + if (StringUtils.isNotBlank(search.getSearchApiName())) { + dataQuery.setParameter("searchApiName", "%" + search.getSearchApiName().toUpperCase() + "%"); + } + return dataQuery; + } + + + /** + * Native Query 결과를 ApiStatsUI로 변환 + */ + private ApiStatsUI toVO(Object[] row) { + ApiStatsUI vo = new ApiStatsUI(); + vo.setOrgName(StringUtils.toString(row[1])); + vo.setTotalCnt(StringUtils.toLong(row[2])); + vo.setSuccessCnt(StringUtils.toLong(row[3])); + vo.setSuccessRate(StringUtils.toDecimal(row[4]).setScale(2, RoundingMode.HALF_UP)); + vo.setFailRate(StringUtils.toDecimal(row[5]).setScale(2, RoundingMode.HALF_UP)); + vo.setTimeoutCnt(StringUtils.toLong(row[6])); + vo.setSystemErrCnt(StringUtils.toLong(row[7])); + vo.setAvgRespTime(StringUtils.toDecimal(row[8])); + vo.setMinRespTime(StringUtils.toDecimal(row[9])); + vo.setMaxRespTime(StringUtils.toDecimal(row[10])); + return vo; + } + + + /** + * native SQL용 동적 WHERE 절 생성 + */ + private StringBuilder buildNativeWhere(ApiStatsSearch search) { + StringBuilder where = new StringBuilder(" WHERE 1=1"); + + calculateDateRange(search); + + if (search.getParsedStartDate() != null) { + where.append(" AND A.STAT_TIME >= :searchStartDate "); + where.append(" AND A.STAT_TIME <= :searchEndDate "); + } + + if (StringUtils.isNotBlank(search.getSearchOrgName())) { + where.append(" AND UPPER(B.ORGNAME) LIKE :searchOrgName "); + } + + if (StringUtils.isNotBlank(search.getSearchApiName())) { + where.append(" AND UPPER(C.EAISVCDESC) LIKE :searchApiName "); + } + + return where; + } + + + /** + * 조회 기간 계산 (최대 31일 제한) + */ + private void calculateDateRange(ApiStatsSearch search) { + if (StringUtils.isBlank(search.getSearchStartDateTime())) { + return; + } + + LocalDate startDate = LocalDate.parse(search.getSearchStartDateTime(), + DateTimeFormatter.ofPattern("yyyyMMdd")); + LocalDate endDate; + + if (StringUtils.isNotBlank(search.getSearchEndDateTime())) { + endDate = LocalDate.parse(search.getSearchEndDateTime(), + DateTimeFormatter.ofPattern("yyyyMMdd")); + if (java.time.Period.between(startDate, endDate).getDays() > MAX_DAYS) { + endDate = startDate.plusDays(MAX_DAYS); + } + } else { + endDate = startDate.plusDays(MAX_DAYS); + } + + search.setParsedStartDate(startDate); + search.setParsedEndDate(endDate); + } + +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java index d637000..606f50c 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatsHourlyAggregationJob.java @@ -94,8 +94,8 @@ public class ApiStatsHourlyAggregationJob implements Job { // 2. 집계 및 데이터 입력 /** - * EAISVCSERNO로 그룹핑하여 1행으로 집계를 한 다음 - * 총건수 : EAISVCSERNO로 그룹핑한 총 건수 + * EAISVCSERNO로 그룹핑하여 1행으로 집계를 한 다음 (한거래 안에서 adapter가 여러개 있을 경우 seq=100의 adapter를 기준) + * 총건수 : EAISVCSERNO로 그룹핑한 총 건수 * 성공건수 : seq = 400 and EAIERRCD = null 인 건수 * Timeout : EAIERRCD in (공통코드 CODEGROUP = 'ERRCODE_TIMEOUT') 인 건수 * 시스템오류 : (seq400 = null or EAIERRCD is not null) and 공통코드(ERRCODE_TIMEOUT)에 정의되지 않은 errorcode 인 건수 @@ -120,9 +120,8 @@ public class ApiStatsHourlyAggregationJob implements Job { " SELECT EAISVCSERNO" + " , MAX(EAISVCNAME) AS API_NAME, MAX(EAISEVRINSTNCNAME) AS GW_INSTANCE_ID" + " , MAX(EAIBZWKDSTCD) AS BIZ_DIV_CODE, MAX(CLIENTID) AS CLIENT_ID" + - " , MAX(CLIENTNAME) AS CLIENT_NAME, MAX(ORGID) AS ORG_ID, MAX(ORGNAME) AS ORG_NAME" + - " , MAX(GSTATSYSADPTRBZWKGROUPNAME) AS INBOUND_ADAPTER" + - " , MAX(PSVSYSADPTRBZWKGROUPNAME) AS OUTBOUND_ADAPTER" + + " , MAX(CASE WHEN LOGPRCSSSERNO = '100' THEN GSTATSYSADPTRBZWKGROUPNAME ELSE '' END) AS INBOUND_ADAPTER" + + " , MAX(CASE WHEN LOGPRCSSSERNO = '100' THEN PSVSYSADPTRBZWKGROUPNAME ELSE '' END) AS OUTBOUND_ADAPTER" + " , MIN(MSGDPSTYMS) AS DT" + " , MAX(MSGPRCSSYMS) - MIN(MSGDPSTYMS) AS RESP_TIME" + " , MAX(CASE WHEN LOGPRCSSSERNO = '400' THEN LOGPRCSSSERNO ELSE '' END) AS E400" + diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/statistics/ApiUseStatsController.java b/src/main/java/com/eactive/eai/rms/ext/djb/statistics/ApiUseStatsController.java index 3b79e3c..8676b9f 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/statistics/ApiUseStatsController.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/statistics/ApiUseStatsController.java @@ -1,29 +1,22 @@ package com.eactive.eai.rms.ext.djb.statistics; import java.io.IOException; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import com.eactive.eai.rms.common.vo.GridResponse; -import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDay; -import com.eactive.eai.rms.data.entity.onl.kjb.statistics.ApiStatsDayService; -import com.eactive.ext.kjb.statistics.mapping.ApiStatsUIMapper; -import com.eactive.ext.kjb.statistics.service.ApiStatsExcelExportService; -import com.eactive.ext.kjb.statistics.ui.ApiStatsChartUI; +import com.eactive.eai.rms.data.ext.djb.statistics.ApiUseStatsExcelExportService; +import com.eactive.eai.rms.data.ext.djb.statistics.ApiUseStatsService; import com.eactive.ext.kjb.statistics.ui.ApiStatsSearch; import com.eactive.ext.kjb.statistics.ui.ApiStatsUI; @@ -35,37 +28,29 @@ import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor public class ApiUseStatsController { - private final ApiStatsDayService service; - private final ApiStatsUIMapper mapper; - private final ApiStatsExcelExportService excelExportService; + private final ApiUseStatsService service; + private final ApiUseStatsExcelExportService excelExportService; - @GetMapping(value = "/onl/djb/statistics/apiUseStatsMan.view") + @GetMapping(value = "/onl/kjb/statistics/apiUseStatsMan.view") public String view() { - return "/onl/djb/statistics/apiUseStatsMan"; + return "/onl/kjb/statistics/apiUseStatsMan"; } - @PostMapping(value = "/onl/djb/statistics/apiUseStatsMan.json", params = "cmd=LIST") + @PostMapping(value = "/onl/kjb/statistics/apiUseStatsMan.json", params = "cmd=LIST") public ResponseEntity> selectList(ApiStatsSearch search, Pageable pageable) { - Pageable sortedPageable = PageRequest.of( - pageable.getPageNumber(), - pageable.getPageSize(), - Sort.by(Sort.Order.desc("statTime"))); - - Page page = service.selectList(search, sortedPageable); - Page uiPage = page.map(mapper::toVo); - - return ResponseEntity.ok(new GridResponse<>(uiPage)); + Page page = service.selectList(search, pageable); + return ResponseEntity.ok(new GridResponse<>(page)); } - @PostMapping(value = "/onl/djb/statistics/apiStatsDayMan.json", params = "cmd=EXCEL_EXPORT") + @PostMapping(value = "/onl/kjb/statistics/apiUseStatsMan.json", params = "cmd=EXCEL_EXPORT") public void exportToExcel(ApiStatsSearch search, HttpServletResponse response) throws IOException { log.info("Excel export started - search: {}", search); try { - List dataList = service.selectListForExcel(search); - log.info("Data retrieved - count: {}", dataList.size()); + List uiList = service.selectList(search); + log.info("Data retrieved - count: {}", uiList.size()); - if (dataList.isEmpty()) { + if (uiList.isEmpty()) { log.warn("No data found for export"); response.setStatus(HttpServletResponse.SC_NO_CONTENT); response.setContentType("application/json; charset=UTF-8"); @@ -74,11 +59,6 @@ public class ApiUseStatsController { return; } - List uiList = dataList.stream() - .map(mapper::toVo) - .collect(Collectors.toList()); - log.info("Data converted to UI list - count: {}", uiList.size()); - String fileName = generateFileName(search); log.info("Generating Excel file: {}", fileName); @@ -101,10 +81,7 @@ public class ApiUseStatsController { } private String generateFileName(ApiStatsSearch search) { - String timeRange = StringUtils.isNotBlank(search.getSearchStartDateTime()) - ? search.getSearchStartDateTime() - : LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); - return "API사용현황_" + timeRange + ".xlsx"; + return "API사용현황_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + ".xlsx"; } } diff --git a/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsSearch.java b/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsSearch.java index 96c0e58..2f354fd 100644 --- a/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsSearch.java +++ b/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsSearch.java @@ -18,6 +18,8 @@ public class ApiStatsSearch { private String searchClientId; private String searchInboundAdapter; private String searchOutboundAdapter; + private String searchOrgName; + private String searchType; /** 파싱된 시작시간 */ private LocalDateTime parsedStartDateTime; diff --git a/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsUI.java b/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsUI.java index 3a57ab9..83ee405 100644 --- a/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsUI.java +++ b/src/main/java/com/eactive/ext/kjb/statistics/ui/ApiStatsUI.java @@ -14,6 +14,7 @@ public class ApiStatsUI { private String gwInstanceId; private String bizDivCode; private String clientId; + private String orgName; private String inboundAdapter; private String outboundAdapter; @@ -27,4 +28,8 @@ public class ApiStatsUI { private BigDecimal avgRespTime; private BigDecimal minRespTime; private BigDecimal maxRespTime; + + //성공율,실패율 + private BigDecimal successRate; + private BigDecimal failRate; } From 191857811fd21e01a27f7df0d83597df974497d3 Mon Sep 17 00:00:00 2001 From: eastargh Date: Wed, 20 May 2026 11:50:40 +0900 Subject: [PATCH 09/45] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=95=88=EC=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apim/portalnotice/portalNoticeManDetail.jsp | 4 ++-- .../eactive/eai/rms/common/util/StringUtils.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp index c26dad6..6e74a8d 100644 --- a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp @@ -297,7 +297,7 @@ - + diff --git a/src/main/java/com/eactive/eai/rms/common/util/StringUtils.java b/src/main/java/com/eactive/eai/rms/common/util/StringUtils.java index 2376dd1..a6f02c1 100644 --- a/src/main/java/com/eactive/eai/rms/common/util/StringUtils.java +++ b/src/main/java/com/eactive/eai/rms/common/util/StringUtils.java @@ -1,5 +1,6 @@ package com.eactive.eai.rms.common.util; +import java.math.BigDecimal; import java.util.List; import org.apache.log4j.Logger; @@ -191,6 +192,20 @@ public class StringUtils } return sb.toString(); } + + public static String toString(Object val) { + return val != null ? val.toString() : null; + } + + public static Long toLong(Object val) { + return val != null ? ((Number) val).longValue() : null; + } + + public static BigDecimal toDecimal(Object val) { + if (val == null) return null; + if (val instanceof BigDecimal) return (BigDecimal) val; + return new BigDecimal(val.toString()); + } // // /** // * - "" 나 Null 을 입력받아 SPACE 로 변환한다. From 90c43ea7b0b67be05548b8f6303e3f5035aaec43 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 21 May 2026 09:51:39 +0900 Subject: [PATCH 10/45] =?UTF-8?q?-=20K8sUtil=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20-=20=EC=8A=B9=EC=9D=B8=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=EC=99=84=EC=A0=84=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20DJBank=EB=A1=9C=20=EB=AA=85=EC=B9=AD?= =?UTF-8?q?=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + CLAUDE.md | 64 ++--- .../onl/apim/approval/portalApprovalMan.jsp | 55 +++++ build.gradle | 16 +- readme.md | 224 ++---------------- .../approval/PortalApprovalAuthorizer.java | 3 +- .../approval/PortalApprovalManController.java | 52 +++- .../approval/PortalApprovalManService.java | 33 +++ .../app/PortalAppApprovalListener.java | 27 +-- .../apim/portalorg/PortalOrgManService.java | 37 ++- .../eai/rms/onl/common/util/K8sUtil.java | 79 ------ ..._20260506_eapim-admin_feature-crypto-module.md | 2 +- 12 files changed, 247 insertions(+), 348 deletions(-) delete mode 100644 src/main/java/com/eactive/eai/rms/onl/common/util/K8sUtil.java diff --git a/.gitignore b/.gitignore index 41a9225..67a1cbc 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,6 @@ eapim-admin-kjb/ *.report.md *.claude.md tmpclaude-*-cwd +logs +rinjae_ +tomcat-base \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index e51bbbb..7e15c4b 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에서 엔티티를 찾을 수 없다고 표시되면, `kjb-gradle.sh compileJava`를 먼저 실행하여 코드를 생성해야 합니다. +- **QueryDSL 코드 생성**: 빌드 시 `QueryDSL`을 사용하여 Q-class가 자동으로 생성됩니다. IDE에서 엔티티를 찾을 수 없다고 표시되면, `./gradlew compileJava` 를 먼저 실행하여 코드를 생성해야 합니다. - **고객사별 커스터마이징**: `ext.kjb` 또는 `custom` 패키지는 특정 고객사(광주은행)를 위한 코드를 포함하므로, 일반적인 기능 수정 시에는 주의가 필요합니다. ## 프로젝트 개요 @@ -39,50 +39,48 @@ eLink EMS (eLink Management System)는 eLink의 웹 기반 관리 서비스로, ### 빌드 명령어 -**⚠️ 중요**: 환경변수 문제로 인해 `gradle` 대신 `kjb-gradle.sh` 스크립트를 사용해야 합니다. -- 스크립트 위치: `/c/eactive/workspaces/shell-scripts/kjb-gradle.sh` -- PATH에 등록되어 있으므로 바로 `kjb-gradle.sh` 명령어 사용 가능 +프로젝트 루트의 Gradle wrapper(`./gradlew`)를 사용합니다. JDK 8 toolchain 위치는 `.envrc` 등으로 잡습니다(아래 "기술 스택" 섹션 참조). ```bash # 표준 빌드 -kjb-gradle.sh build +./gradlew build # Weblogic 배포용 빌드 (테스트 제외) -kjb-gradle.sh build -x test -Pprofile=weblogic +./gradlew build -x test -Pprofile=weblogic # WAR 파일 빌드 -kjb-gradle.sh war +./gradlew war # 클린 빌드 -kjb-gradle.sh clean build +./gradlew clean build ``` ### 테스트 실행 ```bash # 모든 테스트 실행 -kjb-gradle.sh test +./gradlew test # 특정 테스트 클래스 실행 -kjb-gradle.sh test --tests "com.example.ClassName" +./gradlew test --tests "com.example.ClassName" # 특정 테스트 패키지 실행 (JUnit 플랫폼 사용) -kjb-gradle.sh test --tests "com.eactive.eai.rms.*" +./gradlew test --tests "com.eactive.eai.rms.*" ``` ### 개발 태스크 ```bash # 패키징 없이 클래스만 컴파일 -kjb-gradle.sh classes +./gradlew classes # QueryDSL Q-classes 및 기타 애노테이션 생성 -kjb-gradle.sh compileJava +./gradlew compileJava # 의존성 트리 보기 -kjb-gradle.sh dependencies +./gradlew dependencies # 사용 가능한 모든 태스크 목록 -kjb-gradle.sh tasks --all +./gradlew tasks --all ``` ## 로컬 개발 빠른 시작 @@ -92,26 +90,26 @@ kjb-gradle.sh tasks --all 1. **IDE 설정 파일 생성 (최초 1회)** ```bash # Eclipse 사용 시 (기본) - kjb-gradle.sh eclipse + ./gradlew eclipse # IntelliJ IDEA 사용 시 (build.gradle.intellij 파일 사용 필요) # 1. build.gradle을 build.gradle.eclipse로 백업 # 2. build.gradle.intellij를 build.gradle로 복사 - # 3. kjb-gradle.sh idea 실행 + # 3. ./gradlew idea 실행 ``` 2. **QueryDSL 등 소스 코드 생성** ```bash - kjb-gradle.sh compileJava + ./gradlew compileJava ``` 3. **전체 빌드 및 테스트 실행** ```bash - kjb-gradle.sh build + ./gradlew build ``` 4. **IDE에서 프로젝트 열기** - - Eclipse: `kjb-gradle.sh eclipse` 실행 후, IDE에서 프로젝트를 엽니다. + - Eclipse: `./gradlew eclipse` 실행 후, IDE에서 프로젝트를 엽니다. - IntelliJ: IntelliJ 전용 `build.gradle.intellij`를 `build.gradle`로 교체 후 사용합니다. 5. **실행 구성(Run Configuration) 설정** @@ -162,14 +160,14 @@ eapim-admin (root project) #### Q-Class 생성 위치 Q-classes는 `build/generated/java/` 디렉토리에 생성됩니다. -- `kjb-gradle.sh compileJava` 또는 `kjb-gradle.sh build` 실행 시 Gradle이 자동으로 생성 +- `./gradlew compileJava` 또는 `./gradlew build` 실행 시 Gradle이 자동으로 생성 - 이 디렉토리는 `.gitignore`에 포함되어 있으며 커밋해서는 안 됩니다 #### 생성된 코드 작업하기 - **Gradle 빌드**: `build/generated/java/`의 Q-classes가 자동으로 classpath에 포함됩니다 -- **업데이트 pull 후**: `kjb-gradle.sh compileJava`를 실행하여 Q-classes를 재생성합니다 -- **Q-classes IDE 오류 시**: `kjb-gradle.sh clean compileJava`로 재생성합니다 +- **업데이트 pull 후**: `./gradlew compileJava` 를 실행하여 Q-classes를 재생성합니다 +- **Q-classes IDE 오류 시**: `./gradlew clean compileJava` 로 재생성합니다 #### IDE별 빌드 설정 파일 @@ -255,12 +253,21 @@ IntelliJ를 사용하려면 `build.gradle.intellij`를 `build.gradle`로 교체 WebLogic용 빌드 시, DefaultServlet 문제를 해결하기 위해 `web.xml`을 `weblogic-web.xml`로 교체하는 `weblogic` 프로필을 사용합니다: ```bash -kjb-gradle.sh build -x test -Pprofile=weblogic +./gradlew build -x test -Pprofile=weblogic ``` ## 기술 스택 -- **Java 8**: Gradle toolchain을 통해 강제 +- **Java 8**: Gradle toolchain을 통해 강제 (`JavaLanguageVersion.of(8)`). 프로젝트의 `gradle.properties` 에는 JDK 경로를 기입하지 않습니다 — 개인 환경별로 `.envrc`(direnv) 또는 셸 rc 파일에서 `JAVA_HOME` 을 JDK 8 위치로 export 하세요. Gradle 8 의 toolchain auto-detect 가 `JAVA_HOME` 도 후보 경로로 인식합니다. + + ```bash + # 예: 프로젝트 루트의 .envrc (Zulu 8 / macOS Apple Silicon) + JAVA_HOME=${HOME}/opts/jdks/zulu8.94.0.17-ca-jdk8.0.492-macosx_aarch64 + GRADLE_USER_HOME=${HOME}/eactive/djb-eapim/gradle-home + export PATH=${JAVA_HOME}/bin:${PATH} + ``` + + Gradle 표준 위치(`/Library/Java/JavaVirtualMachines/...`, Homebrew, SDKMAN 등)에 설치한 경우는 별도 설정 없이도 auto-detect 됩니다. - **Spring Framework 5.3.27**: 코어 프레임워크 (MVC, Data JPA) - **Spring Data JPA 2.5.2**: 리포지토리 추상화 - **Hibernate 5.4.33/5.6.15**: ORM 구현 (JPA/ORM) @@ -271,9 +278,10 @@ kjb-gradle.sh build -x test -Pprofile=weblogic - **Jackson 2.13.1**: JSON 처리 - **Logback 1.2.10**: 로깅 프레임워크 (SLF4J와 함께) - **AWS SDK 2.20.142**: S3 연동 -- **Kubernetes Client 18.0.1**: K8s 관리 - **EhCache**: 캐싱, **Lombok**: 코드 생성, **MapStruct**: 객체 매핑 +> Kubernetes Client 의존성은 JDK 8 호환 문제로 제거됨(`io.kubernetes:client-java:18.0.1` 은 JDK 11+ 필요). K8s 모드 기능이 필요하면 `≤13.0.2` 로 다운그레이드 후 재도입 검토. + ## 프로젝트 규칙 ### 패키지 구조 @@ -376,7 +384,7 @@ com.eactive.eai ### IntelliJ IDEA (권장) ```bash -kjb-gradle.sh idea +./gradlew idea ``` 또는 IntelliJ에서 직접 "Import Gradle Project"를 사용합니다. @@ -395,7 +403,7 @@ cp build.gradle build.gradle.intellij cp build.gradle.eclipse build.gradle # 3. Eclipse 프로젝트 생성 -kjb-gradle.sh eclipse +./gradlew eclipse ``` Eclipse 전용 설정(`build.gradle.eclipse`)은 다음을 포함합니다: diff --git a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp index dff4b54..880c94a 100644 --- a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp +++ b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp @@ -17,11 +17,52 @@ + <%-- --%> diff --git a/WebContent/jsp/common/screen/main.jsp b/WebContent/jsp/common/screen/main.jsp index 0642401..8748ef8 100644 --- a/WebContent/jsp/common/screen/main.jsp +++ b/WebContent/jsp/common/screen/main.jsp @@ -99,6 +99,93 @@ - + + <%-- 자동 로그아웃 경고 모달 --%> + + + + diff --git a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java index f274bf3..e9d6ed9 100644 --- a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java +++ b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java @@ -255,6 +255,9 @@ public interface MonitoringContext { // 이중 로그인 허용여부 public static final String RMS_DUAL_LOGIN_ENABLED = "rms.DUAL_LOGIN_ENABLED"; + // 자동 로그아웃 타임아웃 (단위: 분, 기본값: 10) + public static final String RMS_AUTO_LOGOUT_TIMEOUT = "rms.auto.logout.timeout"; + // 웹훅 재전송 설정 public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count"; public static final String API_WEBHOOK_RETRY_TIME = "api.webhook.retry_time"; diff --git a/src/main/java/com/eactive/eai/rms/common/login/MainController.java b/src/main/java/com/eactive/eai/rms/common/login/MainController.java index 1471ec8..3994a19 100644 --- a/src/main/java/com/eactive/eai/rms/common/login/MainController.java +++ b/src/main/java/com/eactive/eai/rms/common/login/MainController.java @@ -617,6 +617,8 @@ public class MainController implements InterceptorSkipController { menuId = menuId == null ? "" : menuId; model.addAttribute("mainPage", mainPage); model.addAttribute("menuId", menuId); + model.addAttribute("autoLogoutTimeout", + monitoringContext.getIntProperty(MonitoringContext.RMS_AUTO_LOGOUT_TIMEOUT, 10)); if (logger.isDebugEnabled()) { logger.debug("CURRENT SERVICE TYPE : " + service); From feb4f845a840f43c923c764b7c7090b778c0d994 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 10:11:21 +0900 Subject: [PATCH 20/45] =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=91=90=EB=B2=88?= =?UTF-8?q?=EC=A7=B8=20=EC=9D=B4=ED=9B=84=20=EC=98=A4=ED=94=88=EC=8B=9C=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EB=B2=84=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 --- WebContent/js/custom.js | 8 ++++++++ WebContent/jsp/js/custom.js | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/WebContent/js/custom.js b/WebContent/js/custom.js index e6bb511..c5e7c5f 100644 --- a/WebContent/js/custom.js +++ b/WebContent/js/custom.js @@ -36,6 +36,14 @@ // save the returnValue in options so that it is available in the callback function optns.returnValue = $frame[0].contentWindow.window.returnValue; optns.onClose(); + // Remove iframe from DOM so window.frames doesn't accumulate stale entries; + // without this, a second showModal call leaves frames[0] pointing to the first + // (closed) iframe, causing the previous returnValue to bleed into the next callback. + var $dialogEl = $frame.closest('.ui-dialog'); + setTimeout(function() { + $frame.remove(); + if ($dialogEl.length) $dialogEl.remove(); + }, 0); if(optns.option && optns.option.fullScreenPopup){ $('iframe[name=topFrame]',window.parent.document).css('display', 'block'); diff --git a/WebContent/jsp/js/custom.js b/WebContent/jsp/js/custom.js index 2cde935..5eda123 100644 --- a/WebContent/jsp/js/custom.js +++ b/WebContent/jsp/js/custom.js @@ -36,6 +36,14 @@ // save the returnValue in options so that it is available in the callback function optns.returnValue = $frame[0].contentWindow.window.returnValue; optns.onClose(); + // Remove iframe from DOM so window.frames doesn't accumulate stale entries; + // without this, a second showModal call leaves frames[0] pointing to the first + // (closed) iframe, causing the previous returnValue to bleed into the next callback. + var $dialogEl = $frame.closest('.ui-dialog'); + setTimeout(function() { + $frame.remove(); + if ($dialogEl.length) $dialogEl.remove(); + }, 0); if(optns.option && optns.option.fullScreenPopup){ $('iframe[name=topFrame]',window.parent.document).css('display', 'block'); From 480d7dac5a54b63dc6074144bf2bd97e98214d63 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 15:10:06 +0900 Subject: [PATCH 21/45] =?UTF-8?q?=EC=95=B1=EC=8A=B9=EC=9D=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=98=88=EC=83=81=EC=99=84=EB=A3=8C=EC=9D=BC=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=B6=94=EA=B0=80=20&=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20"=EC=A7=84=ED=96=89=EC=A4=91"=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/portalAppApprovalManPopup.jsp | 57 ++++++++++++++++++- .../onl/apim/approval/portalApprovalMan.jsp | 15 ++++- .../approval/PortalApprovalManController.java | 6 ++ .../approval/PortalApprovalManService.java | 17 ++++++ .../onl/apim/approval/PortalApprovalUI.java | 2 + 5 files changed, 92 insertions(+), 5 deletions(-) diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp index ad28250..03e3996 100644 --- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp @@ -38,12 +38,22 @@ var loginUser = '<%= loginVo.getUserId() %>'; var url = ''; var url_view = ''; + + function dateFormat(cellvalue) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function () { var key = "${param.id}"; if (key) { detail(key); } + + $("#expectEndDate").datepicker().inputmask("yyyy-mm-dd", {'autoUnmask': true}); $("#btn_app_approve").click(function () { if (confirm("승인하시겠습니까?")) { @@ -112,6 +122,28 @@ }); } }); + + $("#btn_modify").click(function () { + if (confirm("수정하시겠습니까?")) { + $.ajax({ + type: "POST", + url: url, + data: {cmd: "UPDATE", id: key, expectEndDate: $("#expectEndDate").val().replaceAll('-','')}, + success: function (args) { + alert("수정되었습니다."); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } + window.close(); + }, + error: function (e) { + alert(e.responseText); + } + }); + } + }); $("#btn_close").click(function () { window.close(); @@ -126,12 +158,25 @@ data: {cmd: 'DETAIL', id: key}, success: function (json) { var data = json; + + if (data.approvalStatus.code == 'END') { + $('#btn_modify').hide(); + $('#expectEndDate').hide(); + $('#spExpectEndDate').show(); + $('#spExpectEndDate').text(dateFormat(data.expectEndDate)); + } else { + $('#btn_modify').show(); + $('#expectEndDate').show(); + $('#spExpectEndDate').hide(); + } + $("#approvalType").text(data.approvalType === 'USER' ? "법인사용자" : "API 사용"); $("#approvalStatus").text(data.approvalStatus.description); $("#requesterName").text(data.requester.userName); $("#approvalSubject").text(data.approvalSubject); $("#approvalDetail").html(data.approvalDetail); $("#createdDate").text(data.createdDate).inputmask("9999-99-99 99:99:99.999", {'autoUnmask': true}); + $("#expectEndDate").val(data.expectEndDate); if (data.approvers.some(approver => approver.approverStatus === 'CURRENT' && @@ -144,7 +189,7 @@ document.getElementById("btn_app_reject").style.display = "none"; } - if (data.approvalStatus.description === '배포실패') { + if (data.approvalStatus.code === 'FAILED') { document.getElementById("btn_app_redeploy").style.display = ""; } @@ -242,9 +287,14 @@ 상세 내용 - +
+ 예상완료일 + + + + @@ -282,6 +332,9 @@
+ diff --git a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp index dff4b54..c00c10b 100644 --- a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp +++ b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp @@ -21,6 +21,14 @@ 'USER': '법인사용자', 'APP': 'API 사용' }; + + function dateFormat(cellvalue, options, rowObject) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function() { $('#grid').jqGrid({ @@ -33,7 +41,7 @@ searchApprovalStatus: $('select[name=searchApprovalStatus]').val(), searchApprovalSubject: $('input[name=searchApprovalSubject]').val() }, - colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일'], + colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일', '예상완료일'], colModel: [ { name: 'rowNum', align: 'center', width: '30', sortable: false}, { name: 'id', align: 'center', key: true, hidden: true }, @@ -42,7 +50,8 @@ { name: 'approvalType', align: 'center', width: 80, hidden: true}, { name: 'approvalStatus.description', align: 'center', width: 80 }, { name: 'requester.userName', align: 'center', width: 100 }, - { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } } + { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } }, + { name: 'expectEndDate', align: 'center', width: 100, formatter: dateFormat}, ], jsonReader: { repeatitems: false @@ -134,8 +143,8 @@
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java index 8a72d2f..532ae3a 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java @@ -76,4 +76,10 @@ public class PortalApprovalManController extends BaseAnnotationController { portalApprovalManService.redeploy(id); return ResponseEntity.ok().build(); } + + @PostMapping(value = "/onl/apim/approval/portalApprovalMan.json", params = "cmd=UPDATE") + public ResponseEntity update(String id, String expectEndDate) { + portalApprovalManService.update(id, expectEndDate); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index 99cf1b2..8210bd8 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -76,6 +76,16 @@ public class PortalApprovalManService extends BaseService { * 마스킹된 상세 정보 조회 */ public PortalApprovalUI selectDetail(String id) { + //2026.06.05 관리자가 승인요청을 조회시 심사중으로 상태 변경 + //APP 유형이고 REQUESTED 상태인 경우 관리자 조회 시 PROCESSING으로 변경 + approvalService.findById(id).ifPresent(approval -> { + if (approval.getApprovalType().equals(ApprovalType.APP) + && approval.getApprovalStatus() instanceof RequestedState) { + approval.setApprovalStatus(new ProcessingState()); + approvalService.save(approval); + } + }); + PortalApprovalUI result = getDetailWithMaskOption(id, false); if (result == null) { throw new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id); @@ -320,6 +330,13 @@ public class PortalApprovalManService extends BaseService { sendEvent(id, ApprovalEvent.DENY, options); } + public void update(String id, String expectEndDate) { + Approval approval = approvalService.findById(id) + .orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); + approval.setExpectEndDate(expectEndDate); + approvalService.save(approval); + } + public void redeploy(String id) { Map options = new HashMap<>(); Approval approval = approvalService.findById(id).orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java index 5df32b4..029d3f6 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java @@ -38,6 +38,8 @@ public class PortalApprovalUI { @DateTimeFormat(pattern = "yyyyMMddHHmmssSSS") private String approvalDate; + private String expectEndDate; + public String getApprovalTypeDescription() { return approvalType != null ? approvalType.getDescription() : ""; } From ec8d6bfd7bc1251abe73ad390feff83a85be3997 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 17:41:37 +0900 Subject: [PATCH 22/45] =?UTF-8?q?Q&A=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9E=91=EC=84=B1=20=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portalinquiry/portalInquiryManDetail.jsp | 104 ++++++++++++++++++ .../InquiryCommentRepository.java | 15 +++ .../PortalInquiryCommentService.java | 27 +++++ .../portalInquiry/PortalInquiryCommentUI.java | 42 +++++++ .../PortalInquiryCommentUIMapper.java | 17 +++ .../PortalInquiryManController.java | 18 +++ .../PortalInquiryManService.java | 54 +++++++++ 7 files changed, 277 insertions(+) create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp index 7711d66..a302d4e 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp @@ -36,6 +36,13 @@ padding-bottom: 10px; border-bottom: 2px solid #e0e0e0; /* 제목 아래 줄 긋기 */ } + + .comment-section { + margin-bottom: 30px; + border: 1px solid #e0e0e0; /* 동일한 박스 스타일 */ + padding: 20px; + border-radius: 5px; + } .info-row { margin-bottom: 10px; @@ -57,6 +64,15 @@ width: 100%; min-height: 200px; } + + #commentDetail { + min-height: 100px; + border: 1px solid #00000032; + border-radius: 4px; + padding: 10px; + flex: 1; + font-family: '맑은고딕' + } .required-mark { color: red; @@ -94,6 +110,8 @@ var decodedContent = decodeHTMLEntities(data.responseDetail); $("#responseDetail").summernote('code', decodedContent || ''); + // 댓글 표시 + listComment(key); // 첨부 파일 표시 displayAttachFiles(data.fileInfo); @@ -104,6 +122,55 @@ } }); } + + function listComment(inquiryId) { + $.ajax({ + type: "POST", + url: url, + dataType: "json", + data: {cmd: 'LIST_COMMENT', id: inquiryId}, + success: function (data) { + var $commentList = $('#commentList'); + $commentList.empty(); + if (!data || data.length === 0) return; + $.each(data, function (i, comment) { + var date = comment.createdDate ? timeStampFormat(comment.createdDate) : ''; + var row = $('
').addClass('info-row'); + $('
').addClass('info-label').css('color', '#555').text(comment.writerName || '').appendTo(row); + var content = $('
').addClass('info-content'); + $('
').css('white-space', 'pre-wrap').text(comment.commentDetail).appendTo(content); + var meta = $('
').css({'font-size': '0.9em', 'color': '#999', 'margin-top': '2px'}); + $('').text(date).appendTo(meta); + $('
+ + +
+
+
+
${sessionScope.login.userName}
+
+ + +
+
+
+
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java new file mode 100644 index 0000000..caf0618 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java @@ -0,0 +1,15 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.EMSDataSource; + +import java.util.List; + +@EMSDataSource +public interface InquiryCommentRepository extends BaseRepository { + + long countByInquiry_Id(String inquiryId); + + List findByInquiry_IdAndDelYnOrderBySeqAsc(String inquiryId, String delYn); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java new file mode 100644 index 0000000..b13b422 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java @@ -0,0 +1,27 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +public class PortalInquiryCommentService extends AbstractEMSDataSerivce { + + // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 + // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 + @Autowired + private InquiryCommentRepository inquiryCommentRepository; + + public long countByInquiryId(String inquiryId) { + return inquiryCommentRepository.countByInquiry_Id(inquiryId); + } + + public List findByInquiryId(String inquiryId) { + return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderBySeqAsc(inquiryId, "N"); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java new file mode 100644 index 0000000..b5eddea --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java @@ -0,0 +1,42 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.file.entity.FileInfo; +import com.eactive.eai.data.converter.LocalDateTimeFormatters; +import com.eactive.eai.rms.onl.apim.portaluser.PortalUserUI; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.multipart.MultipartFile; + +import java.time.LocalDateTime; +import java.util.List; + + +@Data +public class PortalInquiryCommentUI { + + private String id; + + private String inquiryId; + + private String commentDetail; + + private int seq; + + private String delYn; + + private String createdBy; + + private String writerName; + + private String lastModifiedBy; + + @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14) + @DateTimeFormat(pattern = "yyyyMMddHHmmss") + private LocalDateTime createdDate; + + @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14) + @DateTimeFormat(pattern = "yyyyMMddHHmmss") + private LocalDateTime lastModifiedDate; + +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java new file mode 100644 index 0000000..8a5e3dd --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java @@ -0,0 +1,17 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PortalInquiryCommentUIMapper { + + @Mapping(target = "inquiryId", source = "inquiry.id") + PortalInquiryCommentUI toVo(InquiryComment entity); + + List toVoList(List entities); +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java index a87c6ee..5fe6a76 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java @@ -73,5 +73,23 @@ public class PortalInquiryManController extends BaseAnnotationController { portalInquiryManService.deleteBulk(ids); return ResponseEntity.ok().build(); } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=LIST_COMMENT") + public ResponseEntity> selectCommentList(String id) { + return ResponseEntity.ok(portalInquiryManService.selectCommentList(id)); + } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=INSERT_COMMENT") + public ResponseEntity insertComment(HttpServletRequest request, PortalInquiryCommentUI portalInquiryCommentUI) { + String userid = SessionManager.getUserId(request); + portalInquiryManService.insertComment(portalInquiryCommentUI, userid); + return ResponseEntity.ok().build(); + } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=DELETE_COMMENT") + public ResponseEntity deleteComment(String id) { + portalInquiryManService.deleteComment(id); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java index f8549d1..e9895ff 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java @@ -4,10 +4,13 @@ import com.eactive.apim.portal.file.entity.FileInfo; import com.eactive.apim.portal.file.service.FileService; import com.eactive.apim.portal.portaluser.entity.PortalUser; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums; +import com.eactive.apim.portal.portaluser.repository.PortalUserRepository; import com.eactive.apim.portal.qna.entity.Inquiry; +import com.eactive.apim.portal.qna.entity.InquiryComment; import com.eactive.apim.portal.user.entity.UserInfo; import com.eactive.eai.rms.common.base.BaseService; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquirySearch; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryService; import com.eactive.eai.rms.onl.apim.masking.MaskingUtils; @@ -22,14 +25,18 @@ import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; +import java.util.Optional; @Service @Transactional(transactionManager = "transactionManagerForEMS") @Slf4j public class PortalInquiryManService extends BaseService { private final PortalInquiryService portalInquiryService; + private final PortalInquiryCommentService portalInquiryCommentService; private final PortalInquiryUIMapper portalInquiryUIMapper; + private final PortalInquiryCommentUIMapper portalInquiryCommentUIMapper; private final UserInfoService userInfoService; + private final PortalUserRepository portalUserRepository; private final FileService fileService; public static final String PENDING = "PENDING"; @@ -37,12 +44,18 @@ public class PortalInquiryManService extends BaseService { public PortalInquiryManService(PortalInquiryService portalInquiryService, + PortalInquiryCommentService portalInquiryCommentService, PortalInquiryUIMapper portalInquiryUIMapper, + PortalInquiryCommentUIMapper portalInquiryCommentUIMapper, UserInfoService userInfoService, + PortalUserRepository portalUserRepository, FileService fileService){ this.portalInquiryService = portalInquiryService; + this.portalInquiryCommentService = portalInquiryCommentService; this.portalInquiryUIMapper = portalInquiryUIMapper; + this.portalInquiryCommentUIMapper = portalInquiryCommentUIMapper; this.userInfoService = userInfoService; + this.portalUserRepository = portalUserRepository; this.fileService = fileService; } @@ -161,5 +174,46 @@ public class PortalInquiryManService extends BaseService { List idList = Arrays.asList(ids.split(",")); portalInquiryService.deleteByIds(idList); } + + public List selectCommentList(String inquiryId) { + List comments = portalInquiryCommentService.findByInquiryId(inquiryId); + List result = portalInquiryCommentUIMapper.toVoList(comments); + result.forEach(ui -> ui.setWriterName(resolveWriterName(ui.getCreatedBy()))); + return result; + } + + private String resolveWriterName(String userId) { + if (StringUtils.isBlank(userId)) return ""; + // 직원(내부 사용자) 여부 먼저 확인 → 이름 그대로 반환 + Optional staff = userInfoService.findById(userId); + if (staff.isPresent()) { + return staff.get().getUsername(); + } + // 포털 회원이면 이름 마스킹 처리 (김수민 → 김수*) + Optional portalUser = portalUserRepository.findById(userId); + if (portalUser.isPresent()) { + return MaskingUtils.maskName(portalUser.get().getUserName()); + } + return userId; + } + + public void insertComment(PortalInquiryCommentUI commentUI, String userId) { + Inquiry inquiry = portalInquiryService.getById(commentUI.getInquiryId()); + + InquiryComment comment = new InquiryComment(); + comment.setInquiry(inquiry); + comment.setCommentDetail(commentUI.getCommentDetail()); + comment.setDelYn("N"); + int nextSeq = (int) portalInquiryCommentService.countByInquiryId(commentUI.getInquiryId()) + 1; + comment.setSeq(nextSeq); + + portalInquiryCommentService.save(comment); + } + + public void deleteComment(String commentId) { + InquiryComment comment = portalInquiryCommentService.getById(commentId); + comment.setDelYn("Y"); + portalInquiryCommentService.save(comment); + } } From 62ccebd773c3b33cb3b5abc2817514adeeee62df Mon Sep 17 00:00:00 2001 From: eastargh Date: Mon, 8 Jun 2026 17:19:04 +0900 Subject: [PATCH 23/45] =?UTF-8?q?Q&A=207=EC=9D=BC=ED=9B=84=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EC=A2=85=EB=A3=8C=20=EB=B0=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apim/portalinquiry/portalInquiryMan.jsp | 15 +++- .../portalinquiry/portalInquiryManDetail.jsp | 31 +++++++- .../InquiryCommentRepository.java | 15 ---- .../PortalInquiryCommentRepository.java | 28 +++++++ .../PortalInquiryCommentService.java | 10 ++- .../PortalInquiryRepository.java | 3 + .../portalinquiry/PortalInquiryService.java | 24 ++++-- .../ext/djb/job/PortalInquiryClosingJob.java | 73 +++++++++++++++++ .../PortalInquiryClosingService.java | 78 +++++++++++++++++++ .../portalInquiry/PortalInquiryCommentUI.java | 4 +- .../PortalInquiryManService.java | 15 +++- .../apim/portalInquiry/PortalInquiryUI.java | 2 + 12 files changed, 263 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp index 37de99d..d2c25ca 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp @@ -20,15 +20,22 @@ var select_orgId = ""; function formatInquiryStatus(cellvalue, options, rowObject) { - return cellvalue === 'PENDING' - ? '문의중' - : '답변완료'; + if (cellvalue == 'PENDING') { + return '문의중'; + } else if (cellvalue == 'RESPONDED') { + return '답변완료' + } else if (cellvalue == 'CLOSED') { + return '답변종료' + } else { + return cellvalue; + } } function formatFile(cellvalue, options, rowObject) { var iconPath = '${pageContext.request.contextPath}/images/icon_file.png'; var icon = rowObject.hasAttachment ? 'File Attached' : ''; - return cellvalue + icon; + var commentCount = rowObject.commentCount > 0 ? ' [' + rowObject.commentCount + ']' : ''; + return cellvalue + icon + commentCount; } function deleteSelectedRows() { diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp index a302d4e..a6cd313 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp @@ -84,6 +84,7 @@ var url = ''; var url_view = ''; var file_download = ''; + var inquiryStatus = 'PENDING'; function decodeHTMLEntities(text) { var textArea = document.createElement('textarea'); @@ -98,10 +99,21 @@ dataType: "json", data: {cmd: 'DETAIL', id: key}, success: function (data) { + + $("#id").val(key); + $("#inquirySubject").text(data.inquirySubject); $("#inquiryDetail").html(data.inquiryDetail); - $("#inquiryStatus").text(data.inquiryStatus === 'PENDING' ? '문의중' : '답변완료'); + + inquiryStatus = data.inquiryStatus; + if (data.inquiryStatus == 'PENDING') { + $("#inquiryStatus").text('문의중'); + } else if (data.inquiryStatus == 'RESPONDED') { + $("#inquiryStatus").text('답변완료'); + } else if (data.inquiryStatus == 'CLOSED') { + $("#inquiryStatus").text('답변종료'); + } $("#inquirer").text(data.inquirer.userName); $("#createdDate").text(timeStampFormat(data.createdDate)); $("#responder").text(data.responderName || ''); @@ -158,6 +170,10 @@ } function deleteComment(commentId, inquiryId) { + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 삭제할 수 없습니다'); + return; + } if (!confirm("댓글을 삭제하시겠습니까?")) return; $.ajax({ type: "POST", @@ -188,6 +204,10 @@ } $("#btn_modify").click(function () { + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 수정할 수 없습니다'); + return; + } if (!checkRequired("ajaxForm")) return; if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return; @@ -209,7 +229,10 @@ }); $("#btn_comment").click(function () { - + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 댓글을 등록할 수 없습니다'); + return; + } if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return; $.ajax({ @@ -297,6 +320,10 @@
+
+
상태
+
+
답변자
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java deleted file mode 100644 index caf0618..0000000 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; - -import com.eactive.apim.portal.qna.entity.InquiryComment; -import com.eactive.eai.data.jpa.BaseRepository; -import com.eactive.eai.rms.data.EMSDataSource; - -import java.util.List; - -@EMSDataSource -public interface InquiryCommentRepository extends BaseRepository { - - long countByInquiry_Id(String inquiryId); - - List findByInquiry_IdAndDelYnOrderBySeqAsc(String inquiryId, String delYn); -} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java new file mode 100644 index 0000000..6fc58f4 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java @@ -0,0 +1,28 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +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; + +@EMSDataSource +public interface PortalInquiryCommentRepository extends BaseRepository { + + long countByInquiry_Id(String inquiryId); + + long countByInquiry_IdAndDelYn(String inquiryId, String delYn); + + List findByInquiry_IdAndDelYnOrderByCreatedDateAsc(String inquiryId, String delYn); + + Optional findTopByInquiry_IdAndDelYnOrderByCreatedDateDesc( + String inquiryId, String delYn); + + Optional findTopByInquiry_IdAndAdminYnAndDelYnOrderByCreatedDateDesc( + String inquiryId, String adminYn, String delYn); + + boolean existsByInquiry_IdAndAdminYnAndDelYnAndCreatedDateAfter( + String inquiryId, String adminYn, String delYn, LocalDateTime after); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java index b13b422..0ccbb30 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java @@ -10,18 +10,22 @@ import java.util.List; @Service @Transactional(transactionManager = "transactionManagerForEMS") -public class PortalInquiryCommentService extends AbstractEMSDataSerivce { +public class PortalInquiryCommentService extends AbstractEMSDataSerivce { // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 @Autowired - private InquiryCommentRepository inquiryCommentRepository; + private PortalInquiryCommentRepository inquiryCommentRepository; public long countByInquiryId(String inquiryId) { return inquiryCommentRepository.countByInquiry_Id(inquiryId); } + public long countActiveByInquiryId(String inquiryId) { + return inquiryCommentRepository.countByInquiry_IdAndDelYn(inquiryId, "N"); + } + public List findByInquiryId(String inquiryId) { - return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderBySeqAsc(inquiryId, "N"); + return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderByCreatedDateAsc(inquiryId, "N"); } } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java index 3dc9f19..9dd631a 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java @@ -4,7 +4,10 @@ import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.eai.data.jpa.BaseRepository; import com.eactive.eai.rms.data.EMSDataSource; +import java.util.List; + @EMSDataSource public interface PortalInquiryRepository extends BaseRepository { + List findByInquiryStatus(String inquiryStatus); } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java index bb20d6c..a9456d9 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java @@ -1,20 +1,28 @@ package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.apim.portal.qna.entity.QInquiry; import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; import com.querydsl.core.BooleanBuilder; -import org.apache.commons.lang3.StringUtils; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; @Service @Transactional(transactionManager = "transactionManagerForEMS") public class PortalInquiryService extends AbstractEMSDataSerivce { + // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 + // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 + @Autowired + private PortalInquiryRepository portalInquiryRepository; + public Page findAll(Pageable pageable, PortalInquirySearch portalInquirySearch) { QInquiry qInquiry = QInquiry.inquiry; @@ -58,4 +66,8 @@ public class PortalInquiryService extends AbstractEMSDataSerivce findByInquiryStatus(String inquiryStatus) { + return portalInquiryRepository.findByInquiryStatus(inquiryStatus); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java new file mode 100644 index 0000000..2c976cd --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java @@ -0,0 +1,73 @@ +package com.eactive.eai.rms.ext.djb.job; + +import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; +import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; +import com.eactive.eai.rms.common.util.CommonUtil; +import com.eactive.eai.rms.onl.apim.portalInquiry.PortalInquiryClosingService; +import com.eactive.eai.rms.onl.common.util.DateUtil; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 매일 00:05 실행 - RESPONDED 상태 문의글 자동 종료 배치 + * + *

종료 조건 (기본 7일):

+ *
    + *
  • 답변완료 후 댓글이 7일간 없는 경우
    • + *
  • 관리자 댓글 등록 후 7일간 포탈사용자 댓글이 없는 경우
    • + *
+ * + *

Cron: 0 5 0 * * ?

+ * + *

Job 파라미터 (JobDataMap):

+ *
    + *
  • {@value #KEY_INQUIRY_COMMENT_CLOSING_DAY}: 종료 기준 일수 (기본값: 7)
    • + *
+ */ +@DisallowConcurrentExecution +public class PortalInquiryClosingJob implements Job { + + private static final Logger log = LoggerFactory.getLogger(PortalInquiryClosingJob.class); + + /** Job 파라미터 키: 댓글종료 기간(일) */ + public static final String KEY_INQUIRY_COMMENT_CLOSING_DAY = "inquiry.comment.closing_day"; + + private static final int DEFAULT_CLOSING_DAYS = 7; + + @Autowired + private PortalInquiryClosingService inquiryCommentClosingService; + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException { + log.info("*** START PortalInquiryCommentClosingService run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); + + int closingDays = DEFAULT_CLOSING_DAYS; + String closingDayParam = context.getMergedJobDataMap().getString(KEY_INQUIRY_COMMENT_CLOSING_DAY); + if (closingDayParam != null) { + try { + closingDays = Integer.parseInt(closingDayParam); + } catch (NumberFormatException e) { + log.warn("잘못된 {} 파라미터 값: '{}', 기본값 {}일 사용", KEY_INQUIRY_COMMENT_CLOSING_DAY, closingDayParam, DEFAULT_CLOSING_DAYS); + } + } + + DataSourceContextHolder.setDataSourceType( + DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW)); + try { + int closedCount = inquiryCommentClosingService.closeExpiredInquiries(closingDays); + log.info("PortalInquiryCommentClosingService 완료: {}건 CLOSED 처리", closedCount); + } catch (Exception e) { + log.error("PortalInquiryCommentClosingService execution failed", e); + throw new JobExecutionException(e); + } finally { + DataSourceContextHolder.clearDataSourceType(); + } + + log.info("*** END PortalInquiryCommentClosingService run({})", DateUtil.getDateTime("yyyy-MM-dd HH:mm")); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java new file mode 100644 index 0000000..48b6dae --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java @@ -0,0 +1,78 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.qna.entity.Inquiry; +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentRepository; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +/** + * RESPONDED 상태 문의글 중 아래 조건에 해당하는 경우 CLOSED로 변경한다. + * - 조건 A: 활성 댓글이 없고 답변완료일(responseDate)로부터 N일 경과 + * - 조건 B: 마지막 관리자 댓글(adminYn=Y) 이후 N일간 포탈사용자(adminYn=N) 댓글 없음 + */ +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +@Slf4j +@RequiredArgsConstructor +public class PortalInquiryClosingService { + + private static final String RESPONDED = "RESPONDED"; + private static final String CLOSED = "CLOSED"; + + private final PortalInquiryService portalInquiryService; + private final PortalInquiryCommentService portalInquiryCommentService; + private final PortalInquiryCommentRepository inquiryCommentRepository; + + public int closeExpiredInquiries(int closingDays) { + LocalDateTime threshold = LocalDateTime.now().minusDays(closingDays); + List respondedInquiries = portalInquiryService.findByInquiryStatus(RESPONDED); + + int closedCount = 0; + for (Inquiry inquiry : respondedInquiries) { + if (shouldClose(inquiry, threshold)) { + inquiry.setInquiryStatus(CLOSED); + portalInquiryService.save(inquiry); + closedCount++; + log.info("문의글 CLOSED 처리: id={}", inquiry.getId()); + } + } + log.info("InquiryCommentClosingService: 총 {}건 CLOSED 처리 (기준={}일)", closedCount, closingDays); + return closedCount; + } + + private boolean shouldClose(Inquiry inquiry, LocalDateTime threshold) { + long activeCommentCount = portalInquiryCommentService.countActiveByInquiryId(inquiry.getId()); + + // 댓글 없음 → 답변완료일 기준 N일 경과 여부만 확인 + if (activeCommentCount == 0) { + LocalDateTime responseDate = inquiry.getResponseDate(); + return responseDate != null && !responseDate.isAfter(threshold); + } + + // 가장 최근 활성 댓글 확인 + Optional lastComment = inquiryCommentRepository + .findTopByInquiry_IdAndDelYnOrderByCreatedDateDesc(inquiry.getId(), "N"); + + if (!lastComment.isPresent()) { + return false; + } + + // 포탈사용자(adminYn != 'Y')가 마지막 댓글 작성자 → CLOSED 불가 + if (!"Y".equals(lastComment.get().getAdminYn())) { + return false; + } + + // 관리자가 마지막 댓글 작성자 → N일 경과 여부 확인 + LocalDateTime lastAdminDate = lastComment.get().getCreatedDate(); + return lastAdminDate != null && !lastAdminDate.isAfter(threshold); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java index b5eddea..d609ca4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java @@ -20,9 +20,7 @@ public class PortalInquiryCommentUI { private String inquiryId; private String commentDetail; - - private int seq; - + private String delYn; private String createdBy; diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java index e9895ff..fff483c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java @@ -9,6 +9,7 @@ import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.apim.portal.qna.entity.InquiryComment; import com.eactive.apim.portal.user.entity.UserInfo; import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.common.exception.IntegrationException; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquirySearch; @@ -41,6 +42,7 @@ public class PortalInquiryManService extends BaseService { public static final String PENDING = "PENDING"; public static final String RESPONDED = "RESPONDED"; + public static final String CLOSED = "CLOSED"; public PortalInquiryManService(PortalInquiryService portalInquiryService, @@ -68,6 +70,7 @@ public class PortalInquiryManService extends BaseService { if (ui.getInquirer() != null) { maskPortalInquiryUI(ui); } + ui.setCommentCount((int) portalInquiryCommentService.countActiveByInquiryId(inquiry.getId())); return setInquiryAttachmentStatus(ui); }); } @@ -154,6 +157,7 @@ public class PortalInquiryManService extends BaseService { UserInfo userinfo = userInfoService.getById(userId); Inquiry inquiry = portalInquiryService.getById(portalInquiryUI.getId()); + validateNotClosed(inquiry); // 답변 대기중 상태일 경우만 답변완료로 상태 변경 if(inquiry.getInquiryStatus().equals(PENDING)) { inquiry.setInquiryStatus(RESPONDED); @@ -199,21 +203,28 @@ public class PortalInquiryManService extends BaseService { public void insertComment(PortalInquiryCommentUI commentUI, String userId) { Inquiry inquiry = portalInquiryService.getById(commentUI.getInquiryId()); + validateNotClosed(inquiry); InquiryComment comment = new InquiryComment(); comment.setInquiry(inquiry); comment.setCommentDetail(commentUI.getCommentDetail()); comment.setDelYn("N"); - int nextSeq = (int) portalInquiryCommentService.countByInquiryId(commentUI.getInquiryId()) + 1; - comment.setSeq(nextSeq); + comment.setAdminYn("Y"); portalInquiryCommentService.save(comment); } public void deleteComment(String commentId) { InquiryComment comment = portalInquiryCommentService.getById(commentId); + validateNotClosed(comment.getInquiry()); comment.setDelYn("Y"); portalInquiryCommentService.save(comment); } + private void validateNotClosed(Inquiry inquiry) { + if (CLOSED.equals(inquiry.getInquiryStatus())) { + throw new IntegrationException("답변종료되어 수정할 수 없습니다."); + } + } + } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java index fd48292..df3669c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java @@ -55,4 +55,6 @@ public class PortalInquiryUI { private LocalDateTime lastModifiedDate; private String orgName; + + private int commentCount; } From 8109f91aa23d0831fd10286f2028f5d41acfcf16 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 09:51:05 +0900 Subject: [PATCH 24/45] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inflow/inflowAdapterControlManDetail.jsp | 579 +++++++++++++---- .../inflow/inflowClientControlManDetail.jsp | 602 ++++++++++++++---- .../inflowInterfaceControlManDetail.jsp | 579 +++++++++++++---- .../InflowAdapterControlManController.java | 8 + .../InflowClientControlManController.java | 8 + .../inflow/InflowControlManService.java | 75 +++ .../InflowInterfaceControlManController.java | 8 + 7 files changed, 1464 insertions(+), 395 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp index 6aed70c..305470a 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp @@ -16,173 +16,486 @@ - - -
-
- -
-
-
- - - -<%-- " alt="" id="btn_delete" level="W" status="DETAIL"/> --%> -<%-- " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> --%> -<%-- " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> --%> -
-
<%= localeMessage.getString("infAdpConMan.title") %><%= localeMessage.getString("infAdpConMan.title") %>
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
<%= localeMessage.getString("infAdpConMan.adaNm") %>
<%= localeMessage.getString("infAdpConMan.adaDes") %>
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
<%= localeMessage.getString("infAdpConMan.title") %><%= localeMessage.getString("infAdpConMan.title") %>
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
<%= localeMessage.getString("infAdpConMan.adaNm") %>
<%= localeMessage.getString("infAdpConMan.adaDes") %>
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 2bac2cd..0846a98 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -16,170 +16,514 @@ - - -
-
- -
-
-
- - - -
-
클라이언트 유량제어 클라이언트 유량제어
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
클라이언트 ID
클라이언트명
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
클라이언트 유량제어클라이언트 유량제어
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
클라이언트 ID
클라이언트명
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp index 03a2aa6..62fa1d1 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp @@ -16,173 +16,486 @@ - - -
-
- -
-
-
- - - -<%-- " alt="" id="btn_delete" level="W" status="DETAIL"/> --%> -<%-- " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> --%> -<%-- " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> --%> -
-
<%= localeMessage.getString("infIfConMan.title") %><%= localeMessage.getString("infIfConMan.title") %>
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
<%= localeMessage.getString("infIfConMan.ifNm") %>
<%= localeMessage.getString("infIfConMan.ifDesc") %>
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
<%= localeMessage.getString("infIfConMan.title") %><%= localeMessage.getString("infIfConMan.title") %>
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
<%= localeMessage.getString("infIfConMan.ifNm") %>
<%= localeMessage.getString("infIfConMan.ifDesc") %>
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java index 37cbe36..ceba2e5 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java @@ -85,4 +85,12 @@ public class InflowAdapterControlManController extends OnlBaseAnnotationControll return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowAdapterControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getAdapterBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java index a384d01..9f08629 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java @@ -83,4 +83,12 @@ public class InflowClientControlManController extends OnlBaseAnnotationControlle return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getClientBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java index c5c6d19..7d55e59 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java @@ -1,12 +1,21 @@ package com.eactive.eai.rms.onl.manage.inflow.inflow; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Optional; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; import com.eactive.eai.data.entity.onl.inflow.InflowControl; import com.eactive.eai.data.entity.onl.inflow.InflowControlId; @@ -14,10 +23,13 @@ import com.eactive.eai.rms.common.base.BaseService; import com.eactive.eai.rms.common.combo.ComboService; import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlService; import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlServiceDto; +import com.eactive.eai.rms.onl.common.service.EaiServerInfoService; @Service public class InflowControlManService extends BaseService { + private static final Logger logger = LoggerFactory.getLogger(InflowControlManService.class); + private static final String ADAPTER_TYPE_INFLOW = "01"; private static final String INTERFACE_TYPE_INFLOW = "02"; private static final String CLIENT_TYPE_INFLOW = "03"; @@ -32,6 +44,11 @@ public class InflowControlManService extends BaseService { @Autowired private InflowControlManMapper mapper; + @Autowired + private EaiServerInfoService eaiServerInfoService; + + private RestTemplate restTemplate = new RestTemplate(); + // 어댑터 유량제어 public Page selectAdapterList(Pageable pageable, String searchName) { Page dtoList = service.findAllForAdapter(pageable, searchName); @@ -123,6 +140,64 @@ public class InflowControlManService extends BaseService { InflowControlId id = toId(CLIENT_TYPE_INFLOW, name); service.findById(id).ifPresent(service::delete); } + + @SuppressWarnings("unchecked") + public List> getClientBucketStatus() { + return getBucketStatus("client", "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + public List> getAdapterBucketStatus() { + return getBucketStatus("adapter", "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + public List> getInterfaceBucketStatus() { + return getBucketStatus("interface", "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + private List> getBucketStatus(String type, String noDataMessage, String logPrefix) { + List> result = new ArrayList<>(); + List> serverList = eaiServerInfoService.getEaiServerIpList(); + + for (Map server : serverList) { + String serverName = server.get("EAISVRINSTNM"); + String serverIp = server.get("EAISVRIP"); + String serverPort = server.get("WEBSERVERPORT"); + + if (StringUtils.isEmpty(serverPort)) { + serverPort = server.get("EAISVRLSNPORT"); + } + + Map serverStatus = new HashMap<>(); + serverStatus.put("serverName", serverName); + serverStatus.put("serverIp", serverIp); + serverStatus.put("serverPort", serverPort); + + try { + String url = String.format("http://%s:%s/manage/inflow/%s/bucket-status", + serverIp, serverPort, type); + ResponseEntity response = restTemplate.getForEntity(url, Map.class); + + if (response.getBody() != null && Boolean.TRUE.equals(response.getBody().get("success"))) { + serverStatus.put("status", "online"); + serverStatus.put("data", response.getBody().get("data")); + } else { + serverStatus.put("status", "no_data"); + serverStatus.put("message", noDataMessage); + } + } catch (Exception e) { + logger.warn("{} - server: {}, error: {}", logPrefix, serverName, e.getMessage()); + serverStatus.put("status", "offline"); + serverStatus.put("message", "서버 연결 실패"); + } + + result.add(serverStatus); + } + + return result; + } private InflowControlId toId(InflowControlManUI ui) { diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java index e2eef98..69cdcc4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java @@ -83,4 +83,12 @@ public class InflowInterfaceControlManController extends OnlBaseAnnotationContro return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowInterfaceControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getInterfaceBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file From 06ad1230b2f0d22e58afacac747f5f2f3c7859c4 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 11:34:10 +0900 Subject: [PATCH 25/45] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inflow/inflowAdapterControlManDetail.jsp | 2 +- .../inflow/inflowClientControlManDetail.jsp | 2 +- .../inflow/inflowInterfaceControlManDetail.jsp | 2 +- .../InflowAdapterControlManController.java | 4 ++-- .../InflowClientControlManController.java | 4 ++-- .../inflow/inflow/InflowControlManService.java | 18 +++++++++--------- .../InflowInterfaceControlManController.java | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp index 305470a..0a3b453 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp @@ -119,7 +119,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', adapterId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 0846a98..5dbe333 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -121,7 +121,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', clientId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp index 62fa1d1..511bc59 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp @@ -119,7 +119,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', interfaceId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java index ceba2e5..01ea2b4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java @@ -86,8 +86,8 @@ public class InflowAdapterControlManController extends OnlBaseAnnotationControll } @RequestMapping(value = "/onl/admin/inflow/inflowAdapterControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getAdapterBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String adapterId) { + List> statusList = service.getAdapterBucketStatus(adapterId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java index 9f08629..897414d 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java @@ -84,8 +84,8 @@ public class InflowClientControlManController extends OnlBaseAnnotationControlle } @RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getClientBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String clientId) { + List> statusList = service.getClientBucketStatus(clientId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java index 7d55e59..4638120 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java @@ -142,22 +142,22 @@ public class InflowControlManService extends BaseService { } @SuppressWarnings("unchecked") - public List> getClientBucketStatus() { - return getBucketStatus("client", "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); + public List> getClientBucketStatus(String clientId) { + return getBucketStatus("client", clientId, "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - public List> getAdapterBucketStatus() { - return getBucketStatus("adapter", "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); + public List> getAdapterBucketStatus(String adapterId) { + return getBucketStatus("adapter", adapterId, "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - public List> getInterfaceBucketStatus() { - return getBucketStatus("interface", "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); + public List> getInterfaceBucketStatus(String interfaceId) { + return getBucketStatus("interface", interfaceId, "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - private List> getBucketStatus(String type, String noDataMessage, String logPrefix) { + private List> getBucketStatus(String target, String targetId, String noDataMessage, String logPrefix) { List> result = new ArrayList<>(); List> serverList = eaiServerInfoService.getEaiServerIpList(); @@ -176,8 +176,8 @@ public class InflowControlManService extends BaseService { serverStatus.put("serverPort", serverPort); try { - String url = String.format("http://%s:%s/manage/inflow/%s/bucket-status", - serverIp, serverPort, type); + String url = String.format("http://%s:%s/manage/inflow/%s/%s/bucket-status", + serverIp, serverPort, target, targetId); ResponseEntity response = restTemplate.getForEntity(url, Map.class); if (response.getBody() != null && Boolean.TRUE.equals(response.getBody().get("success"))) { diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java index 69cdcc4..a72d95c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java @@ -84,8 +84,8 @@ public class InflowInterfaceControlManController extends OnlBaseAnnotationContro } @RequestMapping(value = "/onl/admin/inflow/inflowInterfaceControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getInterfaceBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String interfaceId) { + List> statusList = service.getInterfaceBucketStatus(interfaceId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); From c8caeeda8c3a7cee649f34163673ccd8eea30f8f Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 13:04:32 +0900 Subject: [PATCH 26/45] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/inflow/inflowClientControlManDetail.jsp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 5dbe333..db4bf9a 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -194,19 +194,6 @@ function renderBucketStatus(servers) { $('#summaryThresholdWrap').hide(); } - // 활성 API 정보 표시 - var activeApis = interfaceList.filter(function(item) { - return item.useYn === '1' || item.useYn === undefined; - }); - $('#summaryActiveApi').html(activeApis.length + '개'); - if (activeApis.length > 0) { - var apiIds = activeApis.map(function(item) { return item.interfaceId; }); - var displayText = apiIds.length <= 3 ? apiIds.join(', ') : apiIds.slice(0, 3).join(', ') + ' 외 ' + (apiIds.length - 3) + '개'; - $('#summaryActiveApiList').text(displayText); - } else { - $('#summaryActiveApiList').text(''); - } - $('#bucketSummary').show(); } else { $('#bucketSummary').hide(); From 1aa40f2c61cddfaede84f8a05be4b6593b70ef91 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 15:39:05 +0900 Subject: [PATCH 27/45] =?UTF-8?q?UMS=EA=B4=80=EB=A0=A8=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apistatus/ApiStatusDetectionService.java | 41 +++++++++++++++++++ .../djb/apistatus/ApiStatusRepository.java | 7 ++-- .../ext/djb/apistatus/ApiStatusService.java | 5 +-- .../eai/rms/ext/djb/util/UmsManager.java | 5 ++- .../webhook/config/WebhookAsyncConfig.java | 26 ++++++++++++ 5 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java new file mode 100644 index 0000000..f8687ef --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java @@ -0,0 +1,41 @@ +package com.eactive.eai.rms.ext.djb.apistatus; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +public class ApiStatusDetectionService { + + private static final Logger log = LoggerFactory.getLogger(ApiStatusDetectionService.class); + + /** + * 이벤트 감지 + * @param event "CONTROL_START" : 점검시작 + "CONTROL_END" : 점검종료 + "ERROR_START" : 장애시작 + "ERROR_END" : 장애종료 + "DELAY_START" : 지연시작 + "DELAY_END" : 지연종료 + * @param apiIds API IDs + */ + public void detect(String event, List apiIds) { + log.debug("이벤트 감지: {} {}", event, apiIds); + } + + // API FSM 내 아직 장애로 남아있는 API 목록 + public void remainDownApiIds() { + + } + + + // 정상 동작 - detect()에서 일괄 처리 (복구 = 점검종료, 장애종료, 지연종료) +// public void recovered(String event, String[] apiIds) { +// +// } + +} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java index ec80426..617077b 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java @@ -39,9 +39,10 @@ public interface ApiStatusRepository extends BaseRepository { + " FROM (" + " SELECT A.EAISVCNAME" + " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE" - + " , NVL(( SELECT 'Y' FROM EMSAPP.PTL_NOTICE_API X " - + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID " - + " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것 + + " , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X " + + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)" + //+ " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + " AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN " + " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'" + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java index 885de37..9d7f215 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -16,7 +16,6 @@ import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; import com.eactive.eai.rms.ext.djb.util.UmsManager; -import com.eactive.ext.djb.apistatus.DjbIncidentDetectionService; @Service @@ -32,7 +31,7 @@ public class ApiStatusService { private UmsManager ums; @Autowired - private DjbIncidentDetectionService djbService; + private ApiStatusDetectionService apiStatusDectionService; public void updateApiStatus(HashMap param) { @@ -83,7 +82,7 @@ public class ApiStatusService { ums.sendWebhook(event, apiIds); //개발자포탈 API상태모니터링 화면을 위한 처리 - djbService.detect(event, apiIds); + apiStatusDectionService.detect(event, apiIds); } } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java index a33ccbf..64d5111 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java @@ -5,13 +5,13 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.apim.portal.template.service.MessageHandlerService; import com.eactive.apim.portal.template.service.MessageRecipient; import com.eactive.apim.portal.user.entity.UserInfo; -import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; import com.eactive.eai.rms.ext.djb.webhook.service.WebhookService; @@ -75,10 +75,11 @@ public class UmsManager { } /** - * event를 구독중인 제휴사에게 웹훅 발송 + * event를 구독중인 제휴사에게 웹훅 발송 (비동기) * @param event * @param apiIds */ + @Async("webhookExecutor") public void sendWebhook(String event, List apiIds) { List list = webhookService.findSendList(event, apiIds); for (WebhookSendRequest req : list) { diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java new file mode 100644 index 0000000..ec7fc83 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java @@ -0,0 +1,26 @@ +package com.eactive.eai.rms.ext.djb.webhook.config; + +import java.util.concurrent.Executor; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +@Configuration +@EnableAsync +public class WebhookAsyncConfig { + + @Bean(name = "webhookExecutor") + public Executor webhookExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(2); + executor.setMaxPoolSize(10); + executor.setQueueCapacity(100); + executor.setThreadNamePrefix("webhook-"); + executor.setWaitForTasksToCompleteOnShutdown(true); + executor.setAwaitTerminationSeconds(30); + executor.initialize(); + return executor; + } +} From a6e7d1adb3bce816c06a2fad7fe8432bf40cd8e8 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 11 Jun 2026 11:38:38 +0900 Subject: [PATCH 28/45] =?UTF-8?q?=EC=95=84=EC=9B=83=EB=B0=94=EC=9A=B4?= =?UTF-8?q?=EB=93=9C=20URL=20restoption=20type=20=ED=8C=90=EB=8B=A8?= =?UTF-8?q?=EC=8B=9C=20{}=EC=95=88=EC=97=90=20.=EB=8F=84=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eai/rms/onl/transaction/apim/ApiInterfaceService.java | 2 +- .../onl/transaction/simpleinterface/SimpleInterfaceService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 0c7b620..decd49c 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 @@ -565,7 +565,7 @@ public class ApiInterfaceService extends OnlBaseService { restOption.setMethod(outboundHttpMethod); restOption.setExtraPath(outboundRestPath); - String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; + String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z.]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; restOption.setType(pathType); if (StringUtils.isNotBlank(contentType)) { diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java index 3e415a1..14ec212 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java @@ -400,7 +400,7 @@ public class SimpleInterfaceService extends OnlBaseService { jsonObject.put("method", outboundHttpMethod); jsonObject.put("extraPath", outboundRestPath); - String pathType = outboundRestPath.matches(".*\\{[a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; + String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z.]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; jsonObject.put("type", pathType); restOption = jsonObject.toString(); return restOption; From 164ab92919feaeb49ee02d4b21dcb6fce3cf12d5 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 12 Jun 2026 09:27:08 +0900 Subject: [PATCH 29/45] =?UTF-8?q?BAP=20=EC=84=9C=EB=B2=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=EC=97=90=20row?= =?UTF-8?q?num=3D1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/eactive/eai/rms/bap/manage/common/ServerMan-oracle.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/ServerMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/ServerMan-oracle.xml index 3bf0f0c..eed9c57 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/ServerMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/ServerMan-oracle.xml @@ -23,7 +23,6 @@ FLOVRSEVRNAME AS "FAILOVERSVRNM", HOSTNAME AS "HOSTNAME" FROM $schemaId$.TSEAIBP03 - WHERE ROWNUM = 1 \ No newline at end of file From ac0d081a9ace635080eefed07c839fa7d7bead66 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 12 Jun 2026 10:18:39 +0900 Subject: [PATCH 30/45] =?UTF-8?q?=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=95=84=EC=9B=83=EB=B0=94=EC=9A=B4=EB=93=9C=20pat?= =?UTF-8?q?h=EC=97=90=20{}=20=ED=8F=AC=ED=95=A8=EC=8B=9C=20variableUrlRequ?= =?UTF-8?q?est=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eai/rms/onl/transaction/apim/ApiInterfaceService.java | 2 +- .../onl/transaction/simpleinterface/SimpleInterfaceService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 decd49c..89b6bbb 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 @@ -565,7 +565,7 @@ public class ApiInterfaceService extends OnlBaseService { restOption.setMethod(outboundHttpMethod); restOption.setExtraPath(outboundRestPath); - String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z.]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; + String pathType = outboundRestPath.matches(".*\\{.+\\}.*") ? "variableUrlRequest" : "simpleRequest"; restOption.setType(pathType); if (StringUtils.isNotBlank(contentType)) { diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java index 14ec212..ff70543 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/simpleinterface/SimpleInterfaceService.java @@ -400,7 +400,7 @@ public class SimpleInterfaceService extends OnlBaseService { jsonObject.put("method", outboundHttpMethod); jsonObject.put("extraPath", outboundRestPath); - String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z.]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; + String pathType = outboundRestPath.matches(".*\\{.+\\}.*") ? "variableUrlRequest" : "simpleRequest"; jsonObject.put("type", pathType); restOption = jsonObject.toString(); return restOption; From e21014f992db634ec6b4afb73d752dfb1f099fd8 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Jun 2026 19:39:01 +0900 Subject: [PATCH 31/45] =?UTF-8?q?-=20gitea=20actions=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=B6=94=EA=B0=80=20-=207?= =?UTF-8?q?=EA=B0=9C=20sibling=20clone=20=ED=9B=84=20monitoring.war=20?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20-=20systemd=20user=20unit=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20tomcat=20=EB=9D=BC=EC=9D=B4=ED=94=84=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=ED=81=B4=20=EB=B6=84=EB=A6=AC=20-=20/monitoring/login?= =?UTF-8?q?.do=20=EB=A1=9C=20readiness=20probe=20(120s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitea/workflows/eapim-admin-ci.yml | 172 ++++++++++++++++++++++++++++ deploy/systemd/eapim-admin.service | 51 +++++++++ 2 files changed, 223 insertions(+) create mode 100644 .gitea/workflows/eapim-admin-ci.yml create mode 100644 deploy/systemd/eapim-admin.service diff --git a/.gitea/workflows/eapim-admin-ci.yml b/.gitea/workflows/eapim-admin-ci.yml new file mode 100644 index 0000000..1b4d53d --- /dev/null +++ b/.gitea/workflows/eapim-admin-ci.yml @@ -0,0 +1,172 @@ +name: eapim-admin CI + +on: + push: + branches: + - master + - develop + - stage + - feats/ci-test + +jobs: + build: + runs-on: [self-hosted, linux, eapim-admin] + env: + JAVA_HOME: /apps/opts/jdk8 + JAVA_HOME_TOMCAT: /apps/opts/jdk17 + CATALINA_BASE: /prod/eapim/adminportal + CATALINA_HOME: /prod/eapim/apache-tomcat-9.0.116 + CATALINA_PID: /prod/eapim/adminportal/temp/catalina.pid + DEPLOY_HTTP_PORT: "30120" + defaults: + run: + working-directory: eapim-admin + + steps: + - name: Checkout eapim-admin (trigger SHA) + uses: http://172.30.1.50:3000/actions/checkout@v4 + with: + path: eapim-admin + + - name: Checkout sibling modules (master) + working-directory: ${{ github.workspace }} + run: | + set -e + mkdir -p eapim-online + + # eapim-online/* — 5 modules referenced from settings.gradle + for REPO in elink-online-core elink-online-core-jpa elink-online-transformer elink-online-common elink-online-emsclient; do + rm -rf "eapim-online/$REPO" + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \ + "eapim-online/$REPO" + done + + # standalone siblings + for REPO in elink-portal-common eapim-admin-djb; do + rm -rf "$REPO" + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \ + "$REPO" + done + + - name: Verify toolchain + run: | + java -version + gradle --version + + - name: Gradle build (no tests) + run: gradle clean build -x test --no-daemon + + - name: Upload WAR artifact + uses: http://172.30.1.50:3000/actions/upload-artifact@v3 + with: + name: eapim-admin-war-${{ github.sha }} + path: eapim-admin/build/libs/eapim-admin.war + if-no-files-found: error + + - name: Publish WAR to Gitea Generic Package + working-directory: ${{ github.workspace }} + env: + GITEA_URL: http://172.30.1.50:3000 + PKG_OWNER: djb-eapim + PKG_NAME: eapim-admin + run: | + SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7) + VERSION="$(TZ=Asia/Seoul date +%Y-%m-%d-%H%M)-${SHORT_SHA}" + BASE="$GITEA_URL/api/packages/$PKG_OWNER/generic/$PKG_NAME/$VERSION" + + echo "package version: $VERSION" + echo "endpoint base : $BASE" + + WAR=eapim-admin.war + SRC="eapim-admin/build/libs/$WAR" + if [ ! -f "$SRC" ]; then + echo "::error::missing artifact: $SRC" + exit 1 + fi + HTTP=$(curl -sS -o "/tmp/pkg-upload-$WAR.log" -w '%{http_code}' \ + --user "oauth2:${{ secrets.CI_TOKEN }}" \ + --upload-file "$SRC" \ + "$BASE/$WAR") + if [ "$HTTP" != "201" ] && [ "$HTTP" != "200" ]; then + echo "::error::upload failed for $WAR (HTTP $HTTP)" + cat "/tmp/pkg-upload-$WAR.log" || true + exit 1 + fi + echo " uploaded: $WAR (HTTP $HTTP)" + echo "published: $GITEA_URL/$PKG_OWNER/-/packages/generic/$PKG_NAME/$VERSION" + + - name: Sync systemd user unit + working-directory: ${{ github.workspace }} + run: | + install -D -m 644 eapim-admin/deploy/systemd/eapim-admin.service \ + "$HOME/.config/systemd/user/eapim-admin.service" + systemctl --user daemon-reload + systemctl --user enable eapim-admin 2>/dev/null || true + + - name: Stop tomcat (pre-clean) + working-directory: ${{ github.workspace }} + run: | + # 1) systemd 관리 인스턴스 정지 (이번 워크플로가 띄운 것) + systemctl --user stop eapim-admin 2>/dev/null || true + + # 2) systemd 외부 detached 인스턴스 정리 + if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + for i in $(seq 1 30); do + [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break + sleep 1 + done + fi + rm -f "$CATALINA_PID" + + - name: Deploy war as /monitoring + working-directory: ${{ github.workspace }} + run: | + DEPLOY_DIR="$CATALINA_BASE/webapps" + rm -rf "$DEPLOY_DIR/monitoring" "$DEPLOY_DIR/monitoring.war" + cp eapim-admin/build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war" + ls -la "$DEPLOY_DIR" + + - name: Start tomcat and readiness probe (timeout 120s) + working-directory: ${{ github.workspace }} + run: | + LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log" + BEFORE=0 + [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG") + + # systemd 가 Tomcat 을 새 cgroup 으로 띄움 — runner step 종료와 무관하게 살아남음 + systemctl --user start eapim-admin + + DEADLINE=$(($(date +%s) + 120)) + STATUS=000 + while [ $(date +%s) -lt $DEADLINE ]; do + STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \ + "http://localhost:$DEPLOY_HTTP_PORT/monitoring/login.do" 2>/dev/null || echo "000") + case "$STATUS" in + 200|302|401) + echo "Readiness OK (/monitoring/login.do HTTP $STATUS)" + break + ;; + esac + + if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then + echo "::error::Startup error detected in log" + tail -c +$((BEFORE+1)) "$LOG" | tail -80 + exit 1 + fi + sleep 2 + done + + case "$STATUS" in + 200|302|401) ;; + *) + echo "::error::Readiness probe failed within 120s (last HTTP status: $STATUS)" + [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100 + exit 1 + ;; + esac + + echo "--- key boot log lines ---" + tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true diff --git a/deploy/systemd/eapim-admin.service b/deploy/systemd/eapim-admin.service new file mode 100644 index 0000000..b6da903 --- /dev/null +++ b/deploy/systemd/eapim-admin.service @@ -0,0 +1,51 @@ +# DJBank EAPIM Admin — user-scope systemd unit +# +# Install (one-time, on the host as `djb`): +# sudo loginctl enable-linger djb # allow services to outlive ssh logout +# mkdir -p ~/.config/systemd/user +# # workflow copies this file in on each deploy; for first boot you can also do: +# # cp /prod/.../deploy/systemd/eapim-admin.service ~/.config/systemd/user/ +# systemctl --user daemon-reload +# systemctl --user enable eapim-admin +# systemctl --user start eapim-admin +# +# Why this exists: +# - `catalina.sh start` + `nohup &` does NOT escape the Gitea Actions runner +# process group. When the workflow step finishes, the runner sends SIGTERM +# to the process tree and Tomcat dies seconds after boot. +# - Running Tomcat as a systemd user service detaches lifecycle from the +# runner entirely. The workflow just calls `systemctl --user restart` and +# systemd owns the process. + +[Unit] +Description=DJBank EAPIM Admin (Tomcat 9) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple + +Environment=JAVA_HOME=/apps/opts/jdk17 +Environment=CATALINA_BASE=/prod/eapim/adminportal +Environment=CATALINA_HOME=/prod/eapim/apache-tomcat-9.0.116 +Environment=CATALINA_PID=/prod/eapim/adminportal/temp/catalina.pid + +# `catalina.sh run` keeps Tomcat in the foreground so systemd can supervise it. +ExecStart=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh run + +# Graceful shutdown via Tomcat's shutdown port, 30s window. +ExecStop=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh stop 30 + +# Tomcat returns 143 on SIGTERM during normal stop — treat as success. +SuccessExitStatus=143 +TimeoutStartSec=180 +TimeoutStopSec=60 + +Restart=on-failure +RestartSec=10 + +# Memory / fd limits — adjust as needed. +LimitNOFILE=65535 + +[Install] +WantedBy=default.target From 4d5572f8805a7dda08cd0c84eb6dead42072ffdb Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Jun 2026 19:43:33 +0900 Subject: [PATCH 32/45] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-udpip.xml | 2 +- src/main/resources/hotswap-agent.properties | 13 ++++++++++--- src/main/resources/logback-dev.xml | 2 +- src/main/resources/logback-local.xml | 2 +- src/main/resources/logback.xml | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/WebContent/WEB-INF/applicationContext-udpip.xml b/WebContent/WEB-INF/applicationContext-udpip.xml index b473faf..58279fc 100644 --- a/WebContent/WEB-INF/applicationContext-udpip.xml +++ b/WebContent/WEB-INF/applicationContext-udpip.xml @@ -115,7 +115,7 @@ - + diff --git a/src/main/resources/hotswap-agent.properties b/src/main/resources/hotswap-agent.properties index cc2d7ce..fa14761 100644 --- a/src/main/resources/hotswap-agent.properties +++ b/src/main/resources/hotswap-agent.properties @@ -5,13 +5,20 @@ # \uC790\uB3D9 \uD56B\uC2A4\uC651 \uD65C\uC131\uD654 autoHotswap=true -# \uB85C\uAE45 \uB808\uBCA8 (TRACE, DEBUG, INFO, WARNING, ERROR) -LOGGER.level=INFO +# \uB85C\uADF8 \uB808\uBCA8 (TRACE, DEBUG, INFO, WARNING, ERROR) +LOGGER=INFO + +# \uB85C\uADF8 \uD30C\uC77C \uACBD\uB85C (\uC9C0\uC815 \uC2DC \uCF58\uC194 \uB300\uC2E0 \uD30C\uC77C\uB85C \uCD9C\uB825) +LOGFILE=/Users/rinjae/eactive/djb-eapim/djb-eapim/eapim-admin/logs/hotswap-agent.log +LOGFILE.append=true + +# \uC2DC\uAC01 \uD3EC\uB9F7 +LOGGER_DATETIME_FORMAT=yyyy-MM-dd HH:mm:ss.SSS # ============================================================ # \uBA85\uC2DC\uC801 \uD50C\uB7EC\uADF8\uC778 \uBE44\uD65C\uC131\uD654 (\uC27C\uD45C \uAD6C\uBD84) # ============================================================ -disabledPlugins=org.hotswap.agent.plugin.ibatis.IBatisPlugin,org.hotswap.agent.plugin.mybatis.MyBatisPlugin +disabledPlugins=IBatis,MyBatis # ============================================================ # Core Plugin \uD65C\uC131\uD654 diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index 5e5b9c3..aace92d 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/logback-local.xml b/src/main/resources/logback-local.xml index 63b833d..00b1dd8 100644 --- a/src/main/resources/logback-local.xml +++ b/src/main/resources/logback-local.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 99ddf16..7c40395 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -4,7 +4,7 @@ - + From d3e05256b7f1e587b2f4fe01027a2e7a68b8330a Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Jun 2026 20:28:17 +0900 Subject: [PATCH 33/45] =?UTF-8?q?-=20package=20upload=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20-=20basic=20oauth2=20user=20=E2=86=92=20Authorization=20toke?= =?UTF-8?q?n=20=ED=97=A4=EB=8D=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/eapim-admin-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/eapim-admin-ci.yml b/.gitea/workflows/eapim-admin-ci.yml index 1b4d53d..547ab44 100644 --- a/.gitea/workflows/eapim-admin-ci.yml +++ b/.gitea/workflows/eapim-admin-ci.yml @@ -86,7 +86,7 @@ jobs: exit 1 fi HTTP=$(curl -sS -o "/tmp/pkg-upload-$WAR.log" -w '%{http_code}' \ - --user "oauth2:${{ secrets.CI_TOKEN }}" \ + -H "Authorization: token ${{ secrets.CI_TOKEN }}" \ --upload-file "$SRC" \ "$BASE/$WAR") if [ "$HTTP" != "201" ] && [ "$HTTP" != "200" ]; then From a0743465abcb5b9e6557741193b7fa7f89ab0f52 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Jun 2026 20:51:36 +0900 Subject: [PATCH 34/45] =?UTF-8?q?-=20generic=20package=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EB=8B=A8=EA=B3=84=20=EC=A0=9C=EA=B1=B0=20?= =?UTF-8?q?-=20=EC=9D=B8=EC=A6=9D=20=EC=A0=95=EB=A6=AC=20=EC=A0=84?= =?UTF-8?q?=EA=B9=8C=EC=A7=80=20artifact=EB=A7=8C=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/eapim-admin-ci.yml | 32 ----------------------------- 1 file changed, 32 deletions(-) diff --git a/.gitea/workflows/eapim-admin-ci.yml b/.gitea/workflows/eapim-admin-ci.yml index 547ab44..c0d7b08 100644 --- a/.gitea/workflows/eapim-admin-ci.yml +++ b/.gitea/workflows/eapim-admin-ci.yml @@ -65,38 +65,6 @@ jobs: path: eapim-admin/build/libs/eapim-admin.war if-no-files-found: error - - name: Publish WAR to Gitea Generic Package - working-directory: ${{ github.workspace }} - env: - GITEA_URL: http://172.30.1.50:3000 - PKG_OWNER: djb-eapim - PKG_NAME: eapim-admin - run: | - SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7) - VERSION="$(TZ=Asia/Seoul date +%Y-%m-%d-%H%M)-${SHORT_SHA}" - BASE="$GITEA_URL/api/packages/$PKG_OWNER/generic/$PKG_NAME/$VERSION" - - echo "package version: $VERSION" - echo "endpoint base : $BASE" - - WAR=eapim-admin.war - SRC="eapim-admin/build/libs/$WAR" - if [ ! -f "$SRC" ]; then - echo "::error::missing artifact: $SRC" - exit 1 - fi - HTTP=$(curl -sS -o "/tmp/pkg-upload-$WAR.log" -w '%{http_code}' \ - -H "Authorization: token ${{ secrets.CI_TOKEN }}" \ - --upload-file "$SRC" \ - "$BASE/$WAR") - if [ "$HTTP" != "201" ] && [ "$HTTP" != "200" ]; then - echo "::error::upload failed for $WAR (HTTP $HTTP)" - cat "/tmp/pkg-upload-$WAR.log" || true - exit 1 - fi - echo " uploaded: $WAR (HTTP $HTTP)" - echo "published: $GITEA_URL/$PKG_OWNER/-/packages/generic/$PKG_NAME/$VERSION" - - name: Sync systemd user unit working-directory: ${{ github.workspace }} run: | From 54291e5cbb7a0be01ffb7fc8a2aa84be98397ea2 Mon Sep 17 00:00:00 2001 From: eastargh Date: Mon, 15 Jun 2026 13:16:23 +0900 Subject: [PATCH 35/45] =?UTF-8?q?ums=20=EA=B4=80=EB=A0=A8=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonitoringPropertyManService.java | 1 + .../ext/djb/apistatus/ApiStatusService.java | 2 +- .../ext/djb/inflow/InflowTokenService.java | 2 +- .../rms/ext/djb/{util => ums}/UmsManager.java | 2 +- .../rms/ext/djb/ums/service/UmsService.java | 390 ++++++++++++++++++ .../eai/rms/ext/djb/ums/vo/EmailDataVO.java | 67 +++ .../eai/rms/ext/djb/ums/vo/SmsDataVO.java | 67 +++ .../eai/rms/ext/djb/ums/vo/StdHeadVO.java | 61 +++ .../eai/rms/ext/djb/ums/vo/SwingCommonVO.java | 19 + .../eai/rms/ext/djb/ums/vo/SwingDataVO.java | 21 + .../ext/djb/ums/vo/SwingReceiverDataVO.java | 22 + .../service/ums/UmsDispatchService.java | 28 +- 12 files changed, 656 insertions(+), 26 deletions(-) rename src/main/java/com/eactive/eai/rms/ext/djb/{util => ums}/UmsManager.java (98%) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/EmailDataVO.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/StdHeadVO.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingCommonVO.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingDataVO.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingReceiverDataVO.java diff --git a/src/main/java/com/eactive/eai/rms/common/property/MonitoringPropertyManService.java b/src/main/java/com/eactive/eai/rms/common/property/MonitoringPropertyManService.java index 1bf3869..3cde4d8 100644 --- a/src/main/java/com/eactive/eai/rms/common/property/MonitoringPropertyManService.java +++ b/src/main/java/com/eactive/eai/rms/common/property/MonitoringPropertyManService.java @@ -35,6 +35,7 @@ public class MonitoringPropertyManService extends BaseService { public MonitoringPropertyGroupUI selectDetail(String prptyGroupName) { MonitoringPropertyGroup propertyGroup = propertyGroupService.getById(prptyGroupName); + propertyGroup.getMonitoringProperties().sort(Comparator.comparing(p -> p.getId().getPrptyName())); return propertyGroupMapper.toVo(propertyGroup); } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java index 9d7f215..55615ad 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -15,7 +15,7 @@ import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; -import com.eactive.eai.rms.ext.djb.util.UmsManager; +import com.eactive.eai.rms.ext.djb.ums.UmsManager; @Service diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java index 4859ee4..5b00c96 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; -import com.eactive.eai.rms.ext.djb.util.UmsManager; +import com.eactive.eai.rms.ext.djb.ums.UmsManager; @Service diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/UmsManager.java similarity index 98% rename from src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java rename to src/main/java/com/eactive/eai/rms/ext/djb/ums/UmsManager.java index 64d5111..67c238e 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/UmsManager.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.ext.djb.util; +package com.eactive.eai.rms.ext.djb.ums; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java new file mode 100644 index 0000000..b932514 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java @@ -0,0 +1,390 @@ +package com.eactive.eai.rms.ext.djb.ums.service; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.Charset; +import java.security.SecureRandom; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.eactive.apim.portal.template.entity.MessageRequest; +import com.eactive.eai.common.util.SystemUtil; +import com.eactive.eai.rms.ext.djb.ums.vo.EmailDataVO; +import com.eactive.eai.rms.ext.djb.ums.vo.SmsDataVO; +import com.eactive.eai.rms.ext.djb.ums.vo.StdHeadVO; +import com.eactive.eai.rms.ext.djb.ums.vo.SwingCommonVO; +import com.eactive.eai.rms.ext.djb.ums.vo.SwingDataVO; +import com.eactive.eai.rms.ext.djb.ums.vo.SwingReceiverDataVO; +import com.eactive.ext.kjb.common.KjbProperty; +import com.eactive.ext.kjb.common.KjbPropertyHolder; +import com.google.gson.Gson; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class UmsService { + //public final static int[] ALLOW_CHANNELS = { MessageCode.Channels.SWING.getValue() }; + + private static final Gson gson = new Gson(); + + private static volatile UmsService instance; + + private static final String SYS_DVCD = "OPA"; + + private UmsService() { + // 싱글톤 + } + + public static UmsService getInstance() { + if (instance == null) { + synchronized (UmsService.class) { + if (instance == null) { + instance = new UmsService(); + } + } + } + return instance; + } + + private KjbProperty getProperty() { + return KjbPropertyHolder.get(); + } + +// public static boolean isAllowChannel(MessageRequest message) { +// for (int channel : ALLOW_CHANNELS) { +// if ((message.getMessageCode().getChannels() & channel) == channel) { +// return true; +// } +// } +// return false; +// } + + + public boolean send(MessageRequest messageRequest) throws Exception { + if (messageRequest == null) { + throw new IllegalArgumentException("messageRequest is null"); + } + +// if (MessageCode.Channels.SWING.getValue() != (messageRequest.getMessageCode().getChannels() & MessageCode.Channels.SWING.getValue())) { +// log.error("지원하지 않는 발송 채널 - {}", messageRequest.getMessageCode().toString()); +// throw new IllegalArgumentException("지원하지 않는 발송 채널 - " + messageRequest.getMessageCode().toString()); +// } + + this.httpConnection(messageRequest); + + return true; + } + + + private void httpConnection(MessageRequest messageRequest) throws Exception { + HttpURLConnection conn = null; + BufferedReader br = null; + + try { + URL url = new URL(this.getHostUrl(messageRequest)); + int timeoutValue = 5 * 1000; // 타임아웃 설정을 위한 값 (단위: ms) + // Charset charset = Charset.forName("UTF-8"); + Charset charset = Charset.forName("MS949"); + + StringBuffer sb = null; + String bodyData = this.makeBodyData(messageRequest); + + String responseData = ""; + String method = bodyData.isEmpty() ? "GET" : "POST"; + conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod(method); // 전송방식 + // conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); + conn.setRequestProperty("Content-Type", "application/json; charset=MS949"); + conn.setConnectTimeout(timeoutValue); // 연결 타임아웃 설정(5초) + conn.setReadTimeout(timeoutValue); // 읽기 타임아웃 설정(5초) + conn.setDoOutput(true); + + // POst 방식인 경우에만 + if (method.equals("POST")) { + OutputStream os = conn.getOutputStream(); + byte requestData[] = bodyData.getBytes(charset); + os.write(requestData); + os.close(); + } + + if (log.isDebugEnabled()) { + log.debug("getContentType();" + conn.getContentType()); // 응답 콘텐츠 유형 구하기 + log.debug("getResponsecode();" + conn.getResponseCode()); // 응답 코드 구하기 + log.debug("getResponseMessage():" + conn.getResponseMessage()); // 응답 메세지 구하기 + } + + // http 요청 후 응답 받은 데이타를 버퍼에 쌓는다 + if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) { + br = new BufferedReader(new InputStreamReader(conn.getInputStream(), charset)); + } else { + br = new BufferedReader(new InputStreamReader(conn.getErrorStream(), charset)); + } + + String inputLine; + sb = new StringBuffer(); + while ((inputLine = br.readLine()) != null) { + sb.append(inputLine); + } + + responseData = sb.toString(); + } finally { + // http 요청 및 응답 완료 후 BufferedReader를 닫는다 + if (br != null) { + br.close(); + } + if (conn != null) { + conn.disconnect(); + } + } + } + + + private String getHostUrl(MessageRequest messageRequest) { + KjbProperty prop = getProperty(); + String hostUrl = ""; + if ("SWING".equals(messageRequest.getMessageType()) ) { + hostUrl = prop.getUmsSwingUrl(); + } else if ("SMS".equals(messageRequest.getMessageType()) || "KAKAO".equals(messageRequest.getMessageType())) { + hostUrl = prop.getUmsSmsUrl(); + } else if ("EMAIL".equals(messageRequest.getMessageType())) { + hostUrl = prop.getUmsEmailUrl(); + } + return hostUrl; + } + + private String makeBodyData(MessageRequest messageRequest) { + + KjbProperty prop = getProperty(); + + // 리턴값 + String rtnVal = ""; + + // guID 및 날짜 시간 정보 + String jsonData[] = this.makeStdGuidInfo(); + + // 표준 헤더 + StdHeadVO stdHeadVO = new StdHeadVO(); + stdHeadVO.setNxgn_stnd_idfr("JERA"); + stdHeadVO.setGuid(jsonData[2]); + stdHeadVO.setGuid_prgs_no("1"); + stdHeadVO.setStnd_mesg_ver("R10"); + stdHeadVO.setOrtr_guid(jsonData[2]); + stdHeadVO.setSect_ecrpt_yn("N"); + stdHeadVO.setFrst_trnm_ipad(prop.getUmsWasIpAddress()); + stdHeadVO.setFrst_trnm_ipv4_addr(prop.getUmsWasIpAddress()); + stdHeadVO.setFrst_trnm_mac(prop.getUmsWasMacAddress()); + stdHeadVO.setFrst_mesg_dman_dt(jsonData[0]); + stdHeadVO.setFrst_mesg_dman_time(jsonData[1]); + stdHeadVO.setFrst_trnm_sys_dvcd(SYS_DVCD); + stdHeadVO.setTrnm_sys_dvcd(SYS_DVCD); + stdHeadVO.setDman_rspn_dvcd("S"); // 요청응답구분코드 S:요청 R:응답 + stdHeadVO.setSys_env_dvcd(SystemUtil.getSysOperEvirnDstcd()); // D:개발 T:테스트 P:운영 + stdHeadVO.setTx_tycd("O"); // O:온라인 B:배치 + stdHeadVO.setSynz_dvcd("S"); // S:동기 A:비동기 + stdHeadVO.setChnl_tycd(""); // 채널유형코드 TODO: 값 채울것!! + stdHeadVO.setHmab_dvcd("1"); // 내외구분코드 1:내부 2:외부(타발) + + if ("SWING".equals(messageRequest.getMessageType()) ) { + // 표준 헤더 + stdHeadVO.setTx_id(prop.getUmsSwingTxId()); // 거래ID + stdHeadVO.setIf_id(prop.getUmsSwingIfId()); // 인터페이스ID + + // 스윙챗 알림 공용 + SwingCommonVO swiComVO = new SwingCommonVO(); + swiComVO.setClientld(prop.getUmsSwingClientId()); + swiComVO.setClientSecret(prop.getUmsSwingClientSecret()); + swiComVO.setCompanyCode("CB"); + swiComVO.setRequestUniqueKey(this.genrateRandomStringNumber26()); + + // 스윙챗 알림 데이터 + SwingDataVO swiDataVO = new SwingDataVO(); + swiDataVO.setNotiCode("CNO_FEP_HMP_0002"); + swiDataVO.setNotiTitle("알림"); + swiDataVO.setNotiContent(messageRequest.getMessage()); + + // 스윙챗 알림 데이터 + List swiReDataVOList = new ArrayList(); + SwingReceiverDataVO receiver = new SwingReceiverDataVO(); + receiver.setCode(messageRequest.getMessengerId()); + swiReDataVOList.add(receiver); + + swiDataVO.setReceiverInfo(swiReDataVOList); + + String header = gson.toJson(stdHeadVO); + String common = gson.toJson(swiComVO); + String data = gson.toJson(swiDataVO); + + // 헤더 + 데이터 + rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n" + + " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n" + + " \"common\":\r\n" + common + ",\r\n" + " \"data\":" + data + + " }\r\n" + " }\r\n" + " ]\r\n" + "}"; + + } else if ("SMS".equals(messageRequest.getMessageType()) + || "KAKAO".equals(messageRequest.getMessageType())) { + // 표준 헤더 + stdHeadVO.setTx_id(prop.getUmsSmsTxId()); // 거래ID + stdHeadVO.setIf_id(prop.getUmsSmsIfId()); // 인터페이스ID + + // Sms 데이터 + SmsDataVO dataVO = new SmsDataVO(); + dataVO.setSnd_dman_dt(jsonData[0]); + dataVO.setSnd_dman_id(""); + dataVO.setSnd_dvcd("EAI"); + dataVO.setMsg_titl(""); + dataVO.setMsg_ctnt(messageRequest.getMessage()); + dataVO.setRecvr_no(messageRequest.getPhone()); + dataVO.setSndn_no("15880079"); //발신번호 + dataVO.setSnd_empno("999999"); //요청자 + dataVO.setSnd_emp_dprm_cd("157"); //요청부서코드 + if ("SMS".equals(messageRequest.getMessageType())) { + dataVO.setLtrs_snd_tycd("1"); // 1:SMS 2:LMS/MMS + dataVO.setMsg_snd_tycd("0000"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, .... + } else if ("KAKAO".equals(messageRequest.getMessageType())) { + dataVO.setLtrs_snd_tycd("2"); // 1:SMS 2:LMS/MMS + dataVO.setMsg_snd_tycd("1008"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, .... + dataVO.setAlmtk_snd_prfl_key(""); // 플러스친구아이디 + dataVO.setAlmtk_tmplt_cd(""); // 템플릿코드 + dataVO.setAlmtk_err_ltrs_snd_yn("Y"); // 오류자문자발송여부 + dataVO.setAlmtk_btn_trnm_tycd("2"); // 카카오버튼전송방식 1-format string 2-JSON 3-XML + } + dataVO.setSms_trnm_bzwk_dvcd(""); //업무구분코드 + dataVO.setSms_bzwk_dcls_dvcd(""); //업무세분코드 + dataVO.setSms_sys_dvcd("83"); //시스템코드 + dataVO.setTx_dt(jsonData[0]); //거래일자 + dataVO.setTx_tktm(jsonData[1].substring(0,6)); //거래시간 + + List dataList = new ArrayList(); + dataList.add(dataVO); + + String header = gson.toJson(stdHeadVO); + String data = gson.toJson(dataList); + + // 헤더 + 데이터 + rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n" + + " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n" + + " \"ums_if_data_ncnt\":1, \r\n" + + " \"ums_if_data\":" + data + + " }\r\n" + " }\r\n" + " ]\r\n" + "}"; + + } else if ("EMAIL".equals(messageRequest.getMessageType())) { + // 표준 헤더 + stdHeadVO.setTx_id(prop.getUmsEmailTxId()); // 거래ID + stdHeadVO.setIf_id(prop.getUmsEmailIfId()); // 인터페이스ID + + // 이메일 데이터 + EmailDataVO dataVO = new EmailDataVO(); + dataVO.setUms_evnt_id(""); // UMS이벤트ID(필수) + dataVO.setSnd_dman_dt(jsonData[0]); + dataVO.setSnd_dman_id(""); + dataVO.setSnd_dman_sno("1"); + dataVO.setEmail_titl(messageRequest.getSubject()); // 메일제목 + dataVO.setCstno(""); // 고객번호(필수) + dataVO.setSendr_emaddr(""); // 발신자 이메일 + dataVO.setSendr_nm(""); // 발신자 이름 + dataVO.setSndbk_emaddr(""); // 리턴 이메일 + dataVO.setRecvr_emaddr(messageRequest.getEmail()); // 수신자 이메일(필수) + dataVO.setRecvr_nm(messageRequest.getUsername()); // 수신자명(필수) + dataVO.setTmplt_mpng_info(messageRequest.getMessage()); // 탬플릿매핑정보 + dataVO.setTmplt_mpng_rptt_info(""); // 탬플릿매핑반복정보 + dataVO.setSnd_empno(""); // 발신자ID(필수) + dataVO.setSnd_emp_dprm_cd(""); // 발신자부서코드(필수) + dataVO.setBzwk_cd(""); // 업무구분코드 + dataVO.setSub_bzwk_cd(""); // 업무세부코드 + dataVO.setSys_dvcd(SYS_DVCD); + dataVO.setTx_dt(jsonData[0]); //거래일자 + dataVO.setTx_tktm(jsonData[1].substring(0,6)); //거래시간 + + List dataList = new ArrayList(); + dataList.add(dataVO); + + String header = gson.toJson(stdHeadVO); + String data = gson.toJson(dataList); + + // 헤더 + 데이터 + rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n" + + " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n" + + " \"ums_if_data_ncnt\":1, \r\n" + + " \"ums_if_data\":" + data + + " }\r\n" + " }\r\n" + " ]\r\n" + "}"; + } + + log.debug(rtnVal); + + return rtnVal; + } + + + private String[] makeStdGuidInfo() { + // 리턴값 + String rtnVal[] = new String[3]; + + // 현재시간 + Date currentDate = new Date(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + String formattedDate = sdf.format(currentDate); + + rtnVal[0] = formattedDate.substring(0,8); + rtnVal[1] = formattedDate.substring(8); + + // 랜던값 + String random20 = this.genrateRandomStringNumber20(); + + rtnVal[2] = formattedDate + SYS_DVCD + random20; + + return rtnVal; + } + + + private String genrateRandomStringNumber20() { + String rtnVal= ""; + + StringBuilder buffer= new StringBuilder(10); + + // 랜덤값 + String characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + + // 랜덤객체 생성 + SecureRandom random = new SecureRandom(); + + // 반복문 + for (int i= 0;i< 10;i++) { + // 랜덤수 + int randomIndex = random.nextInt(characters.length()); + + // 생성된 랜덤값 + char randomChar = characters.charAt(randomIndex); + + // 랜덤값 저장 + buffer.append(randomChar); + } + + // 랜덤객체 재생성 + random = new SecureRandom(); + + // 난수 10개 생성 + int random10 = (int) (Math.pow(10, 9) + random.nextDouble() * Math.pow(10, 9)); + + // 문자 숫자 조합(10) + 숫자(10) + rtnVal = buffer.toString() + Integer.toString(random10); + + //리턴 + return rtnVal; + } + + private String genrateRandomStringNumber26() { + StringBuilder buffer = new StringBuilder(26); + String characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ0123456789"; + SecureRandom random = new SecureRandom(); + for (int i = 0; i < 26; i++) { + buffer.append(characters.charAt(random.nextInt(characters.length()))); + } + return buffer.toString(); + } +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/EmailDataVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/EmailDataVO.java new file mode 100644 index 0000000..defecc5 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/EmailDataVO.java @@ -0,0 +1,67 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import lombok.Data; + +@Data +public class EmailDataVO { + + /** UMS이벤트ID */ + private String ums_evnt_id; + + /** 발송요청일자 */ + private String snd_dman_dt; + + /** UUID */ + private String snd_dman_id; + + /** 발송요청순번 */ + private String snd_dman_sno; + + /** 메일제목 */ + private String email_titl; + + /** 고객번호 */ + private String cstno; + + /** 발신자 이메일 */ + private String sendr_emaddr; + + /** 발신자 이름 */ + private String sendr_nm; + + /** 리턴 이메일 */ + private String sndbk_emaddr; + + /** 수신자 이메일 */ + private String recvr_emaddr; + + /** 수신자명 */ + private String recvr_nm; + + /** 탬플릿매핑정보 */ + private String tmplt_mpng_info; + + /** 탬플릿매핑반복정보 */ + private String tmplt_mpng_rptt_info; + + /** 발신자ID */ + private String snd_empno; + + /** 발신자부서코드 */ + private String snd_emp_dprm_cd; + + /** 업무구분코드 */ + private String bzwk_cd; + + /** 업무세부코드 */ + private String sub_bzwk_cd; + + /** 시스템코드 */ + private String sys_dvcd; + + /** 거래일자 */ + private String tx_dt; + + /** 거래시간 */ + private String tx_tktm; +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java new file mode 100644 index 0000000..a2f822c --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java @@ -0,0 +1,67 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import lombok.Data; + +@Data +public class SmsDataVO { + + /** 발송요청일자 */ + private String snd_dman_dt; + + /** UUID */ + private String snd_dman_id; + + /** 발송구분 */ + private String snd_dvcd; + + /** 발송타입 */ + private String ltrs_snd_tycd; + + /** LMS 제목 */ + private String msg_titl; + + /** 메세지 */ + private String msg_ctnt; + + /** 수신자번호 */ + private String recvr_no; + + /** 발신번호 */ + private String sndn_no; + + /** 요청자(직원번호) */ + private String snd_empno; + + /** 요청부서코드 */ + private String snd_emp_dprm_cd; + + /** 알림톡 메시지 종류 */ + private String msg_snd_tycd; + + /** 플러스친구아이디 */ + private String almtk_snd_prfl_key; + + /** 템플릿코드 */ + private String almtk_tmplt_cd; + + /** 오류자문자발송여부 */ + private String almtk_err_ltrs_snd_yn; + + /** 카카오톡전송방식 */ + private String almtk_btn_trnm_tycd; + + /** 업무구분 코드 */ + private String sms_trnm_bzwk_dvcd; + + /** 업무세부코드 */ + private String sms_bzwk_dcls_dvcd; + + /** 시스템코드 */ + private String sms_sys_dvcd; + + /** 거래일자 */ + private String tx_dt; + + /** 거래시간 */ + private String tx_tktm; +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/StdHeadVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/StdHeadVO.java new file mode 100644 index 0000000..0f6675a --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/StdHeadVO.java @@ -0,0 +1,61 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import lombok.Data; + +@Data +public class StdHeadVO { + + private String nxgn_stnd_idfr; + + private String guid; + + private String guid_prgs_no; + + private String stnd_mesg_ver; + + private String ortr_guid; + + private String sect_ecrpt_yn; + + private String frst_trnm_ipad; + + private String frst_trnm_ipv4_addr; + + private String frst_trnm_mac; + + private String frst_mesg_dman_dt; + + private String frst_mesg_dman_time; + + private String frst_trnm_sys_dvcd; + + private String trnm_sys_dvcd; + + private String dman_rspn_dvcd; + + private String sys_env_dvcd; + + private String tx_tycd; + + private String synz_dvcd; + + private String tx_id; + + private String osdch_dvcd; + + private String chnl_tycd; + + private String if_id; + + private String hmab_dvcd; + + private String tx_brcd; + + private String tlrno; + + private String insl_brcd; + + private String blng_brcd; + + private String mgmt_brcd; +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingCommonVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingCommonVO.java new file mode 100644 index 0000000..cbb9b36 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingCommonVO.java @@ -0,0 +1,19 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import lombok.Data; + +@Data +public class SwingCommonVO { + + /** 클라이업트 D */ + private String clientld; + + /** 클라이언트 시크릿 */ + private String clientSecret; + + /** 회사코드 */ + private String companyCode; + + /** 요청고유키 */ + private String requestUniqueKey; +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingDataVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingDataVO.java new file mode 100644 index 0000000..60bd2b6 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingDataVO.java @@ -0,0 +1,21 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import java.util.List; + +import lombok.Data; + +@Data +public class SwingDataVO { + + /** 알림코드 */ + private String notiCode; + + /** 알림제목 */ + private String notiTitle; + + /** 알림내용 */ + private String notiContent; + + /** 수신자정보 */ + private List receiverInfo; +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingReceiverDataVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingReceiverDataVO.java new file mode 100644 index 0000000..2d2a25d --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SwingReceiverDataVO.java @@ -0,0 +1,22 @@ +package com.eactive.eai.rms.ext.djb.ums.vo; + +import lombok.Data; + +@Data +public class SwingReceiverDataVO { + + /** 알림코드 */ + private String name; + + /** 알림제목 */ + private String type; + + /** 알림내용 */ + private String companyCode; + + /** 수신자정보 */ + private String code; + + /** 상품명 */ + private String prdNm; +} 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 d257a68..10a3728 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 @@ -19,9 +19,7 @@ import org.springframework.transaction.support.TransactionTemplate; import com.eactive.apim.portal.template.entity.MessageRequest; import com.eactive.apim.portal.template.repository.MessageRequestRepository; -import com.eactive.ext.djb.ums.DjbMessengerService; -import com.eactive.ext.kjb.ums.KjbEmailSendModule; -import com.eactive.ext.kjb.ums.KjbUmsService; +import com.eactive.eai.rms.ext.djb.ums.service.UmsService; import lombok.extern.slf4j.Slf4j; @@ -43,6 +41,8 @@ public class UmsDispatchService { private EntityManager entityManager; private final MessageRequestRepository messageRequestRepository; + + private final UmsService umsService; @Autowired public UmsDispatchService( @@ -60,6 +60,7 @@ public class UmsDispatchService { new ThreadPoolExecutor.CallerRunsPolicy() ); this.transactionTemplate = new TransactionTemplate(transactionManager); + this.umsService = UmsService.getInstance(); log.debug("UmsDispatchService initialized with thread pool - core: {}, max: {}, queue: {}", CORE_POOL_SIZE, MAX_POOL_SIZE, QUEUE_CAPACITY); } @@ -71,17 +72,6 @@ public class UmsDispatchService { log.info("UmsDispatchService initialized - KjbUmsService and KjbEmailSendModule ready via singleton"); } - private DjbMessengerService getMessengerService() { - return DjbMessengerService.getInstance(); - } - - private KjbUmsService getUmsService() { - return KjbUmsService.getInstance(); - } - - private KjbEmailSendModule getEmailModule() { - return KjbEmailSendModule.getInstance(); - } @SuppressWarnings("unchecked") @Transactional(transactionManager = "transactionManagerForEMS") @@ -138,15 +128,7 @@ public class UmsDispatchService { try { transactionTemplate.execute(status -> { try { - if (DjbMessengerService.isAllowChannel(message)) { - getMessengerService().send(message); - } - if (KjbUmsService.isAllowChannel(message)) { - getUmsService().send(message); - } - if (KjbEmailSendModule.isAllowChannel(message)) { - getEmailModule().sendEmail(message); - } + umsService.send(message); updateMessageStatus(message, "SENT"); return null; } catch (Exception e) { From b5eb63448aea035641bcfaae6d5116dd6fa4ab03 Mon Sep 17 00:00:00 2001 From: eastargh Date: Mon, 15 Jun 2026 17:52:34 +0900 Subject: [PATCH 36/45] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=8D=B0=EC=9D=B4=ED=83=80=ED=83=80?= =?UTF-8?q?=EC=9E=85=20Boolean=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/admin/rule/layoutManDetail.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp b/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp index 61ca8a4..9fb1e00 100644 --- a/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp +++ b/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp @@ -34,7 +34,7 @@ , {id:'LLLVAR',name:'[ISO8583] LLLVAR'}, {id:'LLLLVAR',name:'[ISO8583] LLLLVAR'}, {id:'BINARY',name:'[ISO8583] BINARY'}, {id:'LLBIN',name:'[ISO8583] LLBIN'} , {id:'LLLBIN',name:'[ISO8583] LLLBIN'}]; - const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'}]; + const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'},{id:'Boolean',name:'Boolean'}]; function gridRenderingInit() { $('#effectGrid').jqGrid({ From eee7f46aa7e0ac980e4db314a78bae7b4ef11ee3 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 11:10:36 +0900 Subject: [PATCH 37/45] =?UTF-8?q?ums=20=EA=B4=80=EB=A0=A8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApiStatusChangedEventHandler.java | 43 +++++++ .../event/InflowTokenFailedEventHandler.java | 43 +++++++ .../rms/ext/djb/ums/service/UmsService.java | 108 +++++------------- .../service/ums/UmsDispatchService.java | 8 +- 4 files changed, 123 insertions(+), 79 deletions(-) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/event/ApiStatusChangedEventHandler.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/ums/event/InflowTokenFailedEventHandler.java diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/ApiStatusChangedEventHandler.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/ApiStatusChangedEventHandler.java new file mode 100644 index 0000000..fd059a5 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/ApiStatusChangedEventHandler.java @@ -0,0 +1,43 @@ +package com.eactive.eai.rms.ext.djb.ums.event; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.stereotype.Component; + +import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.apim.portal.template.service.MessageEventHandler; +import com.eactive.apim.portal.template.service.MessageRecipient; +import com.eactive.apim.portal.template.service.MessageSendEvent; + +@Component +public class ApiStatusChangedEventHandler implements MessageEventHandler { + + @Override + public MessageCode getKey() { + return MessageCode.API_STATUS_CHANGED; + } + + @Override + public boolean allowAdditionalRecipients() { + return true; + } + + @Override + public String getDisplayName() { + return "API 상태 변화"; + } + + @Override + public String getDescription() { + return "
사용 가능 변수:

" + + "
- message 알림 메시지

"; + } + + @Override + public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map params) { + Map eventParams = new HashMap<>(); + eventParams.put("message", (String) params.get("message")); + return new MessageSendEvent(source, MessageCode.API_STATUS_CHANGED, recipient, eventParams); + } +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/InflowTokenFailedEventHandler.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/InflowTokenFailedEventHandler.java new file mode 100644 index 0000000..fb059e0 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/event/InflowTokenFailedEventHandler.java @@ -0,0 +1,43 @@ +package com.eactive.eai.rms.ext.djb.ums.event; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.stereotype.Component; + +import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.apim.portal.template.service.MessageEventHandler; +import com.eactive.apim.portal.template.service.MessageRecipient; +import com.eactive.apim.portal.template.service.MessageSendEvent; + +@Component +public class InflowTokenFailedEventHandler implements MessageEventHandler { + + @Override + public MessageCode getKey() { + return MessageCode.INFLOW_TOKEN_FAILED; + } + + @Override + public boolean allowAdditionalRecipients() { + return true; + } + + @Override + public String getDisplayName() { + return "유량제어 토큰 획득 실패"; + } + + @Override + public String getDescription() { + return "
사용 가능 변수:

" + + "
- message 알림 메시지

"; + } + + @Override + public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map params) { + Map eventParams = new HashMap<>(); + eventParams.put("message", (String) params.get("message")); + return new MessageSendEvent(source, MessageCode.INFLOW_TOKEN_FAILED, recipient, eventParams); + } +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java index b932514..08a0129 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java @@ -11,70 +11,42 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import org.springframework.stereotype.Service; + +import com.eactive.apim.portal.portalproperty.service.PortalPropertyService; import com.eactive.apim.portal.template.entity.MessageRequest; import com.eactive.eai.common.util.SystemUtil; +import com.eactive.eai.rms.data.entity.man.monitoringProperty.service.MonitoringPropertyService; import com.eactive.eai.rms.ext.djb.ums.vo.EmailDataVO; import com.eactive.eai.rms.ext.djb.ums.vo.SmsDataVO; import com.eactive.eai.rms.ext.djb.ums.vo.StdHeadVO; import com.eactive.eai.rms.ext.djb.ums.vo.SwingCommonVO; import com.eactive.eai.rms.ext.djb.ums.vo.SwingDataVO; import com.eactive.eai.rms.ext.djb.ums.vo.SwingReceiverDataVO; -import com.eactive.ext.kjb.common.KjbProperty; -import com.eactive.ext.kjb.common.KjbPropertyHolder; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; @Slf4j +@Service public class UmsService { - //public final static int[] ALLOW_CHANNELS = { MessageCode.Channels.SWING.getValue() }; - + private static final Gson gson = new Gson(); - - private static volatile UmsService instance; - + private static final String SYS_DVCD = "OPA"; - - private UmsService() { - // 싱글톤 + private final MonitoringPropertyService propertyService; + + public UmsService(MonitoringPropertyService propertyService) { + this.propertyService = propertyService; } - public static UmsService getInstance() { - if (instance == null) { - synchronized (UmsService.class) { - if (instance == null) { - instance = new UmsService(); - } - } - } - return instance; - } - - private KjbProperty getProperty() { - return KjbPropertyHolder.get(); - } - -// public static boolean isAllowChannel(MessageRequest message) { -// for (int channel : ALLOW_CHANNELS) { -// if ((message.getMessageCode().getChannels() & channel) == channel) { -// return true; -// } -// } -// return false; -// } - - public boolean send(MessageRequest messageRequest) throws Exception { if (messageRequest == null) { throw new IllegalArgumentException("messageRequest is null"); } -// if (MessageCode.Channels.SWING.getValue() != (messageRequest.getMessageCode().getChannels() & MessageCode.Channels.SWING.getValue())) { -// log.error("지원하지 않는 발송 채널 - {}", messageRequest.getMessageCode().toString()); -// throw new IllegalArgumentException("지원하지 않는 발송 채널 - " + messageRequest.getMessageCode().toString()); -// } - this.httpConnection(messageRequest); return true; @@ -84,9 +56,11 @@ public class UmsService { private void httpConnection(MessageRequest messageRequest) throws Exception { HttpURLConnection conn = null; BufferedReader br = null; - + log.debug("<<>>:" + messageRequest.toString()); try { - URL url = new URL(this.getHostUrl(messageRequest)); + String host = propertyService.getPropertyValue("Monitoring", "djb.ums."+messageRequest.getMessageType().toLowerCase()+".url", ""); + + URL url = new URL(host); int timeoutValue = 5 * 1000; // 타임아웃 설정을 위한 값 (단위: ms) // Charset charset = Charset.forName("UTF-8"); Charset charset = Charset.forName("MS949"); @@ -144,23 +118,8 @@ public class UmsService { } - private String getHostUrl(MessageRequest messageRequest) { - KjbProperty prop = getProperty(); - String hostUrl = ""; - if ("SWING".equals(messageRequest.getMessageType()) ) { - hostUrl = prop.getUmsSwingUrl(); - } else if ("SMS".equals(messageRequest.getMessageType()) || "KAKAO".equals(messageRequest.getMessageType())) { - hostUrl = prop.getUmsSmsUrl(); - } else if ("EMAIL".equals(messageRequest.getMessageType())) { - hostUrl = prop.getUmsEmailUrl(); - } - return hostUrl; - } private String makeBodyData(MessageRequest messageRequest) { - - KjbProperty prop = getProperty(); - // 리턴값 String rtnVal = ""; @@ -175,9 +134,9 @@ public class UmsService { stdHeadVO.setStnd_mesg_ver("R10"); stdHeadVO.setOrtr_guid(jsonData[2]); stdHeadVO.setSect_ecrpt_yn("N"); - stdHeadVO.setFrst_trnm_ipad(prop.getUmsWasIpAddress()); - stdHeadVO.setFrst_trnm_ipv4_addr(prop.getUmsWasIpAddress()); - stdHeadVO.setFrst_trnm_mac(prop.getUmsWasMacAddress()); + stdHeadVO.setFrst_trnm_ipad(propertyService.getPropertyValue("Monitoring", "djb.ums.was_ip_address", "")); + stdHeadVO.setFrst_trnm_ipv4_addr(propertyService.getPropertyValue("Monitoring", "djb.ums.was_ip_address", "")); + stdHeadVO.setFrst_trnm_mac(propertyService.getPropertyValue("Monitoring", "djb.ums.was_mac_address", "")); stdHeadVO.setFrst_mesg_dman_dt(jsonData[0]); stdHeadVO.setFrst_mesg_dman_time(jsonData[1]); stdHeadVO.setFrst_trnm_sys_dvcd(SYS_DVCD); @@ -186,18 +145,17 @@ public class UmsService { stdHeadVO.setSys_env_dvcd(SystemUtil.getSysOperEvirnDstcd()); // D:개발 T:테스트 P:운영 stdHeadVO.setTx_tycd("O"); // O:온라인 B:배치 stdHeadVO.setSynz_dvcd("S"); // S:동기 A:비동기 - stdHeadVO.setChnl_tycd(""); // 채널유형코드 TODO: 값 채울것!! + stdHeadVO.setChnl_tycd(""); // 채널유형코드 stdHeadVO.setHmab_dvcd("1"); // 내외구분코드 1:내부 2:외부(타발) + stdHeadVO.setIf_id(messageRequest.getEaiInterfaceId()); // 인터페이스ID + stdHeadVO.setTx_id(messageRequest.getServiceId()); // 거래ID - if ("SWING".equals(messageRequest.getMessageType()) ) { - // 표준 헤더 - stdHeadVO.setTx_id(prop.getUmsSwingTxId()); // 거래ID - stdHeadVO.setIf_id(prop.getUmsSwingIfId()); // 인터페이스ID + if ("MESSENGER".equals(messageRequest.getMessageType()) ) { // 스윙챗 알림 공용 SwingCommonVO swiComVO = new SwingCommonVO(); - swiComVO.setClientld(prop.getUmsSwingClientId()); - swiComVO.setClientSecret(prop.getUmsSwingClientSecret()); + swiComVO.setClientld(propertyService.getPropertyValue("Monitoring", "djb.ums.messenger.client_id", "")); + swiComVO.setClientSecret(propertyService.getPropertyValue("Monitoring", "djb.ums.messenger.client_secret", "")); swiComVO.setCompanyCode("CB"); swiComVO.setRequestUniqueKey(this.genrateRandomStringNumber26()); @@ -225,11 +183,9 @@ public class UmsService { + " \"common\":\r\n" + common + ",\r\n" + " \"data\":" + data + " }\r\n" + " }\r\n" + " ]\r\n" + "}"; - } else if ("SMS".equals(messageRequest.getMessageType()) + } + else if ("SMS".equals(messageRequest.getMessageType()) || "KAKAO".equals(messageRequest.getMessageType())) { - // 표준 헤더 - stdHeadVO.setTx_id(prop.getUmsSmsTxId()); // 거래ID - stdHeadVO.setIf_id(prop.getUmsSmsIfId()); // 인터페이스ID // Sms 데이터 SmsDataVO dataVO = new SmsDataVO(); @@ -240,8 +196,8 @@ public class UmsService { dataVO.setMsg_ctnt(messageRequest.getMessage()); dataVO.setRecvr_no(messageRequest.getPhone()); dataVO.setSndn_no("15880079"); //발신번호 - dataVO.setSnd_empno("999999"); //요청자 - dataVO.setSnd_emp_dprm_cd("157"); //요청부서코드 + dataVO.setSnd_empno(""); //요청자 + dataVO.setSnd_emp_dprm_cd(""); //요청부서코드 if ("SMS".equals(messageRequest.getMessageType())) { dataVO.setLtrs_snd_tycd("1"); // 1:SMS 2:LMS/MMS dataVO.setMsg_snd_tycd("0000"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, .... @@ -272,10 +228,8 @@ public class UmsService { + " \"ums_if_data\":" + data + " }\r\n" + " }\r\n" + " ]\r\n" + "}"; - } else if ("EMAIL".equals(messageRequest.getMessageType())) { - // 표준 헤더 - stdHeadVO.setTx_id(prop.getUmsEmailTxId()); // 거래ID - stdHeadVO.setIf_id(prop.getUmsEmailIfId()); // 인터페이스ID + } + else if ("EMAIL".equals(messageRequest.getMessageType())) { // 이메일 데이터 EmailDataVO dataVO = new EmailDataVO(); 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 10a3728..02bc0c0 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 @@ -19,6 +19,8 @@ import org.springframework.transaction.support.TransactionTemplate; import com.eactive.apim.portal.template.entity.MessageRequest; import com.eactive.apim.portal.template.repository.MessageRequestRepository; +import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; +import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; import com.eactive.eai.rms.ext.djb.ums.service.UmsService; import lombok.extern.slf4j.Slf4j; @@ -47,9 +49,11 @@ public class UmsDispatchService { @Autowired public UmsDispatchService( @Qualifier("transactionManagerForEMS") PlatformTransactionManager transactionManager, - MessageRequestRepository messageRequestRepository + MessageRequestRepository messageRequestRepository, + UmsService umsService ) { this.messageRequestRepository = messageRequestRepository; + this.umsService = umsService; this.executorService = new ThreadPoolExecutor( CORE_POOL_SIZE, @@ -60,7 +64,6 @@ public class UmsDispatchService { new ThreadPoolExecutor.CallerRunsPolicy() ); this.transactionTemplate = new TransactionTemplate(transactionManager); - this.umsService = UmsService.getInstance(); log.debug("UmsDispatchService initialized with thread pool - core: {}, max: {}, queue: {}", CORE_POOL_SIZE, MAX_POOL_SIZE, QUEUE_CAPACITY); } @@ -156,5 +159,6 @@ public class UmsDispatchService { message.setRequestStatus(status); message.setSentDate(LocalDateTime.now()); entityManager.merge(message); + entityManager.flush(); } } \ No newline at end of file From fafe7e45cb35b7475cdc54f6b390b6c4845777d5 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 13:19:10 +0900 Subject: [PATCH 38/45] =?UTF-8?q?=EC=84=9C=EB=B2=84=EB=AA=85=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/common/screen/emergency.jsp | 4 ++-- WebContent/jsp/common/screen/top_04.jsp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WebContent/jsp/common/screen/emergency.jsp b/WebContent/jsp/common/screen/emergency.jsp index b0d1252..b98632b 100644 --- a/WebContent/jsp/common/screen/emergency.jsp +++ b/WebContent/jsp/common/screen/emergency.jsp @@ -353,10 +353,10 @@
-
+

<%=resultMsg %>

diff --git a/WebContent/jsp/common/screen/top_04.jsp b/WebContent/jsp/common/screen/top_04.jsp index 1be448d..382e376 100644 --- a/WebContent/jsp/common/screen/top_04.jsp +++ b/WebContent/jsp/common/screen/top_04.jsp @@ -551,9 +551,9 @@
From cfafccc34de99927be631958f1c92c6ca7d83fdd Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 14:32:35 +0900 Subject: [PATCH 40/45] =?UTF-8?q?CA=20=EC=9D=B8=EC=A6=9D=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp index 62416af..40cddba 100644 --- a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp +++ b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp @@ -1686,6 +1686,7 @@ +
From 6b6e2863cd5a525bd6461053c3a983e7fa4a3e57 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 16 Jun 2026 14:55:39 +0900 Subject: [PATCH 41/45] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20-=20=EC=9E=A5=EC=95=A0=20=EC=A0=90?= =?UTF-8?q?=EA=B2=80=20=EB=93=B1=EB=A1=9D=20UI=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portalnotice/portalNoticeManDetail.jsp | 310 ++++++++++++------ .../portalnotice/IncidentAffectedApiUI.java | 11 + .../portalnotice/PortalNoticeManService.java | 137 +++++++- .../onl/apim/portalnotice/PortalNoticeUI.java | 25 ++ .../portalnotice/PortalNoticeUIMapper.java | 4 +- 5 files changed, 393 insertions(+), 94 deletions(-) create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/IncidentAffectedApiUI.java diff --git a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp index 6e74a8d..34ca6be 100644 --- a/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalnotice/portalNoticeManDetail.jsp @@ -19,10 +19,23 @@ @@ -252,7 +339,7 @@ -
+
@@ -270,9 +357,9 @@ - 게시유형 - -
+ 게시유형 * + +
@@ -286,7 +373,7 @@ 사용 - 고정여부 + 상단고정 고정 @@ -297,19 +384,58 @@ - + + 시작 * + + - --> + 종료 + + + + + + 상태 + +
+ +
+ + 이전 상태 + 없음 + + + 영향 API 선택 + +
+ + +
+ + + + + + + + + + + +
API IDAPI 명
선택된 영향 API가 없습니다.
+ +
- \ No newline at end of file + diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/IncidentAffectedApiUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/IncidentAffectedApiUI.java new file mode 100644 index 0000000..d38dcc7 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/IncidentAffectedApiUI.java @@ -0,0 +1,11 @@ +package com.eactive.eai.rms.onl.apim.portalnotice; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class IncidentAffectedApiUI { + private String apiId; + private String apiName; +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java index 09bf0ad..3ec890b 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeManService.java @@ -1,5 +1,13 @@ package com.eactive.eai.rms.onl.apim.portalnotice; +import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncident; +import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncidentApi; +import com.eactive.apim.portal.djb.apistatus.incident.entity.DjbApistatusIncidentApiId; +import com.eactive.apim.portal.djb.apistatus.incident.entity.IncidentKind; +import com.eactive.apim.portal.djb.apistatus.incident.entity.IncidentState; +import com.eactive.apim.portal.djb.apistatus.incident.repository.DjbApistatusIncidentApiRepository; +import com.eactive.apim.portal.djb.apistatus.incident.repository.DjbApistatusIncidentRepository; +import com.eactive.apim.portal.djb.apistatus.incident.repository.DjbApistatusIncidentTimelineRepository; import com.eactive.apim.portal.file.entity.FileDetail; import com.eactive.apim.portal.file.entity.FileInfo; import com.eactive.apim.portal.file.service.FileService; @@ -23,7 +31,12 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; @Service @Transactional(transactionManager = "transactionManagerForEMS") @@ -32,6 +45,9 @@ public class PortalNoticeManService extends BaseService { private final PortalNoticeService portalNoticeService; private final PortalNoticeUIMapper portalNoticeUIMapper; private final FileService fileService; + private final DjbApistatusIncidentRepository incidentRepository; + private final DjbApistatusIncidentApiRepository incidentApiRepository; + private final DjbApistatusIncidentTimelineRepository incidentTimelineRepository; private String decodeString(String value) { if (ContainerUtil.get() == ContainerUtil.TOMCAT) { @@ -48,10 +64,27 @@ public class PortalNoticeManService extends BaseService { @Autowired public PortalNoticeManService(PortalNoticeService portalNoticeService, PortalNoticeUIMapper portalNoticeUIMapper, - FileService fileService){ + FileService fileService, + DjbApistatusIncidentRepository incidentRepository, + DjbApistatusIncidentApiRepository incidentApiRepository, + DjbApistatusIncidentTimelineRepository incidentTimelineRepository){ this.portalNoticeService = portalNoticeService; this.portalNoticeUIMapper = portalNoticeUIMapper; this.fileService = fileService; + this.incidentRepository = incidentRepository; + this.incidentApiRepository = incidentApiRepository; + this.incidentTimelineRepository = incidentTimelineRepository; + } + + private static boolean isIncidentKind(String noticeType) { + return PortalNoticeUI.NOTICE_TYPE_INCIDENT.equals(noticeType) + || PortalNoticeUI.NOTICE_TYPE_MAINTENANCE.equals(noticeType); + } + + private static IncidentKind toKind(String noticeType) { + if (PortalNoticeUI.NOTICE_TYPE_INCIDENT.equals(noticeType)) return IncidentKind.INCIDENT; + if (PortalNoticeUI.NOTICE_TYPE_MAINTENANCE.equals(noticeType)) return IncidentKind.MAINTENANCE; + return null; } @@ -89,9 +122,39 @@ public class PortalNoticeManService extends BaseService { PortalNoticeUI ui = portalNoticeUIMapper.toVo(portalNotice); setFileInfo(portalNotice, ui); + populateIncident(portalNotice, ui); return ui; } + private void populateIncident(PortalNotice portalNotice, PortalNoticeUI ui) { + if (!isIncidentKind(portalNotice.getNoticeType())) { + ui.setAffectedApis(Collections.emptyList()); + return; + } + Optional incidentOpt = incidentRepository.findByNoticeId(portalNotice.getId()); + if (!incidentOpt.isPresent()) { + ui.setAffectedApis(Collections.emptyList()); + return; + } + DjbApistatusIncident incident = incidentOpt.get(); + ui.setIncidentId(incident.getIncidentId()); + ui.setSummary(incident.getSummary()); + ui.setStartedAt(incident.getStartedAt()); + ui.setEndAt(incident.getEndAt()); + ui.setState(incident.getState() == null ? null : incident.getState().name()); + ui.setPreviousState(incident.getPreviousState() == null ? null : incident.getPreviousState().name()); + + List apis = incidentApiRepository + .findByIncidentIdOrderByApiId(incident.getIncidentId()).stream() + .map(api -> { + IncidentAffectedApiUI vo = new IncidentAffectedApiUI(); + vo.setApiId(api.getApiId()); + vo.setApiName(api.getApiName()); + return vo; + }).collect(Collectors.toList()); + ui.setAffectedApis(apis); + } + public void insert(PortalNoticeUI portalNoticeUI) throws IOException { //portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject())); //portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail()))); @@ -106,6 +169,61 @@ public class PortalNoticeManService extends BaseService { } portalNoticeService.save(portalNotice); + + if (isIncidentKind(portalNoticeUI.getNoticeType())) { + persistIncident(portalNoticeUI, portalNotice, true); + } + } + + private void persistIncident(PortalNoticeUI portalNoticeUI, PortalNotice portalNotice, boolean isCreate) { + IncidentKind kind = toKind(portalNoticeUI.getNoticeType()); + + DjbApistatusIncident incident = incidentRepository.findByNoticeId(portalNotice.getId()) + .orElseGet(DjbApistatusIncident::new); + + incident.setKind(kind); + incident.setTitle(portalNotice.getNoticeSubject()); + incident.setSummary(portalNoticeUI.getSummary()); + incident.setStartedAt(portalNoticeUI.getStartedAt() != null + ? portalNoticeUI.getStartedAt() : LocalDateTime.now()); + incident.setEndAt(portalNoticeUI.getEndAt()); + incident.setDetectedBy("MANUAL"); + incident.setNoticeId(portalNotice.getId()); + incident.setDraftYn("N"); + incident.setFixYn(StringUtils.defaultIfBlank(portalNotice.getFixYn(), "N")); + + if (kind == IncidentKind.INCIDENT) { + IncidentState newState = StringUtils.isNotBlank(portalNoticeUI.getState()) + ? IncidentState.valueOf(portalNoticeUI.getState()) + : IncidentState.INVESTIGATING; + if (!isCreate && incident.getState() != newState) { + incident.setPreviousState(incident.getState()); + } + incident.setState(newState); + } else { + incident.setState(null); + incident.setPreviousState(null); + } + + DjbApistatusIncident saved = incidentRepository.save(incident); + + // 영향 API 동기화 — 단순 전체 삭제 후 재삽입 + incidentApiRepository.deleteByIncidentId(saved.getIncidentId()); + List affected = portalNoticeUI.getAffectedApis(); + if (affected != null && !affected.isEmpty()) { + List rows = new ArrayList<>(); + for (IncidentAffectedApiUI src : affected) { + if (StringUtils.isBlank(src.getApiId())) continue; + DjbApistatusIncidentApi api = new DjbApistatusIncidentApi(); + api.setIncidentId(saved.getIncidentId()); + api.setApiId(src.getApiId()); + api.setApiName(src.getApiName()); + rows.add(api); + } + if (!rows.isEmpty()) { + incidentApiRepository.saveAll(rows); + } + } } private void handleFileUpload(PortalNoticeUI portalNoticeUI, PortalNotice portalNotice) throws IOException { @@ -129,6 +247,7 @@ public class PortalNoticeManService extends BaseService { portalNoticeUI.setNoticeDetail(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())); PortalNotice portalNotice = portalNoticeService.getById(portalNoticeUI.getId()); + String previousNoticeType = portalNotice.getNoticeType(); if (portalNoticeUI.getFiles() != null && !portalNoticeUI.getFiles().isEmpty()) { handleFileUpload(portalNoticeUI, portalNotice); @@ -139,11 +258,27 @@ public class PortalNoticeManService extends BaseService { portalNoticeUIMapper.updateToEntity(portalNoticeUI, portalNotice); portalNoticeService.save(portalNotice); + + if (isIncidentKind(portalNotice.getNoticeType())) { + persistIncident(portalNoticeUI, portalNotice, false); + } else if (isIncidentKind(previousNoticeType)) { + // 일반 공지로 유형 변경 → 기존 incident 정리 + deleteIncidentIfExists(portalNotice.getId()); + } + } + + private void deleteIncidentIfExists(String noticeId) { + incidentRepository.findByNoticeId(noticeId).ifPresent(incident -> { + incidentApiRepository.deleteByIncidentId(incident.getIncidentId()); + incidentTimelineRepository.deleteByIncidentId(incident.getIncidentId()); + incidentRepository.delete(incident); + }); } public void delete(String id) { PortalNotice portalNotice = portalNoticeService.getById(id); Optional.ofNullable(portalNotice.getFileId()).ifPresent(fileService::deleteFile); + deleteIncidentIfExists(id); portalNoticeService.deleteById(id); } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java index bded835..db2a1da 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUI.java @@ -8,11 +8,16 @@ import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.util.List; @Data public class PortalNoticeUI { + public static final String NOTICE_TYPE_NORMAL = "1"; + public static final String NOTICE_TYPE_MAINTENANCE = "2"; + public static final String NOTICE_TYPE_INCIDENT = "3"; + private String id; private String noticeSubject; @@ -53,4 +58,24 @@ public class PortalNoticeUI { private boolean hasAttachment; // 첨부파일 여부 private boolean fileDeleted; // 파일 삭제 여부 + + // ───── 장애/점검(djb_apistatus_incident) 연동 필드 ───── + private Long incidentId; + + private String summary; + + // HTML 는 'T' 구분자 형식 (예: 2026-06-16T10:29). + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm") + private LocalDateTime startedAt; + + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm") + private LocalDateTime endAt; + + private String state; // INCIDENT 한정 (INVESTIGATING/IDENTIFIED/MONITORING/RESOLVED/CANCELED) + + private String previousState; // 직전 상태 + + private List affectedApis; } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUIMapper.java index d8fa0ed..02aa8c1 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUIMapper.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalnotice/PortalNoticeUIMapper.java @@ -3,7 +3,9 @@ package com.eactive.eai.rms.onl.apim.portalnotice; import com.eactive.apim.portal.portalNotice.entity.PortalNotice; import org.mapstruct.*; -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +@Mapper(componentModel = "spring", + unmappedTargetPolicy = ReportingPolicy.IGNORE, + unmappedSourcePolicy = ReportingPolicy.IGNORE) public interface PortalNoticeUIMapper { PortalNoticeUI toVo(PortalNotice entity); From 58fe176715b2027f783a2dae98e1583beaf34c8c Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 15:05:48 +0900 Subject: [PATCH 42/45] =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=EC=88=9C=EC=84=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/admin/service/stdDefaultMan.jsp | 14 ++++++++------ .../ExtendedColumnDefinitionService.java | 9 ++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp b/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp index afa60f5..f9d8d57 100644 --- a/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp +++ b/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp @@ -44,14 +44,16 @@ '<%=localeMessage.getString("stdDefaultMan.columDesc")%>', '<%=localeMessage.getString("stdDefaultMan.columLen")%>', '<%=localeMessage.getString("stdDefaultMan.keyOr")%>', - '<%=localeMessage.getString("stdDefaultMan.ifOr")%>' + '<%=localeMessage.getString("stdDefaultMan.ifOr")%>', + '<%=localeMessage.getString("stdDefaultMan.orderSeq")%>' ], colModel:[ - { name : 'COLUMNNAME' , align:'left' , sortable:false }, - { name : 'COLUMNDESC' , align:'left' }, - { name : 'COLUMNLENGTH' , align:'right' }, - { name : 'ISKEY' , align:'center' }, - { name : 'ISINTERFACE' , align:'center' } + { name : 'COLUMNNAME' , align:'left' , width: '200px', sortable:false }, + { name : 'COLUMNDESC' , align:'left' , width: '200px' }, + { name : 'COLUMNLENGTH' , align:'center' , width: '100px' }, + { name : 'ISKEY' , align:'center', width: '100px' }, + { name : 'ISINTERFACE' , align:'center', width: '100px' }, + { name : 'ORDERSEQ' , align:'center', width: '100px' } ], jsonReader: { repeatitems:false diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java index 5567d62..2b44c59 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java @@ -5,7 +5,9 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,7 +44,12 @@ public class ExtendedColumnDefinitionService predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc)); } - return repository.findAll(predicate, pageable); + Pageable orderedPageable = PageRequest.of( + pageable.getPageNumber(), + pageable.getPageSize(), + Sort.by(Sort.Order.asc("orderSeq"), Sort.Order.asc("columnName"))); + + return repository.findAll(predicate, orderedPageable); } } From 6ab7e1fe16d80659d05f765a7b230f70e801ece7 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 16 Jun 2026 15:48:30 +0900 Subject: [PATCH 43/45] =?UTF-8?q?ci=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/eapim-admin-ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitea/workflows/eapim-admin-ci.yml b/.gitea/workflows/eapim-admin-ci.yml index c0d7b08..08d0152 100644 --- a/.gitea/workflows/eapim-admin-ci.yml +++ b/.gitea/workflows/eapim-admin-ci.yml @@ -65,14 +65,6 @@ jobs: path: eapim-admin/build/libs/eapim-admin.war if-no-files-found: error - - name: Sync systemd user unit - working-directory: ${{ github.workspace }} - run: | - install -D -m 644 eapim-admin/deploy/systemd/eapim-admin.service \ - "$HOME/.config/systemd/user/eapim-admin.service" - systemctl --user daemon-reload - systemctl --user enable eapim-admin 2>/dev/null || true - - name: Stop tomcat (pre-clean) working-directory: ${{ github.workspace }} run: | From df5bbb162a9b1a2a35c05c9c9a06a1f7de6aaf47 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 16 Jun 2026 15:56:46 +0900 Subject: [PATCH 44/45] =?UTF-8?q?ci=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/eapim-admin-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/eapim-admin-ci.yml b/.gitea/workflows/eapim-admin-ci.yml index 08d0152..eba94c0 100644 --- a/.gitea/workflows/eapim-admin-ci.yml +++ b/.gitea/workflows/eapim-admin-ci.yml @@ -89,7 +89,7 @@ jobs: cp eapim-admin/build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war" ls -la "$DEPLOY_DIR" - - name: Start tomcat and readiness probe (timeout 120s) + - name: Start tomcat and readiness probe (timeout 180s) working-directory: ${{ github.workspace }} run: | LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log" @@ -99,7 +99,7 @@ jobs: # systemd 가 Tomcat 을 새 cgroup 으로 띄움 — runner step 종료와 무관하게 살아남음 systemctl --user start eapim-admin - DEADLINE=$(($(date +%s) + 120)) + DEADLINE=$(($(date +%s) + 180)) STATUS=000 while [ $(date +%s) -lt $DEADLINE ]; do STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \ @@ -122,7 +122,7 @@ jobs: case "$STATUS" in 200|302|401) ;; *) - echo "::error::Readiness probe failed within 120s (last HTTP status: $STATUS)" + echo "::error::Readiness probe failed within 180s (last HTTP status: $STATUS)" [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100 exit 1 ;; From a440ac842d1eeeccab0fcc44a2de92aff07282fc Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 16:05:44 +0900 Subject: [PATCH 45/45] =?UTF-8?q?API=EC=83=81=ED=83=9C=20=EB=B3=80?= =?UTF-8?q?=ED=99=94=20=EA=B0=90=EC=A7=80=20(=EC=A0=90=EA=B2=80=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=A0=81=EC=9A=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eai/rms/ext/djb/apistatus/ApiStatusRepository.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java index 617077b..750d3f7 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java @@ -39,11 +39,10 @@ public interface ApiStatusRepository extends BaseRepository { + " FROM (" + " SELECT A.EAISVCNAME" + " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE" - //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것 - + " , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X " - + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)" - //+ " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " - + " AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN " + + " , NVL(( SELECT MAX('Y') FROM EMSAPP.DJB_APISTATUS_INCIDENT_API X" + + " WHERE EXISTS (SELECT 1 FROM EMSAPP.DJB_APISTATUS_INCIDENT Y WHERE X.INCIDENT_ID = Y.INCIDENT_ID " + + " AND SYSTIMESTAMP BETWEEN STARTED_AT AND END_AT) " + + " AND A.EAISVCNAME = X.API_ID),'N') AS CTRL_YN " + " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'" + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" + " ELSE 'N' END"