From 107ab8e67d089738ad8b3a1ff0efc96680a13cf6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 14:29:47 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 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 ed110b9..383e006 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,15 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.CompanyField;
+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.UserService;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
import kr.wisestone.owl.web.form.CompanyFieldForm;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
@@ -38,6 +44,12 @@
private CompanyFieldMapper companyFieldMapper;
@Autowired
+ private IspFieldRepository ispFieldRepository;
+
+ @Autowired
+ private HostingFieldRepository hostingFieldRepository;
+
+ @Autowired
private UserService userService;
@Autowired
@@ -57,9 +69,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));
+ }
}
// �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
@@ -74,7 +109,6 @@
return this.convertCompanyVoToMap(results, totalCompanyCount, pageable, resJsonData);
}
-
// �뾽泥� �긽�꽭 議고쉶�븳�떎.
@Override
@@ -92,6 +126,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 +141,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,18 +163,18 @@
}
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("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("", this.messageAccessor.message("departmentManage.departmentDescription"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyPhone", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyDesc", this.messageAccessor.message("departmentManage.departmentCount"), 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);
@@ -142,18 +182,31 @@
return new ModelAndView(this.excelView);
}
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
- }
-
// 寃��깋 寃곌낵瑜� 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);
+ IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
+ if(ispFieldVo != null){
+ ispFieldVos.add(ispFieldVo);
+ }
+ companyFieldVo.setIspFieldVos(ispFieldVos);
+
+ HostingField hostingField = this.hostingFieldRepository.findByUrl(url);
+ HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
+ if(hostingFieldVo != null){
+ hostingFieldVos.add(hostingFieldVo);
+ }
+ companyFieldVo.setHostingFieldVos(hostingFieldVos);
+
companyFieldVos.add(companyFieldVo);
}
@@ -173,7 +226,6 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
}
-
CompanyField companyField = this.findOne(id);
if (companyField == null) {
--
Gitblit v1.8.0