diff --git a/src/main/java/com/eactive/eai/rms/onl/adapter/http/httpStatus/HttpStatusController.java b/src/main/java/com/eactive/eai/rms/onl/adapter/http/httpStatus/HttpStatusController.java index e4a45da..6ca21eb 100644 --- a/src/main/java/com/eactive/eai/rms/onl/adapter/http/httpStatus/HttpStatusController.java +++ b/src/main/java/com/eactive/eai/rms/onl/adapter/http/httpStatus/HttpStatusController.java @@ -104,7 +104,7 @@ public class HttpStatusController extends BaseController { list.removeIf(m -> m.get("adapterGroupSimple") == null || m.get("adapterGroupSimple") == ""); // 어댑터 업무그룹별 정렬 - String[] compareParam = { "adapterGroupName", "eaiSvrInstNm" }; + String[] compareParam = { "adapterStatus", "adapterGroupName", "eaiSvrInstNm" }; MapComparator comp = new MapComparator(compareParam); Collections.sort(list, comp); return ResponseEntity.ok(new GridResponse<>(list)); diff --git a/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketProcessController.java b/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketProcessController.java index e7400ce..29966a1 100644 --- a/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketProcessController.java +++ b/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketProcessController.java @@ -129,8 +129,8 @@ public class SocketProcessController extends BaseController{ pageVo.setTotalCount(list.size()); //어댑터 업무그룹별 정렬 - String[] compareParam = {"AdptrBzwkGroupName","EaiSevrInstncName"}; - + String[] compareParam = {"Status","AdptrBzwkGroupName","EaiSevrInstncName"}; + MapComparator comp = new MapComparator(compareParam); Collections.sort(list,comp); diff --git a/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketStatusController.java b/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketStatusController.java index 1bb219f..c91a1c0 100644 --- a/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketStatusController.java +++ b/src/main/java/com/eactive/eai/rms/onl/adapter/socket/SocketStatusController.java @@ -91,7 +91,7 @@ public class SocketStatusController extends BaseController { List urls = new ArrayList<>(); for (EAIServer serverMap : serverList) { String url = "http://" + serverMap.getEaisevrip() + ":" + serverMap.getSevrlsnportname() - + HostInfomationForm.WEB_AGENT_CONTEXT_PATH + AGENT_PAGE_STATUS + "?adapterType=SOC" + + HostInfomationForm.WEB_AGENT_CONTEXT_PATH + AGENT_PAGE_STATUS + "?adapterType=NET" + "&eaiSvrInstNm=" + serverMap.getEaisevrinstncname(); urls.add(url); logger.debug(url); @@ -120,7 +120,7 @@ public class SocketStatusController extends BaseController { List> list = gUtil.flushXmlToClient(urls); // 어댑터 업무그룹별 정렬 - String[] compareParam = { "AdptrBzwkGroupName", "EaiSevrInstncName", "AdptrBzwkName" }; + String[] compareParam = { "Status", "AdptrBzwkGroupName", "EaiSevrInstncName", "AdptrBzwkName" }; MapComparator comp = new MapComparator(compareParam); Collections.sort(list, comp);