From ad486a401ad59d44bd4187f6406fe8c11b046a1f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 16:05:09 +0900
Subject: [PATCH] - 파트너 정보 엑셀 임포트 시 연락처, 코드, 이메일 유효성 검사 - 특정 프로젝트로 설정된 상태에서 타 프로젝트의 이슈 클릭 시 대시보드로 이동되는 문제 해결
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 261 +++++++++++++++++++++++++++++++---------------------
1 files changed, 155 insertions(+), 106 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 82957da..6f5da98 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -9,7 +9,6 @@
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
import kr.wisestone.owl.web.form.CompanyFieldForm;
-import kr.wisestone.owl.web.form.IssueForm;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
+import java.util.regex.Pattern;
@Service
public class CompanyFieldServiceImpl extends AbstractServiceImpl<CompanyField, Long, JpaRepository<CompanyField, Long>> implements CompanyFieldService {
@@ -116,16 +116,18 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_NOT_URL));
}*/
- CompanyField companyField;
- if(id == null){
- companyField = this.companyFieldRepository.findByUrl(url);
- } else {
- companyField = this.companyFieldRepository.findByUrlAndIdNot(url,id);
- }
+ if (!StringUtils.isEmpty(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.COMPANY_USED_URL));
+ if (companyField != null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANY_USED_URL));
+ }
}
}
@@ -183,6 +185,9 @@
if (region != null) {
companyFieldVo.setRegionName(region.getUseValue());
}
+ }
+ if (companyField.getStatusName() != null && !companyField.getStatusName().equals("")) {
+ companyFieldVo.setStatusName(companyField.getStatusName());
}
return companyFieldVo;
}
@@ -353,7 +358,7 @@
}
}
- // �뿊�� import 濡� �씠�뒋瑜� �벑濡앺븳�떎.
+ // �뿊�� import 濡� �뾽泥대�� �벑濡앺븳�떎.
@Override
@Transactional
public void importExcel(MultipartFile multipartFile) throws Exception {
@@ -438,16 +443,49 @@
}
/**
+ * cell String�쑝濡� 蹂��솚 �븿�닔
+ * @param cell Cell
+ * @param isNull boolean
+ * @return String
+ */
+ private String stringToCell (Cell cell, boolean isNull) {
+ String cellStr = "";
+ if (!isNull) {
+ cellStr = CommonUtil.convertExcelStringToCell(cell);
+ // 怨듬갚 �젣嫄�
+ cell.setCellValue(cellStr.trim());
+ } else {
+ cell.setCellValue(cellStr);
+ }
+ return cellStr;
+ }
+
+ /**
* cell NULL 泥댄겕 �븿�닔
* @param cell Cell
* @return boolean
*/
private Boolean cellNullCheck (Cell cell) {
- return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ int cellType = cell.getCellType();
+ if (cellType < Cell.CELL_TYPE_BLANK) {
+ if (cellType == Cell.CELL_TYPE_STRING) {
+ if (cell.getStringCellValue() != null && !cell.getStringCellValue().equals("")) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ return true;
}
+ /**
+ * �쟾�솕踰덊샇 CellType 泥댄겕 �븿�닔
+ * @param cell Cell
+ * @param rowIndex int
+ */
private void telTypeCheck (Cell cell, int rowIndex) {
- if (cell.getCellType() != cell.CELL_TYPE_STRING) {
+ if (cell != null && cell.getCellType() != cell.CELL_TYPE_STRING) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_TEL_NOT_STRING_TYPE, rowIndex));
}
@@ -463,122 +501,111 @@
for (int cellIndex = 0; cellIndex < headers.size(); cellIndex++) {
Cell cell = row.getCell(cellIndex);
+
+ String cellStr = "";
+ boolean isNull = true;
+
+ if (cell != null) {
+ isNull = cellNullCheck(cell);
+ cellStr = stringToCell(cell, isNull); //cell�쓣 String�쑝濡� 蹂��솚
+ }
+
switch (cellIndex) {
case 0:
// �뾽泥대챸
- this.setCompanyFormName(cell, companyFieldForm, rowIndex);
+ if (isNull) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NAME_IS_NULL, rowIndex));
+ }
+ this.setCompanyFormName(cellStr, companyFieldForm);
break;
case 1:
// url
- if (cellNullCheck(cell)) {
- this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormUrl(cellStr, companyFieldForm, isNull);
break;
case 2:
// isp紐�
- if (cellNullCheck(cell)) {
- this.setCompanyFormIspName(cell, ispFieldMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormIspName(cellStr, ispFieldMaps, companyFieldForm, rowIndex, isNull);
break;
case 3:
// �샇�뒪�똿紐�
- if (cellNullCheck(cell)) {
- this.setCompanyFormHostingName(cell, hostingFieldMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormHostingName(cellStr, hostingFieldMaps, companyFieldForm, rowIndex, isNull);
break;
case 4:
// �뿰�씫泥�
- this.telTypeCheck(cell, rowIndex); // �뀓�뒪�듃 �삎�떇 泥댄겕
-
- if (cellNullCheck(cell)) {
- this.setCompanyFormTel(cell, companyFieldForm, rowIndex);
- }
+ telTypeCheck(cell, rowIndex);
+ this.setCompanyFormTel(cellStr, companyFieldForm, isNull);
break;
case 5:
// �씠硫붿씪
- if (cellNullCheck(cell)) {
- this.setCompanyFormEmail(cell, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormEmail(cellStr, companyFieldForm, isNull);
break;
case 6:
// �떞�떦�옄
- if (cellNullCheck(cell)) {
- this.setCompanyFormManager(cell, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormManager(cellStr, companyFieldForm, isNull);
break;
case 7:
// 湲곗뾽援щ텇
- if (cellNullCheck(cell)) {
- this.setCompanyFormCompanyType(cell, companyTypeMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormCompanyType(cellStr, companyTypeMaps, companyFieldForm, rowIndex, isNull);
break;
case 8:
// �뾽醫�(��遺꾨쪟)
- if (cellNullCheck(cell)) {
- this.setCompanyFormParentSector(cell, parentSectorMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormParentSector(cellStr, parentSectorMaps, companyFieldForm, rowIndex, isNull);
break;
case 9:
// �뾽醫�(以묐텇瑜�)
- if (cellNullCheck(cell)) {
- this.setCompanyFormChildSector(cell, childSectorMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormChildSector(cellStr, childSectorMaps, companyFieldForm, rowIndex, isNull);
break;
case 10:
// 吏��뿭
- if (cellNullCheck(cell)) {
- this.setCompanyFormRegion(cell, regionMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormRegion(cellStr, regionMaps, companyFieldForm, rowIndex, isNull);
break;
case 11:
// �긽�깭
- if (cellNullCheck(cell)) {
- this.setCompanyFormStatus(cell, statusMaps, companyFieldForm, rowIndex);
- }
+ this.setCompanyFormStatus(cellStr, statusMaps, companyFieldForm, isNull);
break;
case 12:
// 鍮꾧퀬
- if (cellNullCheck(cell)) {
- this.setCompanyFormMemo(cell, companyFieldForm, rowIndex);
- }
- break;
+ this.setCompanyFormMemo(cellStr, companyFieldForm, isNull);
}
}
return companyFieldForm;
}
- private void setCompanyFormMemo(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- companyFieldForm.setMemo(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormMemo(String cellStr, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
+ companyFieldForm.setMemo(cellStr);
+ }
}
- private void setCompanyFormStatus(Cell cell, Map<String, Map<String, Object>> statusMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- Map<String, Object> statusMap = statusMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormStatus(String cellStr, Map<String, Map<String, Object>> statusMaps, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
+ Map<String, Object> statusMap = statusMaps.get(cellStr);
if (MapUtil.getLong(statusMap, "id") != null) {
companyFieldForm.setStatusId(MapUtil.getLong(statusMap, "id"));
} else {
companyFieldForm.setStatusId(120L);
}
- companyFieldForm.setStatusName(CommonUtil.convertExcelStringToCell(cell));
+ companyFieldForm.setStatusName(cellStr);
}
}
- private void setCompanyFormRegion(Cell cell, Map<String, Map<String, Object>> regionMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- Map<String, Object> regionMap = regionMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormRegion(String cellStr, Map<String, Map<String, Object>> regionMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ Map<String, Object> regionMap = regionMaps.get(cellStr);
if (regionMap == null) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_REGION_NOT_EXIST, rowIndex));
@@ -587,9 +614,9 @@
}
}
- private void setCompanyFormChildSector(Cell cell, Map<String, Map<String, Object>> childSectorMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- Map<String, Object> childSectorMap = childSectorMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormChildSector(String cellStr, Map<String, Map<String, Object>> childSectorMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ Map<String, Object> childSectorMap = childSectorMaps.get(cellStr);
// ��遺꾨쪟 �뾾�씠 以묐텇瑜섎쭔 �엯�젰�뻽�쓣寃쎌슦
if (companyFieldForm.getParentSectorId() == null) {
@@ -607,9 +634,9 @@
}
}
- private void setCompanyFormParentSector(Cell cell, Map<String, Map<String, Object>> parentSectorMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- Map<String, Object> parentSectorMap = parentSectorMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormParentSector(String cellStr, Map<String, Map<String, Object>> parentSectorMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ Map<String, Object> parentSectorMap = parentSectorMaps.get(cellStr);
if (parentSectorMap == null) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PARENT_SECTOR_NOT_EXIST, rowIndex));
@@ -618,9 +645,9 @@
}
}
- private void setCompanyFormCompanyType(Cell cell, Map<String, Map<String, Object>> companyTypeMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- Map<String, Object> companyTypeMap = companyTypeMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormCompanyType(String cellStr, Map<String, Map<String, Object>> companyTypeMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ Map<String, Object> companyTypeMap = companyTypeMaps.get(cellStr);
if (companyTypeMap == null) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_TYPE_NOT_EXIST, rowIndex));
@@ -629,38 +656,68 @@
}
}
- private void setCompanyFormManager(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- companyFieldForm.setManager(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormManager(String manager, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
+ companyFieldForm.setManager(manager);
}
}
- private void setCompanyFormEmail(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- String email = CommonUtil.convertExcelStringToCell(cell);
- if (CommonUtil.convertExcelStringToCell(cell).contains(" ")) {
- email = CommonUtil.convertExcelStringToCell(cell).replace(" ", "");
- }
+ private void setCompanyFormEmail(String email, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
+ // �씠硫붿씪 �쑀�슚�꽦 寃��궗
+ email = this.verifyEmail(email);
companyFieldForm.setEmail(email);
}
}
- private void setCompanyFormTel(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- String tel = CommonUtil.convertExcelStringToCell(cell);
- if (tel.contains("-")) {
- tel = tel.replace("-", "");
- }
- if (tel.contains(" ")) {
- tel = tel.replace(" ", "");
- }
+ /**
+ * �씠硫붿씪 �쑀�슚�꽦 寃��궗
+ * @param email String
+ * @return String
+ */
+ private String verifyEmail(String email) {
+ if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.EMAIL_NOT_INVALID));
+ }
+
+ if (email.contains(" ")) {
+ email = email.replace(" ", "");
+ }
+
+ return email;
+ }
+
+ private void setCompanyFormTel(String tel, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
+ // �뿰�씫泥� �쑀�슚�꽦 寃��궗
+ tel = this.verifyTel(tel);
companyFieldForm.setTel(tel);
}
}
- private void setCompanyFormHostingName(Cell cell, Map<String, HostingField> hostingFieldMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- HostingField hostingField = hostingFieldMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ /**
+ * �뿰�씫泥� �쑀�슚�꽦 寃��궗
+ * @param tel String
+ * @return String
+ */
+ private String verifyTel(String tel) {
+ if (!Pattern.matches("^[0-9-]{2,20}$", tel)) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.TEL_NOT_INVALID));
+ }
+
+ if (tel.contains("-")) {
+ tel = tel.replace("-", "");
+ }
+ if (tel.contains(" ")) {
+ tel = tel.replace(" ", "");
+ }
+
+ return tel;
+ }
+
+ private void setCompanyFormHostingName(String cellStr, Map<String, HostingField> hostingFieldMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ HostingField hostingField = hostingFieldMaps.get(cellStr);
if (hostingField == null) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_HOSTING_NOT_EXIST, rowIndex));
@@ -669,9 +726,9 @@
}
}
- private void setCompanyFormIspName(Cell cell, Map<String, IspField> ispFieldMaps, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- IspField ispField = ispFieldMaps.get(CommonUtil.convertExcelStringToCell(cell));
+ private void setCompanyFormIspName(String cellStr, Map<String, IspField> ispFieldMaps, CompanyFieldForm companyFieldForm, int rowIndex, boolean isNull) {
+ if (!isNull) {
+ IspField ispField = ispFieldMaps.get(cellStr);
if (ispField == null) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISP_NOT_EXIST, rowIndex));
@@ -680,22 +737,14 @@
}
}
- private void setCompanyFormName(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NAME_IS_NULL, rowIndex));
- }
-
- String title = CommonUtil.convertExcelStringToCell(cell);
-
+ private void setCompanyFormName(String title, CompanyFieldForm companyFieldForm) {
// �뾽泥대챸 �쑀�슚�꽦 泥댄겕
this.verifyTitle(title, null);
companyFieldForm.setName(title);
}
- private void setCompanyFormUrl(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
- if (cell != null) {
- String url = CommonUtil.convertExcelStringToCell(cell);
+ private void setCompanyFormUrl(String url, CompanyFieldForm companyFieldForm, boolean isNull) {
+ if (!isNull) {
if (url.contains(" ")) {
url = url.replace(" ", "");
}
--
Gitblit v1.8.0