| 그룹명 | ++ |
|---|
Job 파라미터로 오버라이드 가능 (aggregation.hour.range)
+ */ + public static final int DEFAULT_AGGREGATION_HOUR_RANGE = 1; + + private static final DateTimeFormatter TIMESLICE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH0000000"); + private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); + private static final DateTimeFormatter YYYYMMDD_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + + private final ObpGwMetricDAO obpGwMetricDAO; + private final ObpGwMetricService obpGwMetricService; + + public ObpGwMetricManService(ObpGwMetricDAO obpGwMetricDAO, ObpGwMetricService obpGwMetricService) { + this.obpGwMetricDAO = obpGwMetricDAO; + this.obpGwMetricService = obpGwMetricService; + } + + /** + * 다중 시간대 집계 실행 (Job에서 호출) - 기본 집계 범위 사용 + */ + public void executeHourlyAggregation() { + executeHourlyAggregation(DEFAULT_AGGREGATION_HOUR_RANGE); + } + + /** + * 다중 시간대 집계 실행 (Job에서 호출) + * + * @param aggregationHourRange 집계 범위 시간 (단위: 시간) + * 예: 1=직전 1시간, 3=직전 3시간 각각 집계 + */ + public void executeHourlyAggregation(int aggregationHourRange) { + long totalStartTime = System.currentTimeMillis(); + LocalDateTime now = LocalDateTime.now(); + LocalDateTime baseHour = now.truncatedTo(ChronoUnit.HOURS); // 현재 시간의 정각 + + log.info("========== ObpGwMetric 집계 시작 =========="); + log.info("실행 시간: {}, aggregationHourRange: {}", now, aggregationHourRange); + + for (int i = 1; i <= aggregationHourRange; i++) { + LocalDateTime targetHour = baseHour.minusHours(i); + log.info("집계 대상 시간대: {}", targetHour); + createHourlyData(targetHour); + } + + long totalElapsed = System.currentTimeMillis() - totalStartTime; + log.info("========== ObpGwMetric 집계 완료 =========="); + log.info("전체 집계 소요시간: {}ms ({}초)", totalElapsed, String.format("%.2f", totalElapsed / 1000.0)); + } + + /** + * 1시간 단위 ObpGwMetric 데이터 생성 (UPSERT) + */ + public void createHourlyData(LocalDateTime targetHour) { + long jobStartTime = System.currentTimeMillis(); + log.info("ObpGwMetric 집계 시작: targetHour={}", targetHour); + + try { + String timeslice = targetHour.format(TIMESLICE_FORMATTER); + String yyyymmdd = targetHour.format(YYYYMMDD_FORMATTER); + String tableName = CommonUtil.getLogTable(yyyymmdd, true); + String startTime = targetHour.format(TIMESTAMP_FORMATTER); + String endTime = targetHour.plusHours(1).minusNanos(1).format(TIMESTAMP_FORMATTER); + + // ═══════════════════════════════════════════════════════════════════ + // 1단계: GW DB에서 EAIBZWKDSTCD 코드 목록 조회 + // ═══════════════════════════════════════════════════════════════════ + long step1Start = System.currentTimeMillis(); + DataSourceType apigwDataSourceType = DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW); + DataSourceContextHolder.setDataSourceType(apigwDataSourceType); + + ListCron Schedule 권장:
+ *Job 파라미터 (JobDataMap):
+ *예시 (Quartz 스케줄 등록 시):
+ *
+ * JobDataMap jobDataMap = new JobDataMap();
+ * jobDataMap.put("aggregation.hour.range", "3");
+ *
+ */
+public class ObpGwMetricHourJob implements Job {
+
+ private static final Logger log = LoggerFactory.getLogger(ObpGwMetricHourJob.class);
+
+ /** Job 파라미터 키: 집계 범위 시간 */
+ public static final String PARAM_AGGREGATION_HOUR_RANGE = "aggregation.hour.range";
+
+ /** 기본 집계 범위 시간 (시간 단위) */
+ public static final int DEFAULT_AGGREGATION_HOUR_RANGE = 1;
+
+ private transient MonitoringContext monitoringContext;
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ log.info("*** START ObpGwMetricHourJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
+
+ // Job 파라미터 로깅
+ JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+ logJobParameters(jobDataMap);
+
+ ApplicationContext appContext;
+ try {
+ appContext = (ApplicationContext) context.getScheduler().getContext().get("applicationContext");
+ } catch (SchedulerException e) {
+ log.error("applicationContext get module error", e);
+ return;
+ }
+
+ monitoringContext = (MonitoringContext) appContext.getBean("monitoringContext");
+ ObpGwMetricManService obpGwMetricManService = appContext.getBean(ObpGwMetricManService.class);
+
+ // 집계 범위 시간 파라미터 파싱
+ int aggregationHourRange = parseAggregationHourRange(jobDataMap);
+
+ try {
+ obpGwMetricManService.executeHourlyAggregation(aggregationHourRange);
+ } catch (Exception e) {
+ log.error("ObpGwMetricHourJob execution failed", e);
+ throw new JobExecutionException(e);
+ }
+
+ log.info("*** END ObpGwMetricHourJob run({})", DateUtil.getDateTime("yyyy-MM-dd HH:mm"));
+ }
+
+ /**
+ * Job 파라미터 로깅
+ */
+ private void logJobParameters(JobDataMap jobDataMap) {
+ if (jobDataMap == null || jobDataMap.isEmpty()) {
+ log.debug("Job 파라미터 없음 (기본값 사용)");
+ return;
+ }
+
+ StringBuilder sb = new StringBuilder("Job 파라미터: ");
+ for (String key : jobDataMap.getKeys()) {
+ sb.append(key).append("=").append(jobDataMap.getString(key)).append(", ");
+ }
+ log.info(sb.toString());
+ }
+
+ /**
+ * 집계 범위 시간 파라미터 파싱
+ *
+ * @param jobDataMap Job 파라미터 맵
+ * @return 집계 범위 시간 (파싱 실패 시 기본값 반환)
+ */
+ private int parseAggregationHourRange(JobDataMap jobDataMap) {
+ if (jobDataMap == null) {
+ return DEFAULT_AGGREGATION_HOUR_RANGE;
+ }
+
+ try {
+ String value = jobDataMap.getString(PARAM_AGGREGATION_HOUR_RANGE);
+ if (value != null && !value.trim().isEmpty()) {
+ int parsedValue = Integer.parseInt(value.trim());
+ if (parsedValue < 1) {
+ log.warn("aggregation.hour.range 값이 1 미만입니다. 기본값({}) 사용: input={}",
+ DEFAULT_AGGREGATION_HOUR_RANGE, parsedValue);
+ return DEFAULT_AGGREGATION_HOUR_RANGE;
+ }
+ // 개발 모드(D)가 아닌 경우에만 24시간 제한 적용
+ if (parsedValue > 24 && !isDevMode()) {
+ log.warn("aggregation.hour.range 값이 24 초과입니다. 24로 제한: input={}", parsedValue);
+ return 24;
+ }
+ return parsedValue;
+ }
+ } catch (NumberFormatException e) {
+ log.warn("aggregation.hour.range 파싱 실패, 기본값({}) 사용: {}",
+ DEFAULT_AGGREGATION_HOUR_RANGE, e.getMessage());
+ }
+
+ return DEFAULT_AGGREGATION_HOUR_RANGE;
+ }
+
+ /**
+ * 개발 모드 여부 확인
+ * @return eai.systemmode=D 이면 true
+ */
+ private boolean isDevMode() {
+ String systemMode = System.getProperty("eai.systemmode", "");
+ return "D".equalsIgnoreCase(systemMode);
+ }
+}
diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/TransactionReportHourJob.java b/src/main/java/com/eactive/eai/rms/onl/common/service/TransactionReportHourJob.java
index 72e81a3..83fd045 100644
--- a/src/main/java/com/eactive/eai/rms/onl/common/service/TransactionReportHourJob.java
+++ b/src/main/java/com/eactive/eai/rms/onl/common/service/TransactionReportHourJob.java
@@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.eactive.eai.rms.onl.common.util.FileSystemUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -75,7 +76,7 @@ public class TransactionReportHourJob implements Job {
}
String trTime = monitoringContext.getStringProperty(MonitoringContext.RMS_TRANSACTION_LOG_TIME, "");
- if( trTime.indexOf("EVERY_HOUR") > -1 ) {
+ if (trTime.contains("EVERY_HOUR")) {
// go on
} else if (!StringUtils.contains(trTime, hour)) {
return;
@@ -93,9 +94,11 @@ public class TransactionReportHourJob implements Job {
+ CommonUtil.getToday("yyyy-MM-dd HH:mm") + ")");
}
- String pathDir = monitoringContext.getStringProperty( MonitoringContext.RMS_TRANSACTION_LOG_PATH,"/fslog/eai/")
- + monitoringContext.getStringProperty( Keys.SERVER_KEY)
- + "/trlog";
+ String pathDir = FileSystemUtil.pathNormalize(
+ monitoringContext.getStringProperty( MonitoringContext.RMS_TRANSACTION_LOG_PATH,"/fslog/eai/")
+ , monitoringContext.getStringProperty( Keys.SERVER_KEY)
+ , "trlog"
+ );
///////////////////////////////////////////////
// 로컬테스트용
diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java
index 5211520..4a42c9c 100644
--- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java
@@ -17,13 +17,14 @@ import org.springframework.transaction.support.TransactionTemplate;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import java.io.IOException;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import javax.annotation.PostConstruct;
+
@Slf4j
@Service
@@ -46,6 +47,7 @@ public class UmsDispatchService {
private KjbUmsService kjbUmsService;
private KjbEmailSendModule kjbEmailSendModule;
private final KjbPropertyInjector kjbPropertyInjector;
+ private KjbProperty kjbProperty;
@Autowired
@@ -55,11 +57,7 @@ public class UmsDispatchService {
MessageRequestRepository messageRequestRepository
) {
this.kjbPropertyInjector = new KjbPropertyInjector(monitoringPropertyService, PROP_GORUP_ID);
-
this.messageRequestRepository = messageRequestRepository;
-// this.kjbEmailService = kjbEmailService;
-// this.kjbSafedbWrapper = kjbSafedbWrapper;
-// this.monitoringPropertyService = monitoringPropertyService;
this.executorService = new ThreadPoolExecutor(
CORE_POOL_SIZE,
@@ -72,32 +70,51 @@ public class UmsDispatchService {
this.transactionTemplate = new TransactionTemplate(transactionManager);
log.debug("UmsDispatchService initialized with thread pool - core: {}, max: {}, queue: {}",
CORE_POOL_SIZE, MAX_POOL_SIZE, QUEUE_CAPACITY);
+ }
-
- KjbProperty prop = new KjbProperty();
-// prop.setEaiBatchUrl(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.url"));
-// prop.setUmsEaiBatchSendDir(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.send_dir"));
-// prop.setUmsEaiBatchBackupDir(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.backup_dir"));
-// prop.setUmsEaiBatchInterfaceId(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.eai_batch.interface_id"));
-// prop.setUmsHostUrl(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.host_url"));
-// prop.setUmsApiKey(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.api_key"));
- prop = kjbPropertyInjector.inject(prop);
+ @PostConstruct
+ public void init() {
+ this.kjbProperty = kjbPropertyInjector.inject(new KjbProperty());
try {
- this.kjbUmsService = new KjbUmsService(prop);
-
- this.kjbEmailSendModule = KjbEmailSendModule.getInstance(prop, messageRequestRepository);
+ this.kjbUmsService = new KjbUmsService(kjbProperty);
+ this.kjbEmailSendModule = KjbEmailSendModule.getInstance(kjbProperty, messageRequestRepository);
+ log.info("KjbUmsService and KjbEmailSendModule initialized successfully");
} catch (Exception e) {
log.error("Failed to initialize KjbUmsService or KjbEmailSendModule: {}", e.getMessage(), e);
}
}
+ /**
+ * URL 설정값이 비어있을 경우 DB에서 재로딩 후 서비스 재초기화
+ */
+ private void reloadPropertyIfNeeded() {
+ if (!kjbPropertyInjector.isUrlConfigured(kjbProperty)) {
+ log.info("KjbProperty URL 값이 비어있어 재로딩 시도");
+ KjbProperty reloaded = kjbPropertyInjector.reloadIfUrlEmpty(kjbProperty);
+
+ if (reloaded != kjbProperty && kjbPropertyInjector.isUrlConfigured(reloaded)) {
+ this.kjbProperty = reloaded;
+ try {
+ this.kjbUmsService = new KjbUmsService(kjbProperty);
+ this.kjbEmailSendModule = KjbEmailSendModule.getInstance(kjbProperty, messageRequestRepository);
+ log.info("KjbProperty 재로딩 후 서비스 재초기화 완료");
+ } catch (Exception e) {
+ log.error("KjbProperty 재로딩 후 서비스 재초기화 실패: {}", e.getMessage(), e);
+ }
+ }
+ }
+ }
+
@SuppressWarnings("unchecked")
@Transactional(transactionManager = "transactionManagerForEMS")
public void processMessages() {
log.info("Starting to process pending messages");
- // 상태가 PENDING인 메시지들을 조회하고 바로 PROCESSING으로 변경
+ // URL 설정값이 비어있을 경우 DB에서 재로딩 시도
+ reloadPropertyIfNeeded();
+
+ // 상태가 PENDING인 메시지들을 조회하고 바로 PROCESSING으로 변경
ListExamples for Linux/macOS:
+ *Examples for Windows:
+ *