Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/bundle/bundles/20251230/eapim-admin_incremental_2025-12-01.bundle into jenkins_with_weblogic

2025-12-30 14:26:14 +09:00
parent ba49851a2d a7e68bcb27
commit dcbf932d3f
13 changed files with 463 additions and 46 deletions
@@ -0,0 +1,17 @@
+package com.eactive.eai.rms.data.entity.onl.logger;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ApiLogDTO {
+
+	private String apiServiceNumber;
+
+	private String txDate;
+
+	private List<ApiMessageLogDTO> logs;
+
+	private Long totalProcessingTime;
+}
@@ -0,0 +1,36 @@
+package com.eactive.eai.rms.data.entity.onl.logger;
+
+import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
+
+@Data
+public class ApiMessageLogDTO {
+
+	private String apiServiceNumber;
+
+	private int processNumber;
+
+	private String txDate;
+
+	private String url;
+
+	private String queryString;
+
+	private String clientId;
+
+	private String method;
+
+	private Integer HttpStatus;
+
+	private String header;
+
+	private String body;
+
+	private String exdata;
+
+	private Long processingTime;
+
+	private String keymgtmsgctnt;
+}
@@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable;
 import com.eactive.eai.data.entity.onl.logger.EAILog;
 import com.eactive.eai.data.entity.onl.logger.EAILogId;

+import java.util.List;
 import java.util.Map;

 public interface EAILogRepository {
@@ -16,4 +17,6 @@ public interface EAILogRepository {

 	Map<String, Long> countDetailedTransactions(Class<? extends EAILog> clazz, EAILogSearch eaiLogSearch);

+	List<EAILog> getApiLog(Class<? extends EAILog> class1, String apiServiceNumber);
+
 }
@@ -1,5 +1,19 @@
 package com.eactive.eai.rms.data.entity.onl.logger;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
 import com.eactive.eai.data.entity.onl.logger.EAILog;
 import com.eactive.eai.data.entity.onl.logger.EAILogId;
 import com.eactive.eai.data.entity.onl.logger.QEAILog;
@@ -11,18 +25,6 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.EntityPathBase;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;

@Repository
 public class EAILogRepositoryImpl implements EAILogRepository {
@@ -217,4 +219,14 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 				.fetchOne();
 	}

+	@Override
+	public List<EAILog> getApiLog(Class<? extends EAILog> clazz, String apiServiceNumber) {
+		QEAILog qeaiLog = QEAILog.eAILog;
+		EntityPathBase<?> entityPathBase = new EntityPathBase<>(clazz, qeaiLog.getMetadata().getName());
+
+		return new JPAQueryFactory(em).select(qeaiLog).from(entityPathBase)
+				.where(qeaiLog.id.eaisvcserno.trim().eq(apiServiceNumber)).orderBy(qeaiLog.id.logprcssserno.asc())
+				.fetch();
+	}
+
 }
@@ -19,4 +19,6 @@ public interface EAILogService {
 	List<PortalStatisticsVO> selectLogList(HashMap<String, Object> paramMap);

 	Map<String, Long> getTransactionCounts(EAILogSearch eaiLogSearch);
+
+	ApiLogDTO getApiLog(String txDate, String apiServiceNumber);
 }
@@ -1,55 +1,130 @@
 package com.eactive.eai.rms.data.entity.onl.logger;

-import com.eactive.eai.data.RollingTable;
-import com.eactive.eai.data.entity.onl.logger.EAILog;
-import com.eactive.eai.data.entity.onl.logger.EAILogId;
-import com.eactive.eai.rms.common.util.CommonUtil;
-import com.eactive.eai.rms.data.entity.onl.apim.portalstatistics.PortalStatisticsVO;
-import lombok.RequiredArgsConstructor;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationContext;
 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.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.eactive.eai.data.RollingTable;
+import com.eactive.eai.data.entity.onl.logger.EAILog;
+import com.eactive.eai.data.entity.onl.logger.EAILogId;
+import com.eactive.eai.data.entity.onl.logger.HttpAdapterExtraLog;
+import com.eactive.eai.rms.common.util.CommonUtil;
+import com.eactive.eai.rms.data.entity.onl.apim.portalstatistics.PortalStatisticsVO;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;

+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@Service
@Transactional
@RequiredArgsConstructor
 public class EAILogServiceImpl implements EAILogService {

-    private final EAILogRepository eaiLogRepository;
-    private final ApplicationContext applicationContext;
-    private final EAILogDAOForEMS eaiLogDAOForEMS;
+	private final EAILogRepository eaiLogRepository;
+	private final ApplicationContext applicationContext;
+	private final EAILogDAOForEMS eaiLogDAOForEMS;
+	private final HttpAdapterExtraLogService httpAdapterExtraLogService;

-    @Override
-    public Page<EAILogDto> findAll(Pageable pageable, EAILogSearch eaiLogSearch) {
-        long time = CommonUtil.getCalendar(eaiLogSearch.getSearchStartTime()).getTimeInMillis();
-        EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
-        Page<EAILogDto> eaiLogDtos = eaiLogRepository.findAll(eaiLog.getClass(), pageable, eaiLogSearch);
-        return eaiLogDtos;
-    }
+	@Override
+	public Page<EAILogDto> findAll(Pageable pageable, EAILogSearch eaiLogSearch) {
+		long time = CommonUtil.getCalendar(eaiLogSearch.getSearchStartTime()).getTimeInMillis();
+		EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
+		Page<EAILogDto> eaiLogDtos = eaiLogRepository.findAll(eaiLog.getClass(), pageable, eaiLogSearch);
+		return eaiLogDtos;
+	}

-    public Map<String, Long> getTransactionCounts(EAILogSearch eaiLogSearch){
-        long time = CommonUtil.getCalendar(eaiLogSearch.getSearchStartTime()).getTimeInMillis();
-        EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
-        Map<String, Long> detailedCounts = eaiLogRepository.countDetailedTransactions(eaiLog.getClass(), eaiLogSearch);
-        return detailedCounts;
-    }
+	public Map<String, Long> getTransactionCounts(EAILogSearch eaiLogSearch) {
+		long time = CommonUtil.getCalendar(eaiLogSearch.getSearchStartTime()).getTimeInMillis();
+		EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
+		Map<String, Long> detailedCounts = eaiLogRepository.countDetailedTransactions(eaiLog.getClass(), eaiLogSearch);
+		return detailedCounts;
+	}

-    @Override
-    public EAILogDto getById(EAILogId eaiLogId) {
-        long time = CommonUtil.getCalendar(eaiLogId.getMsgdpstyms()).getTimeInMillis();
-        EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
-        return eaiLogRepository.getById(eaiLog.getClass(), eaiLogId);
-    }
+	@Override
+	public EAILogDto getById(EAILogId eaiLogId) {
+		long time = CommonUtil.getCalendar(eaiLogId.getMsgdpstyms()).getTimeInMillis();
+		EAILog eaiLog = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
+		return eaiLogRepository.getById(eaiLog.getClass(), eaiLogId);
+	}

+	public List<PortalStatisticsVO> selectLogList(HashMap<String, Object> paramMap) {
+		return eaiLogDAOForEMS.selectLogList(paramMap);
+	}

-    public List<PortalStatisticsVO> selectLogList(HashMap<String, Object> paramMap) {
-        return eaiLogDAOForEMS.selectLogList(paramMap);
-    }
+	@Override
+	public ApiLogDTO getApiLog(String txDate, String apiServiceNumber) {
+		
+		long time = CommonUtil.getCalendar(txDate).getTimeInMillis();
+		EAILog eaiLogTargetObject = (EAILog) applicationContext.getBean(RollingTable.class, EAILog.class, time);
+		List<EAILog> eaiLogs = eaiLogRepository.getApiLog(eaiLogTargetObject.getClass(), apiServiceNumber);
+		eaiLogs.sort((l1, l2) -> l1.getId().getEaisvcserno().compareTo(l2.getId().getEaisvcserno()));
+		
+		ApiLogDTO apiLogDTO = new ApiLogDTO();
+		apiLogDTO.setApiServiceNumber(apiServiceNumber);
+		eaiLogs.stream().findFirst().ifPresent(log -> apiLogDTO.setTxDate(log.getId().getMsgdpstyms()));
+
+		List<ApiMessageLogDTO> apiMessageLogDTOs = new LinkedList<>();
+
+		for (EAILog eaiLog : eaiLogs) {
+			ApiMessageLogDTO apiMessageLogDTO = new ApiMessageLogDTO();
+
+			apiMessageLogDTO.setApiServiceNumber(apiServiceNumber);
+			apiMessageLogDTO.setTxDate(eaiLog.getMsgprcssyms());
+			apiMessageLogDTO.setProcessNumber(Integer.parseInt(eaiLog.getId().getLogprcssserno()));
+			apiMessageLogDTO.setQueryString("");
+			apiMessageLogDTO.setClientId(eaiLog.getClientid());
+			apiMessageLogDTO.setKeymgtmsgctnt(eaiLog.getKeymgtmsgctnt());
+
+			String body = StringUtils.substringAfter(eaiLog.getBzwkdatactnt(), '|');
+			body = StringUtils.substringBeforeLast(body, "|");
+
+			apiMessageLogDTO.setBody(body);
+			apiMessageLogDTOs.add(apiMessageLogDTO);
+		}
+
+		Map<Integer, HttpAdapterExtraLog> extraLogs = httpAdapterExtraLogService.findByGuid(apiServiceNumber);
+		for (ApiMessageLogDTO apiMessageLogDTO : apiMessageLogDTOs) {
+			HttpAdapterExtraLog httpAdapterExtraLog = extraLogs.get(apiMessageLogDTO.getProcessNumber());
+
+			apiMessageLogDTO.setHeader(httpAdapterExtraLog.getHeaderContent());
+			apiMessageLogDTO.setMethod(httpAdapterExtraLog.getHttpMethod());
+			apiMessageLogDTO.setHttpStatus(httpAdapterExtraLog.getHttpStatus());
+			apiMessageLogDTO.setUrl(httpAdapterExtraLog.getUrl());
+		}
+
+		// 처리 시간 계산
+		for (int i = 0; i < apiMessageLogDTOs.size(); i++) {
+			ApiMessageLogDTO dto = apiMessageLogDTOs.get(i);
+			EAILog eaiLog = eaiLogs.get(i);
+
+			// msgprcssyms - msgdpstyms
+			long receivedTime = CommonUtil.getCalendar(eaiLog.getId().getMsgdpstyms()).getTimeInMillis();
+			long processedTime = CommonUtil.getCalendar(eaiLog.getMsgprcssyms()).getTimeInMillis();
+			long processingTime = processedTime - receivedTime;
+			dto.setProcessingTime(processingTime);
+		}
+
+		// 전체 처리 시간 계산 (첫 수신 시각 ~ 마지막 처리 시각)
+		if (!eaiLogs.isEmpty()) {
+			long firstReceivedTime = CommonUtil.getCalendar(eaiLogs.get(0).getId().getMsgdpstyms()).getTimeInMillis();
+			long lastProcessedTime = CommonUtil.getCalendar(eaiLogs.get(eaiLogs.size() - 1).getMsgprcssyms()).getTimeInMillis();
+			long totalProcessingTime = lastProcessedTime - firstReceivedTime;
+			apiLogDTO.setTotalProcessingTime(totalProcessingTime);
+		}
+
+		apiLogDTO.setLogs(apiMessageLogDTOs);
+		return apiLogDTO;
+	}

 }
@@ -1,16 +1,28 @@
 package com.eactive.eai.rms.data.entity.onl.logger;

+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
 import javax.transaction.Transactional;

 import org.springframework.stereotype.Service;

 import com.eactive.eai.data.entity.onl.logger.HttpAdapterExtraLog;
 import com.eactive.eai.data.entity.onl.logger.HttpAdapterExtraLogId;
+import com.eactive.eai.data.entity.onl.logger.QHttpAdapterExtraLog;
 import com.eactive.eai.data.jpa.AbstractDataService;
+import com.querydsl.core.types.dsl.BooleanExpression;

@Service
@Transactional
 public class HttpAdapterExtraLogService
 		extends AbstractDataService<HttpAdapterExtraLog, HttpAdapterExtraLogId, HttpAdapterExtraLogRepository> {

+	public Map<Integer, HttpAdapterExtraLog> findByGuid(String guid) {
+		BooleanExpression predicate = QHttpAdapterExtraLog.httpAdapterExtraLog.id.guid.eq(guid);
+		return StreamSupport.stream(repository.findAll(predicate).spliterator(), false)
+				.collect(Collectors.toMap(log -> log.getId().getServiceProcessNumber(), log -> log));
+	}
+
 }
@@ -0,0 +1,17 @@
+package com.eactive.ext.kjb.web;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ApiLogUI {
+
+	private String apiServiceNumber;
+
+	private String txDate;
+
+	private List<ApiMessageLogUI> logs;
+
+	private Long totalProcessingTime;
+}
@@ -0,0 +1,35 @@
+package com.eactive.ext.kjb.web;
+
+import java.util.Map;
+
+import lombok.Data;
+
+@Data
+public class ApiMessageLogUI {
+
+	private String apiServiceNumber;
+
+	private int processNumber;
+
+	private String txDate;
+
+	private String url;
+
+	private String queryString;
+
+	private String clientId;
+
+	private String method;
+
+	private Integer HttpStatus;
+
+	private Map<String, String> header;
+
+	private Object body;
+
+	private String exdata;
+
+	private Long processingTime;
+
+	private String guid;
+}
@@ -0,0 +1,142 @@
+package com.eactive.ext.kjb.web;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.eactive.eai.rms.common.datasource.DataSourceContextHolder;
+import com.eactive.eai.rms.common.datasource.DataSourceTypeManager;
+import com.eactive.eai.rms.common.interceptor.InterceptorSkipController;
+import com.eactive.eai.rms.data.entity.onl.logger.ApiLogDTO;
+import com.eactive.eai.rms.data.entity.onl.logger.ApiMessageLogDTO;
+import com.eactive.eai.rms.data.entity.onl.logger.EAILogService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+public class ApiTransactionLogController implements InterceptorSkipController {
+
+	private final EAILogService eaiLogService;
+	private final ObjectMapper objectMapper = new ObjectMapper();
+
+	@GetMapping("/api/transaction/log.do")
+	@PostMapping("/api/transaction/log.do")
+	public ResponseEntity<ApiLogUI> getApiLog(String txDate, String apiServiceNumber) {
+		DataSourceContextHolder.setDataSourceType(DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW));
+
+		// txDate가 없으면 오늘 날짜 설정
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		LocalDate searchDate;
+		if (StringUtils.hasText(txDate)) {
+			searchDate = LocalDate.parse(txDate, formatter);
+		} else {
+			searchDate = LocalDate.now();
+		}
+
+		// 최대 10일 전까지 조회 시도
+		ApiLogDTO dto = null;
+		for (int i = 0; i < 10; i++) {
+			String searchDateStr = searchDate.format(formatter);
+			dto = eaiLogService.getApiLog(searchDateStr, apiServiceNumber);
+
+			// 결과가 있으면 종료
+			if (dto != null && dto.getLogs() != null && !dto.getLogs().isEmpty()) {
+				break;
+			}
+
+			// 하루 전으로 이동
+			searchDate = searchDate.minusDays(1);
+		}
+
+		return ResponseEntity.ok(convertToUI(dto));
+	}
+
+	private ApiLogUI convertToUI(ApiLogDTO dto) {
+		ApiLogUI ui = new ApiLogUI();
+		ui.setApiServiceNumber(dto.getApiServiceNumber());
+		ui.setTxDate(dto.getTxDate());
+		ui.setTotalProcessingTime(dto.getTotalProcessingTime());
+
+		if (dto.getLogs() != null) {
+			List<ApiMessageLogUI> uiLogs = dto.getLogs().stream().map(this::convertMessageToUI)
+					.collect(Collectors.toList());
+			ui.setLogs(uiLogs);
+		}
+
+		return ui;
+	}
+
+	private ApiMessageLogUI convertMessageToUI(ApiMessageLogDTO dto) {
+		ApiMessageLogUI ui = new ApiMessageLogUI();
+		ui.setApiServiceNumber(dto.getApiServiceNumber());
+		ui.setProcessNumber(dto.getProcessNumber());
+		ui.setTxDate(dto.getTxDate());
+		ui.setUrl(dto.getUrl());
+		ui.setQueryString(dto.getQueryString());
+		ui.setClientId(dto.getClientId());
+		ui.setMethod(dto.getMethod());
+		ui.setHttpStatus(dto.getHttpStatus());
+		ui.setExdata(dto.getExdata());
+		ui.setProcessingTime(dto.getProcessingTime());
+		ui.setGuid(dto.getKeymgtmsgctnt());
+
+		// header: JSON 문자열 → Map<String, String>
+		if (dto.getHeader() != null) {
+			try {
+				List<Map<String, String>> headerList = objectMapper.readValue(dto.getHeader(),
+						new TypeReference<List<Map<String, String>>>() {
+						});
+
+				Map<String, String> headerMap = new HashMap<>();
+				for (Map<String, String> headerItem : headerList) {
+					String name = headerItem.get("name");
+					String value = headerItem.get("value");
+					if (name != null) {
+						headerMap.put(name, value);
+					}
+				}
+
+				// header에서 client*id 패턴 추출 (정규식, ignoreCase)
+				for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+					if (entry.getKey() != null && entry.getKey().matches("(?i)client.*id")) {
+						ui.setClientId(entry.getValue());
+						break;
+					}
+				}
+
+				ui.setHeader(headerMap);
+			} catch (Exception e) {
+				log.error("Failed to parse header JSON: {}", dto.getHeader(), e);
+			}
+		}
+
+		// body: JSON 문자열 → Object
+		if (dto.getBody() != null) {
+			try {
+				Object bodyObject = objectMapper.readValue(dto.getBody(), Object.class);
+				ui.setBody(bodyObject);
+			} catch (Exception e) {
+				// JSON 파싱 실패 시 원본 문자열 사용
+				ui.setBody(dto.getBody());
+			}
+		}
+
+		return ui;
+	}
+
+}
@@ -0,0 +1 @@
+package com.eactive.ext.kjb.web;