From a2d725403ea649dc7ac266e50ed0905ee93c2e9b Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 02 12월 2021 18:17:40 +0900
Subject: [PATCH] - api 모니터링 기능 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 77 ++++++++++++--------------------------
1 files changed, 24 insertions(+), 53 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 5e457e9..68b8a8c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -4,6 +4,7 @@
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -123,18 +124,8 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- String Yes = "Y";
- String No = "N";
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
- if(!issueTypeForm.getCompanyYn().equals(No)){
- issueType.setCompanyYn(Yes);
- }
- if(!issueTypeForm.getHostingYn().equals(No)){
- issueType.setHostingYn(Yes);
- }
- if(!issueTypeForm.getIspYn().equals(No)){
- issueType.setIspYn(Yes);
- }
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -205,6 +196,15 @@
return issueTypeVos;
}
+ // �씠�뒋 �쑀�삎 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeVo> findIssueType(IssueTypeCondition condition) {
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ return ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
+ }
+
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
private void setUseIssueTypeByWorkflow(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos) {
@@ -235,26 +235,7 @@
}
}
}
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 ISP �젙蹂대�� �뀑�똿�븳�떎.
- private void setUseIssueTypeByIspField(List<IssueTypeVo> issueTypeVos) {
- for (IssueTypeVo issueTypeVo : issueTypeVos){
- IssueType issueType = this.getIssueType(issueTypeVo.getId());
- IspField ispField = issueType.getIspField();
- if(ispField != null){
- issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
- }
- }
- }
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �샇�뒪�똿 �젙蹂대�� �뀑�똿�븳�떎.
- private void setUseIssueTypeByHostingField(List<IssueTypeVo> issueTypeVos) {
- for (IssueTypeVo issueTypeVo : issueTypeVos){
- IssueType issueType = this.getIssueType(issueTypeVo.getId());
- HostingField hostingField = issueType.getHostingField();
- if(hostingField != null){
- issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
- }
- }
- }*/
+ */
// �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@@ -276,19 +257,17 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0;
- /*CompanyField companyField = issueType.getCompanyField();
- if(companyField != null){
- issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);//3, 1 / 3, 2 / 3, 4
+
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
}
- IspField ispField = issueType.getIspField();
- if (ispField != null){
- issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
- }
- HostingField hostingField = issueType.getHostingField();
- if (hostingField != null){
- issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
- }*/
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -317,21 +296,13 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
+
/*if(issueTypeForm.getCompanyId() != null){
CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
issueType.setCompanyField(companyField);
- }
- if(issueTypeForm.getIspId() != null) {
- IspField ispField = this.ispFieldService.getIsp(issueTypeForm.getIspId());
- issueType.setIspField(ispField);
- }
- if(issueTypeForm.getHostingId() != null) {
- HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
- issueType.setHostingField(hostingField);
}*/
- issueType.setCompanyYn(issueTypeForm.getCompanyYn());
- issueType.setIspYn(issueTypeForm.getIspYn());
- issueType.setHostingYn(issueTypeForm.getHostingYn());
+// issueType.setCompanyYn(issueTypeForm.getCompanyYn());
this.issueTypeRepository.saveAndFlush(issueType);
--
Gitblit v1.8.0