From 39b3723acfbe0825ce13056ab5db6e5952674bc0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 19:18:28 +0900
Subject: [PATCH] 업체추가 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 19 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index d431ed6..67037b3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -1,9 +1,16 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.service.UserService;
+import kr.wisestone.owl.domain.CustomField;
+import kr.wisestone.owl.domain.HostingField;
+import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.repository.HostingFieldRepository;
+import kr.wisestone.owl.repository.IspFieldRepository;
+import kr.wisestone.owl.service.*;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
import kr.wisestone.owl.web.form.CompanyFieldForm;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
@@ -12,8 +19,6 @@
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.CompanyFieldMapper;
import kr.wisestone.owl.repository.CompanyFieldRepository;
-import kr.wisestone.owl.service.CompanyFieldService;
-import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.view.ExcelView;
@@ -27,6 +32,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
@Service
public class CompanyFieldServiceImpl extends AbstractServiceImpl<CompanyField, Long, JpaRepository<CompanyField, Long>> implements CompanyFieldService {
@@ -36,6 +42,18 @@
@Autowired
private CompanyFieldMapper companyFieldMapper;
+
+ @Autowired
+ private IspFieldRepository ispFieldRepository;
+
+ @Autowired
+ private HostingFieldRepository hostingFieldRepository;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
@Autowired
private UserService userService;
@@ -57,9 +75,32 @@
// �뾽泥� 異붽�
@Override
public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), null);
+
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
companyFieldRepository.saveAndFlush(companyField);
return companyField;
+ }
+
+ // url �쑀�슚�꽦 泥댄겕
+ private void verifyUrl(String url, Long id) {
+ if (StringUtils.isEmpty(url)) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
+ }
+ CompanyField companyField;
+
+ if(id == null){
+ companyField = this.companyFieldRepository.findByUrl(url);
+ } else {
+ companyField = this.companyFieldRepository.findByUrlAndIdNot(url,id);
+ }
+
+ if (companyField != null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_USED_URL));
+ }
}
// �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
@@ -75,16 +116,32 @@
return this.convertCompanyVoToMap(results, totalCompanyCount, pageable, resJsonData);
}
-
// �뾽泥� �긽�꽭 議고쉶�븳�떎.
@Override
+ @Transactional
public void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition companyFieldCondition) {
CompanyFieldVo companyFieldVo = new CompanyFieldVo();
+ IspFieldVo ispFieldVo = new IspFieldVo();
+ HostingFieldVo hostingFieldVo = new HostingFieldVo();
+
+ IspField ispField = new IspField();
+ HostingField hostingField = new HostingField();
Long companyId = companyFieldCondition.getId();
if (companyId != null) {
CompanyField companyField = this.getCompany(companyId);
+ if(companyField.getIspId() != null){
+ ispField = this.ispFieldRepository.getOne(companyField.getIspId());
+ }
+ if(companyField.getHostingId() != null){
+ hostingField = this.hostingFieldRepository.getOne(companyField.getHostingId());
+ }
companyFieldVo = ConvertUtil.copyProperties(companyField, CompanyFieldVo.class);
+ ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
+ hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+
+ companyFieldVo.setIspFieldVo(ispFieldVo);
+ companyFieldVo.setHostingFieldVo(hostingFieldVo);
}
resJsonData.put(Constants.REQ_KEY_CONTENT, companyFieldVo);
}
@@ -92,6 +149,9 @@
// �뾽泥� �젙濡쒕�� �닔�젙�븳�떎.
@Override
public void modifyCompany(CompanyFieldForm companyFieldForm) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
companyFieldRepository.saveAndFlush(companyField);
}
@@ -104,7 +164,10 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT));
}
- this.companyFieldRepository.flush();
+ for (Long id : companyFieldForm.getRemoveIds()) {
+ this.companyFieldRepository.deleteById(id);
+ this.companyFieldRepository.flush();
+ }
}
// �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@@ -123,29 +186,23 @@
}
CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
-
-
List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
+
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyManager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyTel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyMemo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("url", this.messageAccessor.message("companyField.companyUrl"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(companyFieldVos);
model.addAttribute(Constants.EXCEL, excelInfo);
return new ModelAndView(this.excelView);
- }
-
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
}
// 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
@@ -154,6 +211,22 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
+ if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
+ //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
+ IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
+ if(ispField != null){
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
+ companyFieldVo.setIspFieldVo(ispFieldVo);
+ }
+ }
+ if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){
+ //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
+ HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
+ if(hostingField != null){
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+ companyFieldVo.setHostingFieldVo(hostingFieldVo);
+ }
+ }
companyFieldVos.add(companyFieldVo);
}
@@ -173,7 +246,6 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
}
-
CompanyField companyField = this.findOne(id);
if (companyField == null) {
--
Gitblit v1.8.0