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 | 700 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 605 insertions(+), 95 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 9b1895f..3a1202a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -6,6 +6,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -19,11 +20,8 @@
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.IssueTypeCustomFieldCondition;
-import kr.wisestone.owl.web.condition.ProjectCondition;
-import kr.wisestone.owl.web.form.IssueCommentForm;
-import kr.wisestone.owl.web.form.IssueForm;
+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;
import org.apache.commons.lang3.time.StopWatch;
@@ -44,7 +42,6 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
-import java.util.concurrent.locks.Condition;
@Service
public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
@@ -53,6 +50,9 @@
@Autowired
private IssueRepository issueRepository;
+
+ @Autowired
+ private IssueTableConfigService issueTableConfigService;
@Autowired
private ProjectService projectService;
@@ -70,6 +70,24 @@
private SeverityService severityService;
@Autowired
+ private CustomFieldApiOverlapService customFieldApiOverlapService;
+
+ @Autowired
+ private IssueApiDefaultService issueApiDefaultService;
+
+ @Autowired
+ private ApiTokenService apiTokenService;
+
+ @Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
+
+ @Autowired
private CommonConfiguration configuration;
@Autowired
@@ -82,7 +100,19 @@
private IssueCustomFieldValueService issueCustomFieldValueService;
@Autowired
+ private IssueCompanyService issueCompanyService;
+
+ @Autowired
+ private IssueIspService issueIspService;
+
+ @Autowired
+ private IssueHostingService issueHostingService;
+
+ @Autowired
private IssueUserService issueUserService;
+
+ @Autowired
+ private IssueDepartmentService issueDepartmentService;
@Autowired
private CustomFieldService customFieldService;
@@ -94,6 +124,9 @@
private UserService userService;
@Autowired
+ private DepartmentService departmentService;
+
+ @Autowired
private IssueCommentService issueCommentService;
@Autowired
@@ -101,6 +134,9 @@
@Autowired
private ProjectRoleUserService projectRoleUserService;
+
+ @Autowired
+ private ProjectRoleDepartmentService projectRoleDepartmentService;
@Autowired
private IssueRiskService issueRiskService;
@@ -152,12 +188,109 @@
}
+
+ // API 瑜� �넻�빐 �씠�뒋 異붽�.
+ @Override
+ @Transactional
+ public Issue addApiIssue(IssueApiForm issueApiForm) {
+ if (issueApiForm.getIssueTypeId() == null) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
+ }
+
+ IssueForm issueForm = ConvertUtil.copyProperties(issueApiForm, IssueForm.class);
+// issueForm.setFiles(issueApiForm.getFiles());
+ IssueType issueType = this.issueTypeService.getIssueType(issueApiForm.getIssueTypeId());
+ if (issueType == null){
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
+ }
+
+ // �봽濡쒖젥�듃 �엯�젰
+ Project project = issueType.getProject();
+ if (project == null){
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_PROJECT_ERROR));
+ }
+ issueForm.setProjectId(project.getId());
+
+ // �넗�겙�쑝濡� �쑀�� �젙蹂� 媛��졇�삤湲�
+ String token = issueApiForm.getToken();
+ UserVo userVo = this.apiTokenService.certification(token);
+
+ // �빐�떦 �쑀�� �젙蹂닿� �쁽�옱 db�뿉 �엳�뒗吏� �솗�씤
+ User user = this.userService.getUser(userVo.getId());
+ if (user != null) {
+
+ // 湲곕낯媛� �엯�젰�븯湲�
+ IssueApiDefaultForm issueApiDefaultForm = new IssueApiDefaultForm();
+ issueApiDefaultForm.setUserId(user.getId());
+ issueApiDefaultForm.setIssueTypeId(issueForm.getIssueTypeId());
+ IssueApiDefault issueApiDefault = this.issueApiDefaultService.find(issueApiDefaultForm);
+ if (issueApiDefault != null) {
+ ConvertUtil.copyProperties(issueApiDefault, issueForm);
+ issueForm.setPriorityId(issueApiDefault.getPriority().getId());
+ issueForm.setSeverityId(issueApiDefault.getSeverity().getId());
+ }
+
+ // 以묐났 媛� �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
+ CustomFieldApiOverlapForm customFieldApiOverlapForm = new CustomFieldApiOverlapForm();
+ customFieldApiOverlapForm.setUserId(user.getId());
+ customFieldApiOverlapForm.setIssueTypeId(issueForm.getIssueTypeId());
+
+ IssueVo issueVo = this.findIssue(issueApiForm, user.getId());
+ if (issueVo != null) {
+ issueForm.setParentIssueId(issueVo.getId());
+ }
+
+ issueForm.setIsApi(Issue.IS_API_YES);
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙
+ issueForm.setIssueCustomFields(issueApiForm.getCustomFieldValues());
+
+ // api �엯�젰媛� �쟻�슜
+ ConvertUtil.copyProperties(issueApiForm, issueForm);
+
+ return addIssue(user, issueForm, issueApiForm.getMultipartFiles());
+ } else {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
+ }
+ }
+
+ // 以묐났�맂 �긽�쐞 �씠�뒋 寃��깋
+ private IssueVo findIssue(IssueApiForm issueApiForm, Long userId) {
+ IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+
+ List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapService.find(userId, issueApiForm.getIssueTypeId());
+ if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
+ for (CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
+ for (IssueCustomFieldValueForm issueCustomFieldValue : issueApiForm.getIssueCustomFieldValues()) {
+ if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValue.getCustomFieldId())) {
+ issueCustomFieldValueCondition.addUseValues(issueCustomFieldValue.getUseValue());
+ }
+ }
+ }
+ List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
+ if (results != null && results.size() > 0) {
+ IssueVo issueVo = new IssueVo();
+ ConvertUtil.convertMapToObject(results.get(0), issueVo);
+ return issueVo;
+ }
+ }
+ return null;
+ }
+
// �씠�뒋瑜� �깮�꽦�븳�떎.
@Override
@Transactional
public Issue addIssue(IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ User user = this.webAppUtil.getLoginUserObject();
+ return addIssue(user, issueForm, multipartFiles);
+ }
+
+ // �씠�뒋瑜� �깮�꽦�븳�떎.
+ @Override
+ @Transactional
+ public Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
- this.workspaceService.checkUseWorkspace();
+ Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
Project project = this.projectService.getProject(issueForm.getProjectId());
// �씠�뒋 �쑀�삎 �쑀�슚�꽦 泥댄겕
@@ -171,6 +304,8 @@
this.verifyTitle(issueForm.getTitle());
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
+ // �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
+ this.verifyIssueDepartment(project, issueForm);
// �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -181,42 +316,51 @@
issue.setIssueType(issueType);
issue.setPriority(priority);
issue.setSeverity(severity);
+
issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 媛� �봽濡쒖젥�듃�쓽 怨좎쑀 �씠�뒋 踰덊샇 �깮�꽦
- this.issueRepository.saveAndFlush(issue);
+ issue = this.issueRepository.saveAndFlush(issue);
issue.setReverseIndex(issue.getId() * -1); // 荑쇰━ �냽�룄 媛쒖꽑�쓣 �쐞�빐 由щ쾭�뒪 �씤�뜳�뒪 �깮�꽦
// �떞�떦�옄 吏��젙
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
// �떞�떦遺��꽌 吏��젙
- this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ // �뾽泥� �젙蹂� ���옣
+ this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+ // ISP �젙蹂� ���옣
+ this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+ // HOSTING �젙蹂� ���옣
+ this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+
+ // 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
- // 泥⑤� �뙆�씪 ���옣
- this.attachedFileService.addAttachedFile(convertFileMaps, issue, this.webAppUtil.getLoginUser().getAccount());
+ this.attachedFileService.addAttachedFile(convertFileMaps, issue, user.getAccount());
+
// �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��븳 �뙆�씪�쓣 �씠�뒋�� �뿰寃�
this.checkNotHaveIssueIdAttachedFile(issue, issueForm);
// �궗�슜�옄 �젙�쓽 �븘�뱶 ���옣
this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
// �씠�뒋 �씠�젰 �깮�꽦
- this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.ADD, null);
+ this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.ADD, null);
// �씠�뒋 �쐞�뿕 愿�由� �깮�꽦
this.issueRiskService.addIssueRisk(issue, project.getWorkspace());
// �쁺�냽�꽦 而⑦뀓�뒪�듃 鍮꾩슦湲�
this.clear();
// �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
- this.reservationIssueEmail(issue.getId(), EmailType.ISSUE_ADD);
+ this.reservationIssueEmail(issue, EmailType.ISSUE_ADD);
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
- log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ADD));
+
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_ADD));
return issue;
}
// �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
- private void reservationIssueEmail(Long id, EmailType emailType) {
- Issue issue = this.getIssue(id);
-
+ private void reservationIssueEmail(Issue issue, EmailType emailType) {
Map<String, Object> issueMap = new HashMap<>();
// �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
this.makeIssueMapToIssue(issue, issueMap);
@@ -226,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);
}
@@ -244,18 +386,25 @@
issueMap.put("issueTypeName", issue.getIssueType().getName());
issueMap.put("issueStatusName", issue.getIssueStatus().getName());
- // �떞�떦遺��꽌
+ // �떞�떦�옄
StringBuilder assigneeBuilder = new StringBuilder();
for (IssueUser issueUser : issue.getIssueUsers()) {
- //assigneeBuilder.append(issueUser.getUser().getName());
- assigneeBuilder.append(issueUser.getDepartment().getDepartmentName());
- /*assigneeBuilder.append("(");
+ assigneeBuilder.append(issueUser.getUser().getName());
+ assigneeBuilder.append("(");
assigneeBuilder.append(CommonUtil.decryptAES128(issueUser.getUser().getAccount()));
- assigneeBuilder.append(")");*/
+ assigneeBuilder.append(")");
assigneeBuilder.append("\n");
}
-
issueMap.put("assignees", assigneeBuilder.toString());
+
+ // �떞�떦遺��꽌
+ StringBuilder departsBuilder = new StringBuilder();
+ for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
+ departsBuilder.append(issueDepartment.getDepartment().getDepartmentName());
+ departsBuilder.append("\n");
+ }
+ issueMap.put("departments", departsBuilder.toString());
+
// 湲곌컙
if (!StringUtils.isEmpty(issue.getStartDate())) {
issueMap.put("period", issue.getStartDate() + " ~ " + issue.getCompleteDate());
@@ -306,6 +455,9 @@
issueMap.put("customFields", customFields);
issueMap.put("description", issue.getDescription());
+
+ //�뾽泥�,ISP,HOSTING 異붽�
+
StringBuilder attachedFileBuilder = new StringBuilder();
@@ -386,20 +538,23 @@
issueCondition.setIssueIds(issueKeys);
List<Map<String, Object>> results = this.issueMapper.find(issueCondition);
+
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
- StopWatch serviceStart = new StopWatch();
- serviceStart.start();
+ /*StopWatch serviceStart = new StopWatch();
+ serviceStart.start();*/
Long totalCount = this.issueMapper.count(issueCondition);
// �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
- serviceStart.stop();
- log.debug("serviceENd1 : " + serviceStart.getTime());
+ /*serviceStart.stop();
+ log.debug("serviceENd1 : " + serviceStart.getTime());*/
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
issueCondition.setIssueIds(Lists.newArrayList());
// 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(),
@@ -410,11 +565,81 @@
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
@Transactional(readOnly = true)
public List<IssueVo> findChartIssue(Map<String, Object> resJsonData,
- IssueCondition issueCondition, Pageable pageable) {
+ IssueCondition issueCondition, Pageable pageable) {
// 寃��깋 議곌굔�쓣 留뚮뱺�떎
if (!this.makeIssueSearchCondition(issueCondition,Lists.newArrayList("01", "02", "03"), pageable)) {
@@ -526,7 +751,7 @@
this.setIssueCustomFieldValue(issueVos, issueCondition);
}
- // 寃��깋 議곌굔�쓣 留뚮뱺�떎
+ // 寃��깋 議곌굔�쓣 留뚮뱺�떎
private boolean makeIssueSearchCondition(IssueCondition condition, List<String> projectStatues, Pageable pageable) {
if (pageable != null) {
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
@@ -660,8 +885,8 @@
return true;
}
- // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎. => �떞�떦遺��꽌
- private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition) {
if (issueVos.size() < 1) {
return;
}
@@ -669,28 +894,61 @@
List<Map<String, Object>> issueUsers = this.issueMapper.findIssueUser(issueCondition);
Map<String, Object> issueConverterUsers = new HashMap<>();
- // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦�옄 �젙蹂� �뀑�똿
for (Map<String, Object> issueUser : issueUsers) {
String issueId = MapUtil.getString(issueUser, "issueId");
if (MapUtil.getObject(issueConverterUsers, issueId) != null) {
- List<DepartmentVo> departments = (List) MapUtil.getObject(issueConverterUsers, issueId);
- departments.add(new DepartmentVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "departmentName"), MapUtil.getString(issueUser, "departmentDescription")));
- //List<UserVo> users = (List) MapUtil.getObject(issueConverterUsers, issueId);
- //users.add(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")), MapUtil.getString(issueUser, "profile")));
+ List<UserVo> users = (List) MapUtil.getObject(issueConverterUsers, issueId);
+ users.add(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")), MapUtil.getString(issueUser, "profile")));
} else {
- List<DepartmentVo> departments = Lists.newArrayList(new DepartmentVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "departmentName"), MapUtil.getString(issueUser, "departmentDescription")));
- issueConverterUsers.put(issueId, departments);
- /*List<UserVo> users = Lists.newArrayList(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")),
+ List<UserVo> users = Lists.newArrayList(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")),
MapUtil.getString(issueUser, "profile")));
- issueConverterUsers.put(issueId, users);*/
+ issueConverterUsers.put(issueId, users);
+ }
+ }
+
+ // �씠�뒋Vo�뿉 �떞�떦�옄 �젙蹂대�� �뀑�똿
+ for (IssueVo issueVo : issueVos) {
+ if (MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId())) != null) {
+ List<UserVo> userVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
+
+ issueVo.setUserVos(userVos);
+ }
+
+ // �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+ issueVo.setModifyPermissionCheck(Boolean.TRUE);
+ }
+ }
+ }
+
+ // �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ if (issueVos.size() < 1) {
+ return;
+ }
+
+ List<Map<String, Object>> issueDepartments = this.issueMapper.findIssueDepartment(issueCondition);
+ Map<String, Object> issueConverterDepartments = new HashMap<>();
+
+ // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ for (Map<String, Object> issueDepartment : issueDepartments) {
+ String issueId = MapUtil.getString(issueDepartment, "issueId");
+
+ if (MapUtil.getObject(issueConverterDepartments, issueId) != null) {
+ List<DepartmentVo> departments = (List) MapUtil.getObject(issueConverterDepartments, issueId);
+ departments.add(new DepartmentVo(MapUtil.getLong(issueDepartment, "id"), MapUtil.getString(issueDepartment, "departmentName"), MapUtil.getString(issueDepartment, "departmentDescription")));
+ } else {
+ List<DepartmentVo> departments = Lists.newArrayList(new DepartmentVo(MapUtil.getLong(issueDepartment, "id"), MapUtil.getString(issueDepartment, "departmentName"), MapUtil.getString(issueDepartment, "departmentDescription")));
+ issueConverterDepartments.put(issueId, departments);
}
}
// �씠�뒋Vo�뿉 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿
for (IssueVo issueVo : issueVos) {
- if (MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId())) != null) {
- List<DepartmentVo> departmentVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
+ if (MapUtil.getObject(issueConverterDepartments, String.valueOf(issueVo.getId())) != null) {
+ List<DepartmentVo> departmentVos = (List) MapUtil.getObject(issueConverterDepartments, String.valueOf(issueVo.getId()));
issueVo.setDepartmentVos(departmentVos);
}
@@ -726,10 +984,13 @@
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
+ this.setDownIssues(issue, issueVo); //�븯�쐞 �씠�뒋 �꽭�똿
+
break;
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
}
@@ -738,6 +999,30 @@
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_DETAIL));
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
+ }
+
+ // �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
+ private void setDownIssues(Issue issue, IssueVo issueVo) {
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
+ List<IssueVo> downIssueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class);
+ List<IssueVo> resultList = new ArrayList<>();
+ if(downIssues != null && downIssueVos.size()>0){
+ for(IssueVo downIssueVo : downIssueVos){
+ for(Issue downIssue : downIssues){
+ downIssueVo.setTitle(downIssue.getTitle());
+ downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
+ downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
+ downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
+ this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
+ this.setIssueDepartment(downIssue, downIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+ }
+ resultList.add(downIssueVo);
+ }
+ issueVo.setIssueDownVos(resultList); //�봽濡좏듃�뿉�꽌 List�삎�깭濡� 諛쏆븘以섏꽌 由ъ뒪�듃 �삎�떇�쑝濡� 蹂대궡以�
+ }else{
+ issueVo.setIssueDownVos(null);
+ }
}
// �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
@@ -759,6 +1044,34 @@
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
+ this.setDownIssues(issue, issueVo); //�븯�쐞 �씪媛� �꽭�똿
+
+ IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
+
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ //useCompanyVo.setValues();
+ }
+ issueVo.setUsePartnerVos(usePartnerVos);
+ }
+
+ this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
+ this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
+ this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
+
+ this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
+ }
+
+ // �긽�쐞�씪媛� �젙蹂� 異붽�
+ private void setParentIssue(Issue issue, IssueVo issueVo) {
+ if(issue.getParentIssue() != null){
+ issueVo.setParentIssueVo(ConvertUtil.copyProperties(issue.getParentIssue(), IssueVo.class));
+ }
}
// �벑濡앹옄 �젙蹂� 異붽�
@@ -797,6 +1110,12 @@
issueRelationVo.setIssueRelation(relIssueVo);
issueRelationVo.setTitle(relationIssue.getTitle());
+ issueRelationVo.setIssueTypeVo(ConvertUtil.copyProperties(relationIssue.getIssueType(), IssueTypeVo.class));
+ issueRelationVo.setPriorityVo(ConvertUtil.copyProperties(relationIssue.getPriority(), PriorityVo.class));
+ issueRelationVo.setSeverityVo(ConvertUtil.copyProperties(relationIssue.getSeverity(), SeverityVo.class));
+ this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
+ this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
issueVo.addIssueRelationVo(issueRelationVo);
}
} else {
@@ -844,9 +1163,9 @@
private void setIssueDepartment(Issue issue, IssueVo issueVo) {
List<DepartmentVo> departmentVos = Lists.newArrayList();
- for (IssueUser issueUser : issue.getIssueUsers()) {
- DepartmentVo departmentVo = ConvertUtil.copyProperties(issueUser.getDepartment(), DepartmentVo.class);
- departmentVo.setByName(departmentVo.getByName());
+ for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
+ DepartmentVo departmentVo = ConvertUtil.copyProperties(issueDepartment.getDepartment(), DepartmentVo.class);
+ departmentVo.setByName(departmentVo.getDepartmentName());
departmentVos.add(departmentVo);
}
issueVo.setDepartmentVos(departmentVos);
@@ -897,7 +1216,7 @@
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- //this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issueForm.getId());
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
Project project = this.projectService.getProject(issueForm.getProjectId());
// �씠�뒋 �긽�깭 �쑀�슚�꽦 泥댄겕
@@ -913,8 +1232,10 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
- // �떞�떦�옄 �쑀�슚�꽦 泥댄겕 => �떞�떦遺��꽌濡� 蹂�寃�
- this.verifyIssueAssignee(project, issueForm);
+ // �떞�떦�옄 �쑀�슚�꽦 泥댄겕
+ //this.verifyIssueAssignee(project, issueForm);
+ // �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
+ this.verifyIssueDepartment(project, issueForm);
Issue issue = this.getIssue(issueForm.getId());
@@ -942,9 +1263,11 @@
issue.setCompleteDate(issueForm.getCompleteDate());
this.issueRepository.saveAndFlush(issue);
- // �떞�떦遺��꽌 吏��젙
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
- this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ // �떞�떦遺��꽌 吏��젙
+ if(issueForm.getDepartmentIds().size()>0){
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ }
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -961,9 +1284,15 @@
if (!StringUtils.isEmpty(detectIssueChange.toString())) {
this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
-
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_MODIFY));
+
+ // �뾽泥� �젙蹂� ���옣
+ this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+ // ISP �젙蹂� ���옣
+ this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+ // HOSTING �젙蹂� ���옣
+ this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
return issue;
}
@@ -972,12 +1301,14 @@
private List<Map<String, Object>> convertMultipartFileToFile(List<MultipartFile> multipartFiles) {
List<Map<String, Object>> convertFileMaps = Lists.newArrayList();
- for (MultipartFile multipartFile : multipartFiles) {
- try {
- Map<String, Object> fileMap = CommonUtil.makeFileMap(multipartFile);
- convertFileMaps.add(fileMap);
- } catch (Exception e) {
- log.debug("multipartFile -> file 蹂��솚 �삤瑜�" + e.getMessage());
+ if (multipartFiles != null && multipartFiles.size() > 0) {
+ for (MultipartFile multipartFile : multipartFiles) {
+ try {
+ Map<String, Object> fileMap = CommonUtil.makeFileMap(multipartFile);
+ convertFileMaps.add(fileMap);
+ } catch (Exception e) {
+ log.debug("multipartFile -> file 蹂��솚 �삤瑜�" + e.getMessage());
+ }
}
}
@@ -1018,7 +1349,7 @@
}
// �씠�뒋 �떞�떦遺��꽌濡� 吏��젙�맆 遺��꽌媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 遺��꽌�씤吏� �솗�씤
- private void verifyIssueAssignee(Project project, IssueForm issueForm) {
+ private void verifyIssueDepartment(Project project, IssueForm issueForm) {
if (issueForm.getDepartmentIds().size() > 0) {
List<Long> trustDepartmentIds = Lists.newArrayList(); // 李몄뿬 �솗�씤�맂 遺��꽌
@@ -1026,9 +1357,9 @@
boolean includeProject = false;
for (ProjectRole projectRole : project.getProjectRoles()) {
- ProjectRoleUser projectRoleUser = this.projectRoleUserService.findByProjectRoleIdAndDepartmentId(projectRole.getId(), departmentId);
+ ProjectRoleDepartment projectRoleDepartment = this.projectRoleDepartmentService.findByProjectRoleIdAndDepartmentId(projectRole.getId(), departmentId);
- if (projectRoleUser != null) {
+ if (projectRoleDepartment != null) {
includeProject = true;
trustDepartmentIds.add(departmentId);
break;
@@ -1036,17 +1367,17 @@
}
// �뜲�씠�꽣 蹂댁젙 �옉�뾽 - �봽濡쒖젥�듃�뿉�꽌 �젣�쇅�맂 �궗�슜�옄�뒗 �떞�떦�옄�뿉�꽌 �젣�쇅 �맆 �닔 �엳�룄濡� 泥섎━
- /*if (!includeProject) {
+ if (!includeProject) {
throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.PROJECT_NOT_INCLUDE_USER));
- }*/
+ this.messageAccessor.getMessage(MsgConstants.PROJECT_NOT_INCLUDE_DEPARTMENT));
+ }
}
// 李몄뿬 �솗�씤�맂 遺��꽌濡� �떞�떦遺��꽌 蹂�寃�
issueForm.setDepartmentIds(trustDepartmentIds);
}
}
- /*// �씠�뒋 �떞�떦�옄濡� 吏��젙�맆 �궗�슜�옄媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 �궗�슜�옄 �씤吏� �솗�씤
+ // �씠�뒋 �떞�떦�옄濡� 吏��젙�맆 �궗�슜�옄媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 �궗�슜�옄 �씤吏� �솗�씤
private void verifyIssueAssignee(Project project, IssueForm issueForm) {
if (issueForm.getUserIds().size() > 0) {
List<Long> trustUserIds = Lists.newArrayList(); // 李몄뿬 �솗�씤�맂 �궗�슜�옄
@@ -1065,17 +1396,17 @@
}
// �뜲�씠�꽣 蹂댁젙 �옉�뾽 - �봽濡쒖젥�듃�뿉�꽌 �젣�쇅�맂 �궗�슜�옄�뒗 �떞�떦�옄�뿉�꽌 �젣�쇅 �맆 �닔 �엳�룄濡� 泥섎━
- *//*if (!includeProject) {
+ if (!includeProject) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PROJECT_NOT_INCLUDE_USER));
- }*//*
+ }
}
// 李몄뿬 �솗�씤�맂 �궗�슜�옄濡� �떞�떦�옄 蹂�寃�
issueForm.setUserIds(trustUserIds);
}
- }*/
+ }
- /*// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
+ // �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
private void verifyIssueModifyPermission(Long issueId) {
Issue issue = this.getIssue(issueId);
@@ -1096,18 +1427,18 @@
}
return userVos;
- }*/
+ }
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos) {
boolean hasPermission = false;
// �뾽臾� 怨듦컙 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null);
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null);
// �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎. => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
//hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
// �떞�떦�옄媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -1116,7 +1447,7 @@
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 �솗�씤�븳�떎.
- private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos) {
+ private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos) {
if (!hasPermission) {
switch (checkType) {
case Issue.WORKSPACE_MANAGER: // �뾽臾� 怨듦컙 愿�由ъ옄
@@ -1140,15 +1471,28 @@
hasPermission = true;
break;
}
-
- // �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤 => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
- /*for (UserVo issueUserVo : issueUserVos) {
+ // �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤
+ for (UserVo issueUserVo : issueUserVos) {
if (issueUserVo.getId().equals(this.webAppUtil.getLoginId())) {
hasPermission = true;
break;
}
- }*/
+ }
+ break;
+ case Issue.DEPARTMENT:
+ // �떞�떦遺��꽌媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
+ if (issueDepartmentVos.size() < 1) {
+ hasPermission = true;
+ break;
+ }
+ // �씠�뒋 �떞�떦遺��꽌 �뿬遺� �솗�씤
+ /*for (DepartmentVo issueDepartmentVo : issueDepartmentVos) {
+ if (issueDepartmentVo.getId().equals()) {
+ hasPermission = true;
+ break;
+ }
+ }*/
break;
}
}
@@ -1165,7 +1509,7 @@
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- //this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());
@@ -1203,7 +1547,7 @@
}
// �씠�뒋 �떞�떦�옄 蹂�寃�
- /*@Override
+ @Override
@Transactional
public void modifyIssueUser(IssueForm issueForm) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
@@ -1236,7 +1580,7 @@
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_USER_CHANGE));
- }*/
+ }
@Override
@Transactional
@@ -1246,15 +1590,15 @@
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- //this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
- this.issueHistoryService.detectIssueManager(issue, issueForm, detectIssueChange);
+ this.issueHistoryService.detectIssueDepartment(issue, issueForm, detectIssueChange);
//this.issueUserService.modifyIssueUser(issue, issue.getProject().getWorkspace(), issueForm.getUserIds());
- this.issueUserService.modifyIssueDepartment(issue, issue.getProject().getWorkspace(), issueForm.getDepartmentIds());
+ this.issueDepartmentService.modifyIssueDepartment(issue, issue.getProject().getWorkspace(), issueForm.getDepartmentIds());
this.issueRepository.saveAndFlush(issue);
// �씠�뒋 �씠�젰 �벑濡�
@@ -1304,7 +1648,7 @@
private Issue issueRemoves(Long issueId) {
Issue issue = this.getIssue(issueId);
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- //this.verifyIssueModifyPermission(issueId);
+ this.verifyIssueModifyPermission(issueId);
// �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
if (issue.getAttachedFiles().size() > 0) {
@@ -1318,7 +1662,7 @@
}
// �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
- this.reservationIssueEmail(issue.getId(), EmailType.ISSUE_REMOVE);
+ this.reservationIssueEmail(issue, EmailType.ISSUE_REMOVE);
// �씠�뒋 �궘�젣
this.issueRepository.delete(issue);
@@ -1441,7 +1785,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋 �젣紐�
excelInfo.addAttrInfos(new ExportExcelAttrVo("description", this.messageAccessor.message("common.content"), 60, ExportExcelAttrVo.ALIGN_LEFT)); // �궡�슜
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueTypeName", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 ���엯
- excelInfo.addAttrInfos(new ExportExcelAttrVo("department", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departments", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
excelInfo.addAttrInfos(new ExportExcelAttrVo("priorityName", this.messageAccessor.message("common.priority"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �슦�꽑�닚�쐞
excelInfo.addAttrInfos(new ExportExcelAttrVo("severityName", this.messageAccessor.message("common.importance"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // 以묒슂�룄
excelInfo.addAttrInfos(new ExportExcelAttrVo("register", this.messageAccessor.message("common.register"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �벑濡앹옄
@@ -1519,6 +1863,55 @@
}
}
+ // �뾽泥� �젙蹂� 異붽�
+ private void setIssueCompanyField(Issue issue, IssueVo issueVo) {
+ List<IssueCompanyVo> issueCompanyVos = Lists.newArrayList();
+
+ for(IssueCompany issueCompany : issue.getIssueCompanies()){
+ IssueCompanyVo issueCompanyVo = ConvertUtil.copyProperties(issueCompany, IssueCompanyVo.class);
+ issueCompanyVo.setId(issueCompany.getId());
+ CompanyField companyField = issueCompany.getCompanyField();
+ if (companyField != null) {
+ issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
+ }
+ issueCompanyVos.add(issueCompanyVo);
+ }
+ issueVo.setIssueCompanyVos(issueCompanyVos);
+ }
+
+ // Isp �젙蹂� 異붽�
+ private void setIssueIspField(Issue issue, IssueVo issueVo) {
+ List<IssueIspVo> issueIspVos = Lists.newArrayList();
+
+ 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);
+ }
+
+ // Hosting �젙蹂� 異붽�
+ private void setIssueHostingField(Issue issue, IssueVo issueVo) {
+ List<IssueHostingVo> issueHostingVos = Lists.newArrayList();
+
+ 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);
+ }
+
// �뿰愿��씪媛� �젙蹂� 異붽�
private void setRelationIssue(IssueVo issueVo, Long issueId) {
List<IssueVo> relationIssues = this.issueRelationService.findRelationIssue(issueId);
@@ -1546,6 +1939,7 @@
result.put("description", description);
result.put("issueTypeName", issueVo.getIssueTypeName());
result.put("assignees", CommonUtil.convertUserVosToString(issueVo.getUserVos()));
+ result.put("departments", CommonUtil.convertDepartmentVosToString(issueVo.getDepartmentVos()));
result.put("priorityName", issueVo.getPriorityName());
result.put("severityName", issueVo.getSeverityName());
@@ -1571,13 +1965,11 @@
result.put("customField_" + issueCustomFieldValueVo.getCustomFieldVo().getId().toString(), useValue + ", " + issueCustomFieldValueVo.getUseValue());
}
}
-
results.add(result);
} catch (Exception e) {
log.error("�뿊�� �떎�슫濡쒕뱶 �삤瑜� 諛쒖깮");
}
}
-
return results;
}
@@ -1592,6 +1984,14 @@
issueForm.setId(issueId);
// �씠�뒋 �긽�깭 蹂�寃�
this.modifyIssueStatus(issueForm);
+ }
+
+ // �떞�떦 遺��꽌 �닔�젙
+ if (issueForm.getDepartmentIds().size() > 0) {
+ Issue issue = this.getIssue(issueForm.getId());
+ Project project = this.projectService.getProject(issueForm.getProjectId());
+
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
}
}
@@ -1657,13 +2057,14 @@
Map<String, Priority> priorityMaps = new HashMap<>(); // �슦�꽑 �닚�쐞 紐⑥쓬
Map<String, Severity> severityMaps = new HashMap<>(); // 以묒슂�룄 紐⑥쓬
Map<String, Object> userMaps = new HashMap<>(); // �궗�슜�옄 紐⑥쓬
+ Map<String, Object> departmentMaps = new HashMap<>(); // 遺��꽌 紐⑥쓬
Map<String, CustomField> customFieldMaps = new HashMap<>();
Map<String, IssueStatus> issueStatusReadyMaps = new HashMap<>(); // �긽�깭 �냽�꽦 '��湲�'�씤 �씠�뒋 �긽�깭
Map<Long, Long> issueNumberMaps = new HashMap<>(); // �씠�뒋 踰덊샇 紐⑥쓬
Map<String, Long> issueTypeCustomFieldMaps = new HashMap<>(); // �씠�뒋 ���엯 + �궗�슜�옄 �젙�쓽 �븘�뱶 �뿰寃� �젙蹂�
Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId()); // �씠�뒋瑜� �꽔�쑝�젮�뒗 �뾽臾� 怨듦컙
// �씠�뒋�쓽 二쇱슂 �냽�꽦�쓣 map �뿉 ���옣�븯�뿬 �뿊�� import �뿉�꽌 吏��젙�븳 ���긽(�씠�뒋 �냽�꽦)�쓣 鍮좊Ⅴ寃� 李얠쓣 �닔 �엳寃� �븳�떎.
- this.IssueAttributeMapToList(projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, customFieldMaps, issueNumberMaps, issueTypeCustomFieldMaps, issueStatusReadyMaps);
+ this.IssueAttributeMapToList(projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, departmentMaps, customFieldMaps, issueNumberMaps, issueTypeCustomFieldMaps, issueStatusReadyMaps);
// 0.237 - 0.230
List<IssueForm> issueForms = Lists.newArrayList();
@@ -1736,6 +2137,8 @@
this.bulkInsertIssueCustomFieldValue(issueForms, issueTypeCustomFieldMaps);
// 3.628 - 3.445
+ // �뾽泥�,ISP,�샇�뒪�똿 異붽�
+
/*serviceStart.stop();
log.debug("2李� ���옣 �떆媛� : " + serviceStart.getTime());*/
@@ -1802,7 +2205,8 @@
if (issueAssigneeMaps.size() > 0) {
// �씠�뒋 �떞�떦�옄 踰뚰겕 �벑濡�
- this.issueUserService.insertIssueUser(issueAssigneeMaps);
+ //this.issueUserService.insertIssueUser(issueAssigneeMaps);
+ this.issueDepartmentService.insertIssueDepartment(issueAssigneeMaps);
}
}
@@ -1813,6 +2217,7 @@
Map<String, Long> issueRiskMap = new HashMap<>();
issueRiskMap.put("issueId", issueForm.getId());
issueRiskMap.put("changeAssigneeCount", 0L);
+ issueRiskMap.put("changeDepartmentCount", 0L);
issueRiskMap.put("changeIssueStatusCount", 0L);
issueRiskMap.put("workspaceId", workspace.getId());
issueRiskMap.put("issueStatusIds", issueForm.getIssueStatusId());
@@ -1853,7 +2258,7 @@
// �씠�뒋�쓽 二쇱슂 �냽�꽦�쓣 map �뿉 ���옣�븯�뿬 �뿊�� import �뿉�꽌 吏��젙�븳 ���긽(�씠�뒋 �냽�꽦)�쓣 鍮좊Ⅴ寃� 李얠쓣 �닔 �엳寃� �븳�떎.
private void IssueAttributeMapToList(Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,
- Map<String, Object> userMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {
+ Map<String, Object> userMaps, Map<String, Object> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {
// �봽濡쒖젥�듃 �궎濡� 諛붾줈 李얠쓣 �닔 �엳寃� 以�鍮�
List<Project> projects = this.projectService.findByWorkspaceId();
List<Long> projectIds = Lists.newArrayList();
@@ -1879,6 +2284,14 @@
}
userMaps.put(project.getProjectKey(), userMap);
+
+ // �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 遺��꽌 �젙蹂�
+ List<Map<String, Object>> departments = this.departmentService.findProjectDepartment(project);
+ List<Long> departmentList = Lists.newArrayList();
+ // 遺��꽌 �젙蹂대�� ���옣
+ for (Map<String, Object> department : departments) {
+ departmentList.add(MapUtil.getLong(department, "departmentId"));
+ }
}
// �씠�뒋 �쑀�삎�쓣 諛붾줈 李얠쓣 �닔 �엳寃� 以�鍮�
@@ -2164,6 +2577,12 @@
switch (customField.getCustomFieldType()) {
case INPUT:
+ case NUMBER:
+ case DATETIME:
+ case IP_ADDRESS:
+ case EMAIL:
+ case SITE:
+ case TEL:
if (cellValue.length() > 100) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
@@ -2244,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());
@@ -2265,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());
}
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@@ -2433,4 +2899,48 @@
return tasks;
}
-}
+
+ @Transactional
+ @Override
+ public void modifyParentIssue(IssueForm issueDownForm) {
+ Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
+ 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) { // 異붽� �븷 寃쎌슦
+ parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
+ issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
+ } else {
+ // �궘�젣 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ issue.setParentIssue(null);
+ }
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(湲곕줉�� �쁽�옱 �긽�꽭�럹�씠吏��뿉 �빐�빞�븯�땲源�)
+ this.issueRepository.saveAndFlush(issue);
+
+ }
+
+ @Override
+ public void findPartner(Map<String, Object> resJsonData, Map<String, Object> params) {
+ Long issueTypeId = MapUtil.getLong(params, "issueTypeId");
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0