From 8672cdbd8817957c1fb1996fb870e358c5b6022c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 16:28:21 +0900
Subject: [PATCH] - 헤더에 일반 메일 보내기 기능 추가 - 업체 엑셀 다운로드 시 카테고리 항목들도 보여지도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 15 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index 84c62c8..d33943c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -1,13 +1,18 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.mapper.HostingFieldMapper;
import kr.wisestone.owl.mapper.IssueHostingMapper;
import kr.wisestone.owl.repository.IssueHostingRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
+import kr.wisestone.owl.vo.IssueHostingVo;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.HostingFieldForm;
+import kr.wisestone.owl.web.form.IspFieldForm;
+import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +34,12 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private IssueService issueService;
+
+ @Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueHostingMapper issueHostingMapper;
@Override
@@ -36,28 +47,113 @@
return this.issueHostingRepository;
}
+ /**
+ * �깉濡쒖슫 �샇�뒪�똿 吏곸젒 異붽�
+ * @param issueForm IssueForm
+ * @param issue Issue
+ */
+ private void CreateHostingField(IssueForm issueForm, Issue issue) {
+ StringBuilder sb = new StringBuilder();
+ // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
+ HostingFieldForm hostingFieldForm = new HostingFieldForm();
+ hostingFieldForm.setName(issueForm.getHostingName());
+ hostingFieldForm.setCode(issueForm.getHostingCode());
+ hostingFieldForm.setEmail(issueForm.getHostingEmail());
+ hostingFieldForm.setUrl(issueForm.getHostingUrl());
+ hostingFieldForm.setManager(issueForm.getHostingManager());
+ hostingFieldForm.setTel(issueForm.getHostingTel());
+ hostingFieldForm.setMemo(issueForm.getHostingMemo());
+
+ IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
+ HostingField hostingField = new HostingField();
+
+ // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
+ if (newIssueHosting.getHostingField() == null) {
+ IssueHosting oldIssueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ hostingFieldForm.setId(hostingField.getId());
+ if (oldIssueHosting != null) {
+ this.issueHostingRepository.deleteById(oldIssueHosting.getId());
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, null, hostingFieldForm, oldIssueHosting, sb);
+ } else {
+ newIssueHosting.setHostingField(hostingField);
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
+ }
+ }
+ // 異붽� �씠�젰
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ }
+
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldForm HostingFieldForm
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
+ IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
+ issueHosting.setIssue(issue);
+ if (hostingFieldForm.getId() != null && hostingFieldForm.getId() != -1) {
+ HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
+ issueHosting.setHostingField(hostingField);
+ }
+ return issueHosting;
+ }
+
+
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldMap Map<String, Object> hostingFieldMap
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(Map<String, Object> hostingFieldMap, Issue issue) {
+ HostingFieldForm hostingFieldForm = ConvertUtil.convertMapToClass(hostingFieldMap, HostingFieldForm.class);
+ hostingFieldForm.setId(MapUtil.getLong(hostingFieldMap, "hostingId"));
+ return CreateIssueHosting(hostingFieldForm, issue);
+ }
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueHostingField(Issue issue, List<Map<String, Object>> issueIspFields) {
+ public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
- if (issueIspFields != null && issueIspFields.size() > 0) {
- Map<String, Object> param = issueIspFields.get(0);
+ StringBuilder sb = new StringBuilder();
+ List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
+ if (issueHostingFields != null && issueHostingFields.size() > 0) {
+ Map<String, Object> param = issueHostingFields.get(0);
- if (param != null) {
- IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
- newIssueHosting.setIssue(issue);
- HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
- newIssueHosting.setHostingField(hostingField);
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
- Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- if (issueHostings != null && issueHostings.size() > 0) {
- IssueHosting oldIssueHosting = issueHostings.iterator().next();
- ConvertUtil.copyProperties(newIssueHosting, oldIssueHosting);
- }
+ if (issueHosting != null) { //�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ issueHosting.setName(MapUtil.getString(param, "name"));
+ issueHosting.setEmail(MapUtil.getString(param, "email"));
+ issueHosting.setCode(MapUtil.getString(param, "code"));
+ issueHosting.setUrl(MapUtil.getString(param, "url"));
+ issueHosting.setManager(MapUtil.getString(param, "manager"));
+ issueHosting.setTel(MapUtil.getString(param, "tel"));
+ issueHosting.setMemo(MapUtil.getString(param, "memo"));
+
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+
+ } else { //異붽� �떆
+ IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ // 異붽� �씠�젰
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
+ }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
+ CreateHostingField(issueForm, issue);
+ } else {
+ this.issueHostingRepository.deleteByIssueId(issue.getId());
+ this.issueHostingRepository.flush();
}
}
}
@@ -67,6 +163,4 @@
public List<Map<String, Object>> findInIssueIds(IssueCondition issueCondition) {
return issueHostingMapper.findInIssueIds(issueCondition);
}
-
-
}
--
Gitblit v1.8.0