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);