From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 224 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 139 insertions(+), 85 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 0cf87fe..3a1202a 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;
@@ -373,11 +370,9 @@
projectRoleUserMap.put("statuses", Lists.newArrayList("02")); // 愿�由ъ옄 議고쉶
// 愿�由ъ옄 �젙蹂� �뀑�똿
List<Map<String, Object>> projectRoleUsers = this.projectRoleUserService.findProjectRoleUser(projectRoleUserMap);
-
if (projectRoleUsers != null && !projectRoleUsers.isEmpty()) {
for (Map<String, Object> projectRoleUser : projectRoleUsers) {
UserVo userVo = ConvertUtil.convertMapToClass(projectRoleUser, UserVo.class);
-
// �씠�뒋 �깮�꽦 �븣由� 硫붿씪 �쟾�넚
this.systemEmailService.reservationEmail(new String[]{userVo.getAccount()}, emailType, issueMap);
}
@@ -408,7 +403,7 @@
departsBuilder.append(issueDepartment.getDepartment().getDepartmentName());
departsBuilder.append("\n");
}
- issueMap.put("departsBuilder", departsBuilder.toString());
+ issueMap.put("departments", departsBuilder.toString());
// 湲곌컙
if (!StringUtils.isEmpty(issue.getStartDate())) {
@@ -559,6 +554,8 @@
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
this.setMapToIssueVo(results, issueVos, issueCondition);
+ this.setCountDownIssues(results, issueVos);
+
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -567,6 +564,76 @@
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_FIND));
return issueVos;
}
+
+ private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
+ for (Map<String, Object> result : results){
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //�븯�쐞�씠�뒋 媛��졇�삤湲�
+ if(downIssues != null && downIssues.size() > 0){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
+ for(Issue downIssue : downIssues){
+ Long parentIssueId = downIssue.getParentIssue().getId();
+ int downIssueCount = 1;
+ Issue parentIssue = this.getIssue(parentIssueId);
+ IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
+ parentIssueVo.setDownIssueCount(downIssueCount);
+
+ for(IssueVo issueVo : issueVos){
+ if(issueVo.getId().equals(parentIssueVo.getId())){
+ issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎(李⑦듃�슜 - �뿰愿��씪媛먰룷�븿)
+ @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
@@ -1819,6 +1886,10 @@
for(IssueIsp issueIsp : issue.getIssueIspFields()){
IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp, IssueIspVo.class);
issueIspVo.setId(issueIsp.getId());
+ IspField ispField = issueIsp.getIspField();
+ if (ispField != null) {
+ issueIspVo.setIspId(ispField.getId());
+ }
issueIspVos.add(issueIspVo);
}
issueVo.setIssueIspVos(issueIspVos);
@@ -1831,6 +1902,11 @@
for(IssueHosting issueHosting : issue.getIssueHostingFields()){
IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting, IssueHostingVo.class);
issueHostingVo.setId(issueHosting.getId());
+ HostingField hostingField = issueHosting.getHostingField();
+ if (hostingField != null) {
+ issueHostingVo.setHostingId(hostingField.getId());
+ }
+
issueHostingVos.add(issueHostingVo);
}
issueVo.setIssueHostingVos(issueHostingVos);
@@ -1889,15 +1965,11 @@
result.put("customField_" + issueCustomFieldValueVo.getCustomFieldVo().getId().toString(), useValue + ", " + issueCustomFieldValueVo.getUseValue());
}
}
-
- //�뾽泥�, ISP, �샇�뒪�똿 異붽�
-
results.add(result);
} catch (Exception e) {
log.error("�뿊�� �떎�슫濡쒕뱶 �삤瑜� 諛쒖깮");
}
}
-
return results;
}
@@ -2591,6 +2663,9 @@
if (issueForm.getSendEmails().size() < 1) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
+ }else if (issueForm.getTemplate() != null){
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SELECT_TEMPLATE));
}
Issue issue = this.getIssue(issueForm.getId());
@@ -2612,8 +2687,52 @@
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
-
this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
+ }
+
+ // �씠�뒋瑜� �뀥�뵆由우뿉 �뵲�씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 硫붿씪濡� 諛쒖넚�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void sendIssueEmailPartners(IssueForm issueForm) {
+ if (issueForm.getSendEmails().size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
+ }else if (issueForm.getTemplate() == null){
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SELECT_TEMPLATE));
+ }
+
+ Issue issue = this.getIssue(issueForm.getId());
+
+ Map<String, Object> issueMap = new HashMap<>();
+ // �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
+ this.makeIssueMapToIssue(issue, issueMap);
+ // 諛쒖떊�옄 �몴�떆
+ UserVo toUser = this.webAppUtil.getLoginUser();
+ issueMap.put("toUser", toUser.getName() + "(" + CommonUtil.decryptAES128(toUser.getAccount()) + ")");
+
+ // �씠�뒋 留곹겕
+ String projectKey = issue.getProject().getProjectKey();
+ Long IssueNumber = issue.getIssueNumber();
+ String link = this.configuration.getEmailSendUrl() + "/#/issues/issueList?projectKey=" + projectKey + "&issueNumber=" + IssueNumber.toString();
+
+ issueMap.put("issueLink", link);
+ issueMap.put("projectLink", link);
+
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
+ StringBuilder sb = new StringBuilder();
+
+ if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_1.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_1, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_2.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_2, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_3.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_3, issueMap, null);
+ }
+ //硫붿씪 �쟾�넚 �씠�젰 �궓湲곌린
+ this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, issueForm, sb);
+ this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
}
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@@ -2785,13 +2904,17 @@
@Override
public void modifyParentIssue(IssueForm issueDownForm) {
Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
- Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
-
Long newParentIssueId = issueDownForm.getParentIssueId(); //蹂�寃쏀븷 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+
StringBuilder sb = new StringBuilder();
+ Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+ if(parentIssue != null){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
+ }
+
if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
- // todo �씠�쟾 �븯�쐞 �씪媛� �엳�뒪�넗由ш린濡� �븘�슂
parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
@@ -2820,73 +2943,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
}
-
- /*@Override
- @Transactional
- public void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable) {
- IssueVo issueVo = new IssueVo();
- //Long issueId = MapUtil.getLong(params, "issueId");
- Long issueId = condition.getId();
-
- List<String> emailList = Lists.newArrayList();
-
- if(issueId != null){
- Issue issue = this.getIssue(issueId);
- issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
- this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
- this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
- this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
- for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
- emailList.add(issueCompanyVo.getEmail());
- }
- for(IssueIspVo issueIspVo : issueVo.getIssueIspVos()) {
- emailList.add(issueIspVo.getEmail());
- }
- for(IssueHostingVo issueHostingVo : issueVo.getIssueHostingVos()) {
- emailList.add(issueHostingVo.getEmail());
- }
-
- }
-
- Long totalCount = this.issueMapper.count(condition);
- int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
-
- condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
- condition.setPageSize(pageable.getPageSize());
- //resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- totalPage, totalCount));
- }*/
-
- /*@Override
- @Transactional
- public void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params) {
- IssueVo issueVo = new IssueVo();
- Long issueId = MapUtil.getLong(params, "issueId");
-
- List<String> emailList = Lists.newArrayList();
-
- if(issueId != null){
- Issue issue = this.getIssue(issueId);
- issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
- this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
- for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
- emailList.add(issueCompanyVo.getEmail());
- }
- }
- resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- }
-
- @Override
- @Transactional
- public void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params) {
-
- }
-
- @Override
- @Transactional
- public void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params) {
-
- }*/
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0