Typed 서킷브레이커 관리화면 추가
This commit is contained in:
curry772
+8
@@ -0,0 +1,8 @@
|
||||
package com.eactive.eai.rms.data.entity.onl.circuitbreaker;
|
||||
|
||||
import com.eactive.eai.data.entity.onl.circuitbreaker.CircuitBreakerConfig;
|
||||
import com.eactive.eai.data.jpa.BaseRepository;
|
||||
|
||||
public interface CircuitBreakerRepository extends BaseRepository<CircuitBreakerConfig, String> {
|
||||
|
||||
}
|
||||
+94
@@ -0,0 +1,94 @@
|
||||
package com.eactive.eai.rms.data.entity.onl.circuitbreaker;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.persistence.EntityManager;
|
||||
import javax.persistence.PersistenceContext;
|
||||
|
||||
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.stereotype.Service;
|
||||
|
||||
import com.eactive.eai.data.entity.onl.circuitbreaker.CircuitBreakerConfig;
|
||||
import com.eactive.eai.data.entity.onl.circuitbreaker.QCircuitBreakerConfig;
|
||||
import com.eactive.eai.data.entity.onl.message.QEAIMessageEntity;
|
||||
import com.eactive.eai.data.jpa.AbstractDataService;
|
||||
import com.eactive.eai.rms.onl.manage.circuitbreaker.CircuitBreakerManMapper;
|
||||
import com.querydsl.core.Tuple;
|
||||
import com.querydsl.jpa.impl.JPAQueryFactory;
|
||||
|
||||
@Service
|
||||
public class CircuitBreakerService extends AbstractDataService<CircuitBreakerConfig, String, CircuitBreakerRepository> {
|
||||
|
||||
public static final String APIID_TYPE = "01";
|
||||
|
||||
@PersistenceContext
|
||||
EntityManager entityManager;
|
||||
|
||||
@Autowired
|
||||
CircuitBreakerManMapper mapper;
|
||||
|
||||
public Page<CircuitBreakerServiceDto> findAllForInterface(Pageable pageable, String searchName) {
|
||||
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
|
||||
QCircuitBreakerConfig qCircuitBreakerConfig = QCircuitBreakerConfig.circuitBreakerConfig;
|
||||
QEAIMessageEntity qEAIMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
||||
|
||||
List<Tuple> tupleList = jpaQueryFactory
|
||||
.select(qCircuitBreakerConfig, qEAIMessageEntity.eaisvcname, qEAIMessageEntity.eaisvcdesc)
|
||||
.from(qEAIMessageEntity)
|
||||
.leftJoin(qCircuitBreakerConfig)
|
||||
.on(qCircuitBreakerConfig.cbreakerType.eq(APIID_TYPE).and(qCircuitBreakerConfig.cbreakerName.eq(qEAIMessageEntity.eaisvcname)))
|
||||
.where(qEAIMessageEntity.eaisvcname.contains(searchName))
|
||||
.orderBy(qEAIMessageEntity.eaisvcname.asc())
|
||||
.offset(pageable.getOffset())
|
||||
.limit(pageable.getPageSize())
|
||||
.fetch();
|
||||
|
||||
List<CircuitBreakerServiceDto> dtoList = tupleList
|
||||
.stream()
|
||||
.map(tuple -> toDto(qEAIMessageEntity, qCircuitBreakerConfig, tuple))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
long totalCount = jpaQueryFactory
|
||||
.select(qEAIMessageEntity.eaisvcname.count())
|
||||
.from(qEAIMessageEntity)
|
||||
.where(qEAIMessageEntity.eaisvcname.contains(searchName))
|
||||
.fetchOne();
|
||||
return new PageImpl<>(dtoList, pageable, totalCount);
|
||||
}
|
||||
|
||||
private CircuitBreakerServiceDto toDto(QEAIMessageEntity qEAIMessageEntity, QCircuitBreakerConfig qCircuitBreakerConfig,
|
||||
Tuple tuple) {
|
||||
CircuitBreakerServiceDto dto = null;
|
||||
if (tuple.get(qCircuitBreakerConfig) != null)
|
||||
dto = mapper.toDto(tuple.get(qCircuitBreakerConfig));
|
||||
else {
|
||||
dto = new CircuitBreakerServiceDto();
|
||||
dto.setCbreakerName(tuple.get(qEAIMessageEntity.eaisvcname));
|
||||
dto.setCbreakerType(APIID_TYPE);
|
||||
dto.setUseYn("0");//사용안함
|
||||
}
|
||||
dto.setCbreakerDesc(tuple.get(qEAIMessageEntity.eaisvcdesc));
|
||||
return dto;
|
||||
}
|
||||
|
||||
public CircuitBreakerServiceDto findByIdForInterface(String eaisvcname) {
|
||||
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
|
||||
QCircuitBreakerConfig qCircuitBreakerConfig = QCircuitBreakerConfig.circuitBreakerConfig;
|
||||
QEAIMessageEntity qEAIMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
||||
|
||||
Tuple tuple = jpaQueryFactory
|
||||
.select(qCircuitBreakerConfig, qEAIMessageEntity.eaisvcname, qEAIMessageEntity.eaisvcdesc)
|
||||
.from(qEAIMessageEntity)
|
||||
.leftJoin(qCircuitBreakerConfig)
|
||||
.on(qCircuitBreakerConfig.cbreakerType.eq(APIID_TYPE).and(qCircuitBreakerConfig.cbreakerName.eq(qEAIMessageEntity.eaisvcname)))
|
||||
.where(qEAIMessageEntity.eaisvcname.eq(eaisvcname))
|
||||
.fetchOne();
|
||||
|
||||
return toDto(qEAIMessageEntity, qCircuitBreakerConfig, tuple);
|
||||
}
|
||||
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.eactive.eai.rms.data.entity.onl.circuitbreaker;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CircuitBreakerServiceDto {
|
||||
|
||||
private String cbreakerId;
|
||||
|
||||
String cbreakerType;
|
||||
|
||||
String cbreakerName;
|
||||
|
||||
String cbreakerDesc;
|
||||
|
||||
int failureRateThreshold;
|
||||
|
||||
int slidingWindowSize;
|
||||
|
||||
int minimumNumberOfCalls;
|
||||
|
||||
int waitDurationInOpenState;
|
||||
|
||||
int permittedNumberOfCallsInHalfOpenState;
|
||||
|
||||
int slowCallRateThreshold;
|
||||
|
||||
int slowCallDurationThreshold;
|
||||
|
||||
String useYn;
|
||||
|
||||
}
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
package com.eactive.eai.rms.onl.manage.circuitbreaker;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.eactive.eai.agent.command.CommonCommand;
|
||||
import com.eactive.eai.rms.common.base.OnlBaseAnnotationController;
|
||||
import com.eactive.eai.rms.common.combo.ComboService;
|
||||
import com.eactive.eai.rms.common.combo.ComboVo;
|
||||
import com.eactive.eai.rms.common.vo.GridResponse;
|
||||
|
||||
@Controller
|
||||
public class CircuitBreakerInterfaceManController extends OnlBaseAnnotationController {
|
||||
|
||||
@Autowired
|
||||
private CircuitBreakerManService service;
|
||||
|
||||
@Autowired
|
||||
private ComboService comboService;
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.view")
|
||||
public String viewList() {
|
||||
return "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan";
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.view", params = "cmd=DETAIL")
|
||||
public String viewDetail() {
|
||||
return "/onl/admin/circuitbreaker/circuitBreakerInterfaceManDetail";
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.json", params = "cmd=LIST")
|
||||
public ResponseEntity<GridResponse<CircuitBreakerManUI>> selectList(HttpServletRequest request, Pageable pageVo,
|
||||
String searchName) {
|
||||
Page<CircuitBreakerManUI> uiPage = service.selectList(pageVo, searchName);
|
||||
return ResponseEntity.ok(new GridResponse<>(uiPage));
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.json", params = "cmd=DETAIL")
|
||||
public ResponseEntity<CircuitBreakerManUI> selectDetail(HttpServletRequest request, HttpServletResponse response,
|
||||
String name) {
|
||||
CircuitBreakerManUI ui = service.selectDetail(name);
|
||||
return ResponseEntity.ok(ui);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.json", params = "cmd=UPDATE")
|
||||
public String save(HttpServletRequest request, HttpServletResponse response, CircuitBreakerManUI ui)
|
||||
throws Exception {
|
||||
String modifiedBy = getSessionUserId(request);
|
||||
ui.setModifiedBy(modifiedBy);
|
||||
ui.setModifiedAt(LocalDateTime.now());
|
||||
service.merge(ui);
|
||||
CommonCommand command = new CommonCommand("com.eactive.eai.agent.circuitBreaker.type.ReloadTypedCircuitBreakerCommand",
|
||||
ui.getCbreakerId());
|
||||
agentUtilService.broadcast(command);
|
||||
return null;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.json", params = "cmd=DELETE")
|
||||
public String delete(HttpServletRequest request, HttpServletResponse response, CircuitBreakerManUI ui) throws Exception {
|
||||
service.delete(ui.getCbreakerId());
|
||||
CommonCommand command = new CommonCommand("com.eactive.eai.agent.circuitBreaker.type.ReloadTypedCircuitBreakerCommand",
|
||||
ui.getCbreakerId());
|
||||
agentUtilService.broadcast(command);
|
||||
return null;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/onl/admin/circuitbreaker/circuitBreakerInterfaceMan.json", params = "cmd=LIST_INIT_COMBO")
|
||||
public ModelAndView initCombo(HttpServletRequest request, HttpServletResponse response) {
|
||||
List<ComboVo> useYnRows = comboService.getFromCode("USE_YN");
|
||||
Map<String, List<ComboVo>> resultMap = new HashMap<>();
|
||||
resultMap.put("useYnRows", useYnRows);
|
||||
return new ModelAndView("jsonView", resultMap);
|
||||
}
|
||||
|
||||
/**
|
||||
* 세션에서 사용자 ID 조회
|
||||
*/
|
||||
private String getSessionUserId(HttpServletRequest request) {
|
||||
Object userId = request.getSession().getAttribute("userId");
|
||||
return userId != null ? userId.toString() : "SYSTEM";
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.eactive.eai.rms.onl.manage.circuitbreaker;
|
||||
|
||||
import org.mapstruct.BeanMapping;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.MappingTarget;
|
||||
import org.mapstruct.NullValuePropertyMappingStrategy;
|
||||
import org.mapstruct.ReportingPolicy;
|
||||
|
||||
import com.eactive.eai.data.entity.onl.circuitbreaker.CircuitBreakerConfig;
|
||||
import com.eactive.eai.data.mapper.GenericMapper;
|
||||
import com.eactive.eai.rms.data.entity.onl.circuitbreaker.CircuitBreakerServiceDto;
|
||||
|
||||
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
|
||||
public interface CircuitBreakerManMapper extends GenericMapper<CircuitBreakerManUI, CircuitBreakerConfig> {
|
||||
@Override
|
||||
CircuitBreakerManUI toVo(CircuitBreakerConfig entity);
|
||||
|
||||
@Override
|
||||
@InheritInverseConfiguration
|
||||
CircuitBreakerConfig toEntity(CircuitBreakerManUI vo);
|
||||
|
||||
@InheritInverseConfiguration
|
||||
@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
|
||||
void updateToEntity(CircuitBreakerManUI vo, @MappingTarget CircuitBreakerConfig entity);
|
||||
|
||||
CircuitBreakerServiceDto toDto(CircuitBreakerConfig entity);
|
||||
|
||||
CircuitBreakerManUI toVo(CircuitBreakerServiceDto serviceDto);
|
||||
|
||||
}
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package com.eactive.eai.rms.onl.manage.circuitbreaker;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.eactive.eai.data.entity.onl.circuitbreaker.CircuitBreakerConfig;
|
||||
import com.eactive.eai.rms.common.base.BaseService;
|
||||
import com.eactive.eai.rms.common.combo.ComboService;
|
||||
import com.eactive.eai.rms.data.entity.onl.circuitbreaker.CircuitBreakerService;
|
||||
import com.eactive.eai.rms.data.entity.onl.circuitbreaker.CircuitBreakerServiceDto;
|
||||
|
||||
@Service
|
||||
public class CircuitBreakerManService extends BaseService {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("comboService")
|
||||
public ComboService comboService;
|
||||
|
||||
@Autowired
|
||||
private CircuitBreakerService service;
|
||||
|
||||
@Autowired
|
||||
private CircuitBreakerManMapper mapper;
|
||||
|
||||
// 어댑터 유량제어
|
||||
public Page<CircuitBreakerManUI> selectList(Pageable pageable, String searchName) {
|
||||
Page<CircuitBreakerServiceDto> dtoList = service.findAllForInterface(pageable, searchName);
|
||||
return dtoList.map(mapper::toVo);
|
||||
}
|
||||
|
||||
public CircuitBreakerManUI selectDetail(String id) {
|
||||
CircuitBreakerServiceDto dto = service.findByIdForInterface(id);
|
||||
return mapper.toVo(dto);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void merge(CircuitBreakerManUI ui) {
|
||||
ui.setCbreakerType(CircuitBreakerService.APIID_TYPE);
|
||||
Optional<CircuitBreakerConfig> circuitBreakerConfigOptional;
|
||||
if(StringUtils.isNotEmpty(ui.getCbreakerId()))
|
||||
circuitBreakerConfigOptional = service.findById(ui.getCbreakerId());
|
||||
else
|
||||
circuitBreakerConfigOptional = Optional.empty();
|
||||
|
||||
CircuitBreakerConfig entity = null;
|
||||
if (circuitBreakerConfigOptional.isPresent()) {
|
||||
entity = circuitBreakerConfigOptional.get();
|
||||
mapper.updateToEntity(ui, entity);
|
||||
} else {
|
||||
entity = mapper.toEntity(ui);
|
||||
entity.setCbreakerId(null);
|
||||
}
|
||||
entity = service.save(entity);
|
||||
ui.setCbreakerId(entity.getCbreakerId());
|
||||
|
||||
}
|
||||
|
||||
public void delete(String id) {
|
||||
service.deleteById(id);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.eactive.eai.rms.onl.manage.circuitbreaker;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CircuitBreakerManUI {
|
||||
@JsonProperty("CBREAKERID")
|
||||
private String cbreakerId;
|
||||
|
||||
@JsonProperty("CBREAKERTYPE")
|
||||
String cbreakerType;
|
||||
|
||||
@JsonProperty("CBREAKERNAME")
|
||||
String cbreakerName;
|
||||
|
||||
@JsonProperty("CBREAKERDESC")
|
||||
String cbreakerDesc;
|
||||
|
||||
@JsonProperty("FAILURERATETHRESHOLD")
|
||||
Integer failureRateThreshold;
|
||||
|
||||
@JsonProperty("SLIDINGWINDOWSIZE")
|
||||
Integer slidingWindowSize;
|
||||
|
||||
@JsonProperty("MINIMUMNUMBEROFCALLS")
|
||||
Integer minimumNumberOfCalls;
|
||||
|
||||
@JsonProperty("WAITDURATIONINOPENSTATE")
|
||||
Integer waitDurationInOpenState;
|
||||
|
||||
@JsonProperty("PERMITTEDNUMBEROFCALLSINHALFOPENSTATE")
|
||||
Integer permittedNumberOfCallsInHalfOpenState;
|
||||
|
||||
@JsonProperty("SLOWCALLRATETHRESHOLD")
|
||||
Integer slowCallRateThreshold;
|
||||
|
||||
@JsonProperty("SLOWCALLDURATIONTHRESHOLD")
|
||||
Integer slowCallDurationThreshold;
|
||||
|
||||
@JsonProperty("USEYN")
|
||||
String useYn;
|
||||
|
||||
@JsonIgnore
|
||||
String modifiedBy;
|
||||
|
||||
@JsonIgnore
|
||||
LocalDateTime modifiedAt;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user