feat: 유량제어 그룹 버킷 분리 및 현황 화면 개선

- CustomGroupBucket 클래스 신규 생성: 초당/추가 임계치를 별도 LocalBucket으로 분리하여 개별 토큰 조회 가능
  - InflowControlManager 수정: groupBucketList 타입을 CustomGroupBucket으로 변경, makeGroupBucket() 메서드 추가
  - InflowGroupBucketService 단순화: 복잡한 리플렉션 로직 제거, CustomGroupBucket 직접 메서드 사용
  - 현황 탭에 전체 인스턴스 합산 요약 추가 (활성 인스턴스 수, 초당/추가 임계치 합산)
  - 추가 임계치 시간단위에서 '초(SEC)' 옵션 제거
  - 저장 완료 후 리스트 화면 이동 제거
This commit is contained in:
daekuk
2025-12-11 11:04:00 +09:00
parent 27fac38c44
commit 10a8918bb6
3 changed files with 362 additions and 5 deletions
@@ -163,6 +163,20 @@ public class InflowGroupControlManController extends OnlBaseAnnotationController
return new ModelAndView("jsonView", resultMap);
}
/**
* 그룹 버킷 상태 조회 (GW 서버별 현황)
*/
@RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=LIST_BUCKET_STATUS")
public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response,
@RequestParam("groupId") String groupId) {
List<Map<String, Object>> statusList = service.getGroupBucketStatus(groupId);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("servers", statusList);
return new ModelAndView("jsonView", resultMap);
}
/**
* JSON 문자열을 인터페이스 목록으로 변환
*/
@@ -1,7 +1,10 @@
package com.eactive.eai.rms.onl.manage.inflow.group;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -9,12 +12,16 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import com.eactive.eai.data.entity.onl.inflow.InflowControlGroup;
import com.eactive.eai.data.entity.onl.inflow.InflowControlGroupMapping;
@@ -24,6 +31,7 @@ import com.eactive.eai.data.entity.onl.message.QEAIMessageEntity;
import com.eactive.eai.rms.common.base.BaseService;
import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlGroupMappingRepository;
import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlGroupRepository;
import com.eactive.eai.rms.onl.common.service.EaiServerInfoService;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.Tuple;
import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -31,6 +39,8 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
@Service
public class InflowGroupControlManService extends BaseService {
private static final Logger logger = LoggerFactory.getLogger(InflowGroupControlManService.class);
@PersistenceContext
EntityManager entityManager;
@@ -43,6 +53,11 @@ public class InflowGroupControlManService extends BaseService {
@Autowired
private InflowGroupControlManMapper mapper;
@Autowired
private EaiServerInfoService eaiServerInfoService;
private RestTemplate restTemplate = new RestTemplate();
/**
* 그룹 목록 조회
*/
@@ -250,4 +265,50 @@ public class InflowGroupControlManService extends BaseService {
return new PageImpl<>(uiList, pageable, totalCount);
}
/**
* 그룹 버킷 상태 조회 (모든 GW 서버에서 수집)
*/
@SuppressWarnings("unchecked")
public List<Map<String, Object>> getGroupBucketStatus(String groupId) {
List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, String>> serverList = eaiServerInfoService.getEaiServerIpList();
for (Map<String, String> server : serverList) {
String serverName = server.get("EAISVRINSTNM");
String serverIp = server.get("EAISVRIP");
String serverPort = server.get("WEBSERVERPORT");
if (StringUtils.isEmpty(serverPort)) {
serverPort = server.get("EAISVRLSNPORT");
}
Map<String, Object> serverStatus = new HashMap<>();
serverStatus.put("serverName", serverName);
serverStatus.put("serverIp", serverIp);
serverStatus.put("serverPort", serverPort);
try {
String url = String.format("http://%s:%s/manage/inflow/group/%s/bucket-status",
serverIp, serverPort, groupId);
ResponseEntity<Map> response = restTemplate.getForEntity(url, Map.class);
if (response.getBody() != null && Boolean.TRUE.equals(response.getBody().get("success"))) {
serverStatus.put("status", "online");
serverStatus.put("data", response.getBody().get("data"));
} else {
serverStatus.put("status", "no_data");
serverStatus.put("message", "그룹이 로드되지 않음");
}
} catch (Exception e) {
logger.warn("버킷 상태 조회 실패 - server: {}, error: {}", serverName, e.getMessage());
serverStatus.put("status", "offline");
serverStatus.put("message", "서버 연결 실패");
}
result.add(serverStatus);
}
return result;
}
}