| src/main/java/kr/wisestone/owl/constant/MsgConstants.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -185,6 +185,7 @@ public static final String EXCEL_IMPORT_DATETIME_NOT_DASH = "EXCEL_IMPORT_DATETIME_NOT_DASH"; // 다음 엑셀 라인에서 입력한 사용자 정의 필드에 문제가 있습니다. '-'이 포함되어 있는지 확인 후 '-'를 포함 시켜주세요. ex) 2022-01-01 public static final String EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY = "EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY"; // 다음 엑셀 라인에서 입력한 사용자 정의 필드 값이 유효하지 않습니다. public static final String EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST = "EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST"; // 등록하려는 사용자 정의 필드를 찾을 수 없습니다. 해당 사용자 정의필드의 이름이 변경되었거나 삭제되었습니다. public static final String EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY = "EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY"; // 다음 엑셀 라인에서 입력한 사용자 정의 필드 중 IP_ADDRESS 에 문제가 있습니다. IP주소 형식에 맞게 입력 해주세요. public static final String EXCEL_IMPORT_COMPANY_NAME_IS_NULL = "EXCEL_IMPORT_COMPANY_NAME_IS_NULL"; // 다음 엑셀 라인에서 업체명이 입력지 않았습니다. public static final String EXCEL_IMPORT_URL_IS_NULL = "EXCEL_IMPORT_URL_IS_NULL"; // 다음 엑셀 라인에서 URL이 입력지 않았습니다. src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -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)); } } }
@@ -49,9 +49,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Pattern; import static kr.wisestone.owl.domain.enumType.CustomFieldType.DATETIME; import static kr.wisestone.owl.domain.enumType.CustomFieldType.INPUT; import static kr.wisestone.owl.domain.enumType.CustomFieldType.*; @Service public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService { @@ -3765,7 +3765,8 @@ this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT)); } if (customField.getCustomFieldType() == DATETIME) { //DATETIME일 경우 format 변경 //DATETIME일 경우 format 변경 if (customField.getCustomFieldType() == DATETIME) { Date date = DateUtil.convertStrToDate(cellValue); if (date == null) { throw new OwlRuntimeException( @@ -3773,6 +3774,19 @@ } } //IP_ADDRESS일 경우 정규표현식 체크 if (customField.getCustomFieldType() == IP_ADDRESS) { String regExp = "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"; if (!cellValue.matches(regExp)) { throw new OwlRuntimeException( this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY, rowIndex)); } } issueCustomFieldMap.put("customFieldId", customField.getId()); issueCustomFieldMap.put("useValue", cellValue); issueForm.addIssueCustomFields(issueCustomFieldMap); src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
@@ -180,6 +180,7 @@ EXCEL_IMPORT_SEVERITY_NOT_EXIST=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC911\uC694\uB3C4 \uBA85\uC73C\uB85C \uAC80\uC0C9\uB418\uB294 \uC6B0\uC120\uC21C\uC704\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_IMPORT_PERIOD_NOT_VALID=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC2DC\uC791\uC77C, \uC885\uB8CC\uC77C\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uD615\uC2DD\uC5D0 \uB9DE\uAC8C \uC785\uB825 \uD588\uB294\uC9C0 \uD655\uC778 \uD574\uC8FC\uC138\uC694. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uAC12\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uC911 IP_ADDRESS\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. IP\uC8FC\uC18C \uD615\uC2DD\uC5D0 \uB9DE\uAC8C \uC785\uB825 \uD574\uC8FC\uC138\uC694. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST=\uB4F1\uB85D\uD558\uB824\uB294 \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD574\uB2F9 \uC0AC\uC6A9\uC790 \uC815\uC758\uD544\uB4DC\uC758 \uC774\uB984\uC774 \uBCC0\uACBD\uB418\uC5C8\uAC70\uB098 \uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_IMPORT_PERIOD_NOT_VALIDITY= \uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC2DC\uC791\uC77C, \uC885\uB8CC\uC77C\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uC2DC\uC791\uC77C\uC740 \uC885\uB8CC\uC77C\uBCF4\uB2E4 \uBE68\uB77C\uC57C \uD569\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0} EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC2DC\uC791\uC77C, \uC885\uB8CC\uC77C\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uACF5\uBC31\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778 \uD6C4 \uACF5\uBC31\uC744 \uC81C\uAC70\uD558\uC138\uC694. \n \uB77C\uC778 \uC815\uBCF4 : {0}
