Merge branch 'features/ui-improvements' into jenkins_with_weblogic
This commit is contained in:
daekuk
@@ -657,7 +657,8 @@ public class TransactionBAPServiceImpl extends BaseService implements Transactio
|
||||
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
|
||||
|
||||
String json = mapper.writeValueAsString(interfaceDeploy);
|
||||
System.out.println(json);
|
||||
// System.out.println(json);
|
||||
logger.debug(json);
|
||||
|
||||
FileWriteUtil.FileWrite(path , fileName+".txt", json, "UTF-8");
|
||||
}
|
||||
|
||||
@@ -61,7 +61,8 @@ public class BapSystemInstService extends BapBaseService {
|
||||
List<Map<String, Object>> sysConnList = dao.selectDetailSysconn(param);
|
||||
HashMap<String, Object> map = new HashMap<String, Object>();
|
||||
|
||||
System.out.println( "list-->" + list.size());
|
||||
// System.out.println( "list-->" + list.size());
|
||||
logger.debug( "list-->" + list.size());
|
||||
map.put("detail", detail);
|
||||
map.put("rows", list);
|
||||
map.put("sysConnList", sysConnList);
|
||||
|
||||
@@ -199,7 +199,7 @@ public class TempController implements InterceptorSkipController {
|
||||
result = "success";
|
||||
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
// System.out.println(e);
|
||||
result = e.getMessage();
|
||||
}
|
||||
|
||||
|
||||
@@ -191,13 +191,13 @@ public class AdapterInfosManager {
|
||||
|
||||
public String toString() {
|
||||
|
||||
System.out.println("---------------- Display START -------------------");
|
||||
// System.out.println("---------------- Display START -------------------");
|
||||
Collection<AdapterInfosVO> coll = AdapterInfosManager.adaptersMap.values();
|
||||
Iterator<AdapterInfosVO> iter = coll.iterator();
|
||||
|
||||
while (iter.hasNext()) {
|
||||
AdapterInfosVO tempVO = iter.next();
|
||||
System.out.println(tempVO.toString());
|
||||
// System.out.println(tempVO.toString());
|
||||
}
|
||||
|
||||
return new String("---------------- Display END -------------------" );
|
||||
@@ -254,7 +254,7 @@ public class AdapterInfosManager {
|
||||
+ "\n AND B.PRPTYGROUPNAME = TAB5.PRPTYGROUPNAME "
|
||||
+ "\n ORDER BY 1, 3, 4 "
|
||||
+ "\n WITH UR";
|
||||
System.out.println(SqlString);
|
||||
// System.out.println(SqlString);
|
||||
return SqlString;
|
||||
}
|
||||
|
||||
|
||||
+8
-12
@@ -223,10 +223,6 @@ public class ModernDashboardController implements InterceptorSkipController {
|
||||
@RequestMapping(path = "/modern-dashboard-api.do", params = "type=adapter-status")
|
||||
@ResponseBody
|
||||
public Map<String, Object> getAdapterStatus(@RequestParam(required = false) String serverName) {
|
||||
// TODO: 디버그 완료 후 삭제
|
||||
System.out.println("========================================");
|
||||
System.out.println("[Dashboard Debug] getAdapterStatus API CALLED!");
|
||||
System.out.println("========================================");
|
||||
log.error("[Dashboard Debug] getAdapterStatus API CALLED - serverName: " + serverName);
|
||||
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
@@ -254,26 +250,26 @@ public class ModernDashboardController implements InterceptorSkipController {
|
||||
|
||||
// TODO: 디버그 완료 후 아래 디버그 로그 전체 삭제 (라인 254-299)
|
||||
// [Dashboard Debug] Check server list size
|
||||
System.out.println("[Dashboard Debug] getAdapterStatus: Found " + (servers == null ? 0 : servers.size()) + " servers to check.");
|
||||
// System.out.println("[Dashboard Debug] getAdapterStatus: Found " + (servers == null ? 0 : servers.size()) + " servers to check.");
|
||||
log.error("[Dashboard Debug] getAdapterStatus: Found " + (servers == null ? 0 : servers.size()) + " servers to check.");
|
||||
|
||||
List<Map<String, Object>> serverAdapters = new ArrayList<>();
|
||||
|
||||
for (DataSourceType server : servers) {
|
||||
System.out.println("[Dashboard Debug] Loop for server: " + server.getName());
|
||||
// System.out.println("[Dashboard Debug] Loop for server: " + server.getName());
|
||||
log.error("[Dashboard Debug] Loop for server: " + server.getName());
|
||||
// 서버 컨텍스트 설정
|
||||
DataSourceContextHolder.setDataSourceType(server);
|
||||
|
||||
// 서버에 대한 인스턴스 목록 조회
|
||||
System.out.println("[Dashboard Debug] Calling getEaiServerIpListDB...");
|
||||
// System.out.println("[Dashboard Debug] Calling getEaiServerIpListDB...");
|
||||
List<Map<String, String>> ipList = eaiServerInfoService.getEaiServerIpListDB();
|
||||
System.out.println("[Dashboard Debug] Call to getEaiServerIpListDB finished. IP list size: " + (ipList == null ? 0 : ipList.size()));
|
||||
// System.out.println("[Dashboard Debug] Call to getEaiServerIpListDB finished. IP list size: " + (ipList == null ? 0 : ipList.size()));
|
||||
log.error("[Dashboard Debug] Call to getEaiServerIpListDB finished. IP list size: " + (ipList == null ? 0 : ipList.size()));
|
||||
|
||||
// 어댑터 상태 목록 조회 (개별 인스턴스별 상태)
|
||||
List<AdaptersVO> adaptersList = dashboardService.findAdapterStatusList(ipList);
|
||||
System.out.println("[Dashboard Debug] adaptersList size: " + (adaptersList == null ? "null" : adaptersList.size()));
|
||||
// System.out.println("[Dashboard Debug] adaptersList size: " + (adaptersList == null ? "null" : adaptersList.size()));
|
||||
log.error("[Dashboard Debug] adaptersList size: " + (adaptersList == null ? "null" : adaptersList.size()));
|
||||
|
||||
// 어댑터별 상태 코드 로깅
|
||||
@@ -288,7 +284,7 @@ public class ModernDashboardController implements InterceptorSkipController {
|
||||
", Socket counts: [" + vo.getSocket(0) + "," + vo.getSocket(1) + "," + vo.getSocket(2) + "]" +
|
||||
", Socket2 counts: [" + vo.getSocket2(0) + "," + vo.getSocket2(1) + "," + vo.getSocket2(2) + "]" +
|
||||
", Http counts: [" + vo.getHttp(0) + "," + vo.getHttp(1) + "," + vo.getHttp(2) + "]";
|
||||
System.out.println(debugMsg);
|
||||
// System.out.println(debugMsg);
|
||||
log.error(debugMsg);
|
||||
}
|
||||
}
|
||||
@@ -305,8 +301,8 @@ public class ModernDashboardController implements InterceptorSkipController {
|
||||
", normal=" + summaryContainer.getAdapterSummary("HTTP").getNormalCount() +
|
||||
", inactive=" + summaryContainer.getAdapterSummary("HTTP").getInactiveCount() +
|
||||
", overall=" + summaryContainer.getAdapterSummary("HTTP").getOverallStatus();
|
||||
System.out.println(socketSummary);
|
||||
System.out.println(httpSummary);
|
||||
// System.out.println(socketSummary);
|
||||
// System.out.println(httpSummary);
|
||||
log.error(socketSummary);
|
||||
log.error(httpSummary);
|
||||
// TODO: 여기까지 디버그 로그 삭제
|
||||
|
||||
+31
-11
@@ -2,6 +2,8 @@ package com.eactive.eai.rms.onl.dashboard.modern.mapper;
|
||||
|
||||
import com.eactive.eai.rms.onl.dashboard.modern.dto.SmsNotificationDto;
|
||||
import com.eactive.eai.rms.onl.vo.SmsVO;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -21,6 +23,9 @@ public class SmsNotificationMapper {
|
||||
|
||||
private static final Pattern DATE_TIME_PATTERN = Pattern.compile("(\\d{4}) (\\d{2}:\\d{2}:\\d{2}\\.\\d{3})");
|
||||
private static final Pattern COUNT_PATTERN = Pattern.compile("\\[(\\d+)\\]");
|
||||
|
||||
// Sysout --> logger
|
||||
private static final Logger logger = Logger.getLogger(SmsNotificationMapper.class);
|
||||
|
||||
/**
|
||||
* SmsVO 목록을 SmsNotificationDto 목록으로 변환합니다.
|
||||
@@ -148,22 +153,37 @@ public class SmsNotificationMapper {
|
||||
smsVO.setMessage(messages);
|
||||
List<SmsNotificationDto> results = mapper.mapToSmsNotificationDtoList(Arrays.asList(smsVO));
|
||||
|
||||
System.out.println("=== SMS 메시지 파싱 결과 ===");
|
||||
// System.out.println("=== SMS 메시지 파싱 결과 ===");
|
||||
logger.debug("=== SMS 메시지 파싱 결과 ===");
|
||||
for (SmsNotificationDto dto : results) {
|
||||
System.out.println("\n[메시지 정보]");
|
||||
System.out.println("시간: " + dto.getDateTime());
|
||||
System.out.println("건수: " + dto.getCount());
|
||||
System.out.println("인스턴스: " + dto.getInstanceName());
|
||||
System.out.println("에러내용: " + dto.getErrorContent());
|
||||
System.out.println("에러유형: " + dto.getErrorType());
|
||||
// System.out.println("\n[메시지 정보]");
|
||||
// System.out.println("시간: " + dto.getDateTime());
|
||||
// System.out.println("건수: " + dto.getCount());
|
||||
// System.out.println("인스턴스: " + dto.getInstanceName());
|
||||
// System.out.println("에러내용: " + dto.getErrorContent());
|
||||
// System.out.println("에러유형: " + dto.getErrorType());
|
||||
|
||||
logger.debug("\n[메시지 정보]");
|
||||
logger.debug("시간: " + dto.getDateTime());
|
||||
logger.debug("건수: " + dto.getCount());
|
||||
logger.debug("인스턴스: " + dto.getInstanceName());
|
||||
logger.debug("에러내용: " + dto.getErrorContent());
|
||||
logger.debug("에러유형: " + dto.getErrorType());
|
||||
|
||||
if ("ADAPTER".equals(dto.getErrorType())) {
|
||||
System.out.println("어댑터설명: " + dto.getAdapterDesc());
|
||||
System.out.println("어댑터ID: " + dto.getAdapterId());
|
||||
// System.out.println("어댑터설명: " + dto.getAdapterDesc());
|
||||
// System.out.println("어댑터ID: " + dto.getAdapterId());
|
||||
|
||||
logger.debug("어댑터설명: " + dto.getAdapterDesc());
|
||||
logger.debug("어댑터ID: " + dto.getAdapterId());
|
||||
} else {
|
||||
System.out.println("인터페이스ID: " + dto.getInterfaceId());
|
||||
// System.out.println("인터페이스ID: " + dto.getInterfaceId());
|
||||
|
||||
logger.debug("인터페이스ID: " + dto.getInterfaceId());
|
||||
}
|
||||
System.out.println("------------------------");
|
||||
// System.out.println("------------------------");
|
||||
|
||||
logger.debug("------------------------");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user