From 3b019e5599dfb5d368f4e8fd50fb557f4679a645 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 12 1월 2022 15:19:58 +0900
Subject: [PATCH] 업체/isp/호스팅 기능 개편
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 94 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 6 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 8a39129..12d42d4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -4,6 +4,8 @@
import kr.wisestone.owl.repository.HostingFieldRepository;
import kr.wisestone.owl.repository.IspFieldRepository;
import kr.wisestone.owl.service.*;
+import kr.wisestone.owl.util.CommonUtil;
+import kr.wisestone.owl.web.condition.CompanyFieldCategoryCondition;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
import kr.wisestone.owl.web.form.CompanyFieldForm;
import org.apache.commons.lang3.StringUtils;
@@ -26,10 +28,7 @@
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
@Service
public class CompanyFieldServiceImpl extends AbstractServiceImpl<CompanyField, Long, JpaRepository<CompanyField, Long>> implements CompanyFieldService {
@@ -53,6 +52,9 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private CompanyFieldCategoryService companyFieldCategoryService;
+
+ @Autowired
private UserService userService;
@Autowired
@@ -74,6 +76,15 @@
public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
// url �쑀�슚�꽦 泥댄겕
this.verifyUrl(companyFieldForm.getUrl(), null);
+
+ if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
+ String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
+ companyFieldForm.setTel(Arrays.toString(tels));
+ }
+ if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
+ String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
+ companyFieldForm.setEmail(Arrays.toString(emails));
+ }
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
companyFieldRepository.saveAndFlush(companyField);
@@ -131,15 +142,46 @@
Long companyId = companyFieldCondition.getId();
if (companyId != null) {
CompanyField companyField = this.getCompany(companyId);
- if(companyField.getIspId() != null){
+ if(companyField.getIspId() != null && companyField.getIspId() != -1){
ispField = this.ispFieldRepository.getOne(companyField.getIspId());
}
- if(companyField.getHostingId() != null){
+ if(companyField.getHostingId() != null && companyField.getHostingId() != -1){
hostingField = this.hostingFieldRepository.getOne(companyField.getHostingId());
}
companyFieldVo = ConvertUtil.copyProperties(companyField, CompanyFieldVo.class);
ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+
+ if (companyField.getCompanyTypeId() != null && companyField.getCompanyTypeId() != -1) {
+ CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyField.getCompanyTypeId());
+ if (companyType != null) {
+ companyFieldVo.setCompanyTypeName(companyType.getUseValue());
+ }
+ }
+ if (companyField.getParentSectorId() != null && companyField.getParentSectorId() != -1) {
+ CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyField.getParentSectorId());
+ if (parentSector != null) {
+ companyFieldVo.setParentSectorName(parentSector.getUseValue());
+ }
+ }
+ if (companyField.getChildSectorId() != null && companyField.getChildSectorId() != -1) {
+ CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyField.getChildSectorId());
+ if (childSector != null) {
+ companyFieldVo.setChildSectorName(childSector.getUseValue());
+ }
+ }
+ if (companyField.getRegionId() != null && companyField.getRegionId() != -1) {
+ CompanyFieldCategory region = this.companyFieldCategoryService.find(companyField.getRegionId());
+ if (region != null) {
+ companyFieldVo.setRegionName(region.getUseValue());
+ }
+ }
+ /*if (companyField.getStatusId() != null && companyField.getStatusId() != -1) {
+ CompanyFieldCategory status = this.companyFieldCategoryService.find(companyField.getStatusId());
+ if (status != null) {
+ companyFieldVo.setStatusName(status.getUseValue());
+ }
+ }*/
companyFieldVo.setIspFieldVo(ispFieldVo);
companyFieldVo.setHostingFieldVo(hostingFieldVo);
@@ -152,6 +194,15 @@
public void modifyCompany(CompanyFieldForm companyFieldForm) {
// url �쑀�슚�꽦 泥댄겕
this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+
+ if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
+ String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
+ companyFieldForm.setTel(Arrays.toString(tels));
+ }
+ if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
+ String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
+ companyFieldForm.setEmail(Arrays.toString(emails));
+ }
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
companyFieldRepository.saveAndFlush(companyField);
@@ -198,6 +249,11 @@
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("companyTypeName", this.messageAccessor.message("companyField.companyTypeName"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("parentSectorName", this.messageAccessor.message("companyField.parentSectorName"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("childSectorName", this.messageAccessor.message("companyField.childSectorName"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("regionName", this.messageAccessor.message("companyField.regionName"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("statusName", this.messageAccessor.message("companyField.statusName"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(companyFieldVos);
@@ -212,6 +268,32 @@
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
+
+ if (companyFieldVo.getCompanyTypeId() != null && companyFieldVo.getCompanyTypeId() != -1) {
+ CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyFieldVo.getCompanyTypeId());
+ if (companyType != null) {
+ companyFieldVo.setCompanyTypeName(companyType.getUseValue());
+ }
+ }
+ if (companyFieldVo.getParentSectorId() != null && companyFieldVo.getParentSectorId() != -1) {
+ CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyFieldVo.getParentSectorId());
+ if (parentSector != null) {
+ companyFieldVo.setParentSectorName(parentSector.getUseValue());
+ }
+ }
+ if (companyFieldVo.getChildSectorId() != null && companyFieldVo.getChildSectorId() != -1) {
+ CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyFieldVo.getChildSectorId());
+ if (childSector != null) {
+ companyFieldVo.setChildSectorName(childSector.getUseValue());
+ }
+ }
+ if (companyFieldVo.getRegionId() != null && companyFieldVo.getRegionId() != -1) {
+ CompanyFieldCategory region = this.companyFieldCategoryService.find(companyFieldVo.getRegionId());
+ if (region != null) {
+ companyFieldVo.setRegionName(region.getUseValue());
+ }
+ }
+
if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
if(ispField != null){
--
Gitblit v1.8.0