From 96562269394cda606de2553c21af839a4526376f Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 02 12월 2021 21:34:05 +0900 Subject: [PATCH] 이슈 타입에 따라 프로젝트 선택 변경 수정 --- src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java index 934520a..3fb4c81 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java @@ -20,10 +20,7 @@ import kr.wisestone.owl.util.*; import kr.wisestone.owl.util.DateUtil; import kr.wisestone.owl.vo.*; -import kr.wisestone.owl.web.condition.IssueCondition; -import kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition; -import kr.wisestone.owl.web.condition.IssueTypeCustomFieldCondition; -import kr.wisestone.owl.web.condition.ProjectCondition; +import kr.wisestone.owl.web.condition.*; import kr.wisestone.owl.web.form.*; import kr.wisestone.owl.web.view.ExcelView; import org.apache.commons.lang3.StringUtils; @@ -567,6 +564,55 @@ return issueVos; } + + // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎(李⑦듃�슜 - �뿰愿��씪媛먰룷�븿) + @Override + @Transactional(readOnly = true) + public void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData) { + + IssueTypeCondition issueTypeCondition = new IssueTypeCondition(); + List<IssueTypeVo> issueTypes = this.issueTypeService.findIssueType(issueTypeCondition); + + // 媛믪씠 �뾾�쓣 寃쎌슦 珥덇린媛� �엯�젰 + if (StringUtils.isEmpty(apiMonitorCondition.getSearchPeriod())) { + apiMonitorCondition.setSearchPeriod(DateUtil.LAST_SEVEN_DAYS); + } + + // 寃��깋 �씪�옄瑜� 援ы븳�떎. + List<Date> searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod()); + + // �궇吏쒓� 寃��깋�릺吏� �븡�븯�쑝硫� �삤瑜� + if (searchDates.size() < 1) { + throw new OwlRuntimeException( + this.messageAccessor.getMessage(MsgConstants.WIDGET_SEARCH_DATE_NOT_FOUND)); + } + + Long index = 1L; + List<ApiMonitorVo> apiMonitorVos = Lists.newArrayList(); + for (Date date : searchDates) { + + String onlyDate = DateUtil.convertDateToYYYYMMDD(date); + issueTypeCondition.setStartDate(onlyDate + " 00:00:00"); + issueTypeCondition.setEndDate(onlyDate + " 23:59:59"); + + ApiMonitorVo apiMonitorVo = new ApiMonitorVo(); + apiMonitorVo.setId(index); + for (IssueTypeVo issueTypeVo : issueTypes) { + issueTypeCondition.setId(issueTypeVo.getId()); + apiMonitorVo.addIssueTypeCount(this.issueMapper.countByIssueTypeIdAndDate(issueTypeCondition)); + apiMonitorVo.setIsApi(Issue.IS_API_YES); + + apiMonitorVos.add(apiMonitorVo); + } + index++; + } + Map<String, Object> data = new HashMap<>(); + data.put("issueTypeVos", issueTypes); + data.put("apiMonitorVos", apiMonitorVos); + resJsonData.put(Constants.RES_KEY_CONTENTS, data); + } + + // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎(李⑦듃�슜 - �뿰愿��씪媛먰룷�븿) @Override @Transactional(readOnly = true) -- Gitblit v1.8.0