From 4ab15ca2bb74d0d33d1325d849422635b9d415b1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 2월 2022 15:31:39 +0900
Subject: [PATCH] 업체 임포트 시 코드 보완
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 32 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 0e3b6e7..eda71d1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -83,8 +83,11 @@
public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
// �뾽泥대챸 以묐났 泥댄겕
this.verifyTitle(companyFieldForm.getName(), null);
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(companyFieldForm.getUrl(), null);
+
+ if (companyFieldForm.getUrl() != null) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), null);
+ }
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
String tels = companyFieldForm.getTelList().toString();
@@ -109,12 +112,11 @@
// url �쑀�슚�꽦 泥댄겕
private void verifyUrl(String url, Long id) {
- if (StringUtils.isEmpty(url)) {
+ /*if (StringUtils.isEmpty(url)) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_NOT_URL));
- }
+ }*/
CompanyField companyField;
-
if(id == null){
companyField = this.companyFieldRepository.findByUrl(url);
} else {
@@ -222,8 +224,11 @@
public void modifyCompany(CompanyFieldForm companyFieldForm) {
// �뾽泥대챸 �쑀�슚�꽦 泥댄겕
this.verifyTitle(companyFieldForm.getName(), companyFieldForm.getId());
- // url �쑀�슚�꽦 泥댄겕
- this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+
+ if (companyFieldForm.getUrl() != null) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
+ }
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
String tels = companyFieldForm.getTelList().toString();
@@ -437,9 +442,34 @@
* @param cell Cell
* @return boolean
*/
- private Boolean cellNullCheck (Cell cell) {
- return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ private Boolean cellNullCheck (Cell cell, int rowIndex) {
+ boolean result = false;
+
+ // 臾몄옄�삎�떇�씤吏� 泥댄겕
+ if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK && cell.getCellType() != cell.CELL_TYPE_STRING) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_NOT_STRING_TYPE, rowIndex));
+ }
+
+ // 怨듬갚 �젣嫄�
+ if (cell != null && cell.getCellType() == cell.CELL_TYPE_STRING && cell.getStringCellValue() != null) {
+ cell.setCellValue(cell.getStringCellValue().trim());
+ }
+
+ if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK && cell.getCellType() == cell.CELL_TYPE_STRING
+ && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("")) {
+ result = true;
+ }
+
+ return result;
}
+
+ /*private void telTypeCheck (Cell cell, int rowIndex) {
+ if (cell != null && cell.getCellType() != cell.CELL_TYPE_STRING) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_TEL_NOT_STRING_TYPE, rowIndex));
+ }
+ }*/
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �뾽泥� form �쑝濡� �삷湲대떎.
private CompanyFieldForm setCompanyFieldFormToExcelField(Row row, int rowIndex, Map<String, IspField> ispFieldMaps, Map<String, HostingField> hostingFieldMaps,
@@ -459,82 +489,85 @@
case 1:
// url
- this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
+ if (cellNullCheck(cell, rowIndex)) {
+ this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
+ }
break;
case 2:
// isp紐�
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormIspName(cell, ispFieldMaps, companyFieldForm, rowIndex);
}
break;
case 3:
// �샇�뒪�똿紐�
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormHostingName(cell, hostingFieldMaps, companyFieldForm, rowIndex);
}
break;
case 4:
// �뿰�씫泥�
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
+ //this.telTypeCheck(cell, rowIndex);
this.setCompanyFormTel(cell, companyFieldForm, rowIndex);
}
break;
case 5:
// �씠硫붿씪
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormEmail(cell, companyFieldForm, rowIndex);
}
break;
case 6:
// �떞�떦�옄
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormManager(cell, companyFieldForm, rowIndex);
}
break;
case 7:
// 湲곗뾽援щ텇
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormCompanyType(cell, companyTypeMaps, companyFieldForm, rowIndex);
}
break;
case 8:
// �뾽醫�(��遺꾨쪟)
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormParentSector(cell, parentSectorMaps, companyFieldForm, rowIndex);
}
break;
case 9:
// �뾽醫�(以묐텇瑜�)
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormChildSector(cell, childSectorMaps, companyFieldForm, rowIndex);
}
break;
case 10:
// 吏��뿭
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormRegion(cell, regionMaps, companyFieldForm, rowIndex);
}
break;
case 11:
// �긽�깭
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormStatus(cell, statusMaps, companyFieldForm, rowIndex);
}
break;
case 12:
// 鍮꾧퀬
- if (cellNullCheck(cell)) {
+ if (cellNullCheck(cell, rowIndex)) {
this.setCompanyFormMemo(cell, companyFieldForm, rowIndex);
}
break;
@@ -665,7 +698,7 @@
}
private void setCompanyFormName(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell == null) {
+ if (!cellNullCheck(cell, rowIndex)) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NAME_IS_NULL, rowIndex));
}
@@ -678,17 +711,15 @@
}
private void setCompanyFormUrl(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_URL_IS_NULL, rowIndex));
- }
- String url = CommonUtil.convertExcelStringToCell(cell);
- if (url.contains(" ")) {
- url = url.replace(" ", "");
- }
- this.verifyUrl(url, null); //url �쑀�슚�꽦 寃��궗
+ if (cell != null) {
+ String url = CommonUtil.convertExcelStringToCell(cell);
+ if (url.contains(" ")) {
+ url = url.replace(" ", "");
+ }
+ this.verifyUrl(url, null); //url �쑀�슚�꽦 寃��궗
- companyFieldForm.setUrl(url);
+ companyFieldForm.setUrl(url);
+ }
}
// �뾽泥대챸 �쑀�슚�꽦 泥댄겕
--
Gitblit v1.8.0