From e8dd85537ec9060133956629019c429ffb22f8c0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 18:34:32 +0900
Subject: [PATCH] 업체 isp,호스팅 연동
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 f777fde..b055955 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -6,10 +6,11 @@
import kr.wisestone.owl.domain.IspField;
import kr.wisestone.owl.repository.HostingFieldRepository;
import kr.wisestone.owl.repository.IspFieldRepository;
-import kr.wisestone.owl.service.UserService;
+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;
@@ -18,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;
@@ -33,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 {
@@ -48,6 +48,12 @@
@Autowired
private HostingFieldRepository hostingFieldRepository;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
@Autowired
private UserService userService;
@@ -112,13 +118,29 @@
// �뾽泥� �긽�꽭 議고쉶�븳�떎.
@Override
+ @Transactional
public void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition companyFieldCondition) {
CompanyFieldVo companyFieldVo = new CompanyFieldVo();
+ IspFieldVo ispFieldVo = new IspFieldVo();
+ HostingFieldVo hostingFieldVo = new HostingFieldVo();
Long companyId = companyFieldCondition.getId();
if (companyId != null) {
CompanyField companyField = this.getCompany(companyId);
+ IspField ispField = null;
+ HostingField hostingField = null;
+ 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);
}
@@ -185,28 +207,21 @@
// 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
private List<CompanyFieldVo> convertCompanyVoToMap(List<Map<String, Object>> results, Long totalCompanyCount, Pageable pageable, Map<String, Object> resJsonData) {
List<CompanyFieldVo> companyFieldVos = Lists.newArrayList();
- List<IspFieldVo> ispFieldVos = Lists.newArrayList();
- List<HostingFieldVo> hostingFieldVos = Lists.newArrayList();
for (Map<String, Object> result : results) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
-
- String url = companyFieldVo.getUrl();
-
- IspField ispField = this.ispFieldRepository.findByUrl(url);
- if(ispField != null){
+ if(companyFieldVo.getIspId() != null){
+ //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
+ IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
- ispFieldVos.add(ispFieldVo);
+ companyFieldVo.setIspFieldVo(ispFieldVo);
}
- companyFieldVo.setIspFieldVos(ispFieldVos);
-
- HostingField hostingField = this.hostingFieldRepository.findByUrl(url);
- if(hostingField != null){
+ if(companyFieldVo.getHostingId() != null){
+ //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
+ HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- hostingFieldVos.add(hostingFieldVo);
+ companyFieldVo.setHostingFieldVo(hostingFieldVo);
}
- companyFieldVo.setHostingFieldVos(hostingFieldVos);
-
companyFieldVos.add(companyFieldVo);
}
--
Gitblit v1.8.0