~jhpark/owl-kisa.git - maprexDevGit

			@@ -48,6 +48,7 @@
			import java.io.IOException;
			import java.text.ParseException;
			import java.util.*;
			import java.util.regex.Pattern;

			import static kr.wisestone.owl.domain.enumType.CustomFieldType.*;

			@@ -364,7 +365,7 @@
			} else {
			urls.add(useValue);
			}
			condition.setUrl(urls);
			condition.setUrls(urls);
			companyFields = this.companyFieldService.find(condition);

			if(companyFields != null && companyFields.size() > 0) {
			@@ -485,6 +486,38 @@
			return null;
			}

			/**
			* url 정규식 표현
			* @param url String
			*/
			private boolean verifyUrl(String url) {
			boolean urlChk = false;
			if (!StringUtils.isEmpty(url)) {
			String reg = "^((http\|https)://)?(www.)?([a-zA-Z0-9]+)\\.[a-z]+([a-zA-z0-9.?#]+)?";
			if(Pattern.matches(reg, url)) {
			urlChk = true;
			}
			}
			return urlChk;
			}

			/**
			* ip 정규식 표현
			* @param ip String
			* @return boolean
			*/
			private boolean verifyIp(String ip) {
			boolean ipChk = false;
			if (!StringUtils.isEmpty(ip)) {
			if (Pattern.matches("^(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]?)$", ip)) {
			ipChk = true;
			}
			}

			return ipChk;
			}

			// 중복된 상위 이슈 검색
			private List<Issue> findIssue(IssueApiForm issueApiform, IssueForm issueForm, List<CustomFieldApiOverlap> customFieldApiOverlaps, Long userId) {
			List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
			@@ -518,7 +551,7 @@
			useValue = useValue.replace(" ","");
			}

			if (customFieldApiOverlap.getCustomField().getCustomFieldType().equals(IP_ADDRESS)) {
			if (this.verifyIp(useValue)) {
			long ip = ConvertUtil.ipToLong(useValue);
			customFieldType = IP_ADDRESS.toString();
			if (cntIp == 0){
			@@ -527,7 +560,25 @@
			cntIp ++;
			}

			if(customFieldApiOverlap.getCustomField().getCustomFieldType().equals(SITE)) {
			if (this.verifyUrl(useValue)) {
			customFieldType = SITE.toString();
			if (cntSite == 0) {
			condition.setUrl(useValue);
			}
			cntSite ++;
			}

			/*if (customFieldApiOverlap.getCustomField().getCustomFieldType().equals(IP_ADDRESS)) {
			long ip = ConvertUtil.ipToLong(useValue);
			customFieldType = IP_ADDRESS.toString();
			if (cntIp == 0){
			condition.setIp(ip);
			}
			cntIp ++;
			}*/

			/*if(customFieldApiOverlap.getCustomField().getCustomFieldType().equals(SITE)) {
			customFieldType = SITE.toString();
			String[] urlArr = null;
			List<String> urls = Lists.newArrayList();
			if (useValue.contains(",")) {
			@@ -540,7 +591,7 @@
			condition.setUrl(urls);
			}
			cntSite ++;
			}
			}*/

			if (useIdx > 0) {
			concatUseValue = concatUseValue.concat(comma);
			@@ -552,7 +603,9 @@
			}

			// 추가 할 url or ip에 포함되어있는 파트너 찾기
			this.findPartner(condition, issueCompanyFields, issueIspFields, issueHostingFields);
			if ((condition.getIp() > 0) \|\| (condition.getUrl() != null && !condition.getUrl().equals(""))) {
			this.findPartner(condition, issueCompanyFields, issueIspFields, issueHostingFields);
			}

			issueForm.setIssueCompanyFields(issueCompanyFields);
			issueForm.setIssueIspFields(issueIspFields);
			@@ -576,8 +629,11 @@
			ipValue = ConvertUtil.ipToLong(concatUseValue);
			}
			issueCustomFieldValueCondition.setUseValue(String.valueOf(ipValue));
			// 하위이슈조건의 타입이 IP일 경우 같은 업체정보인 이슈 찾기
			results = this.issueMapper.findByCustomFieldValueOfIp(issueCustomFieldValueCondition);
			}

			if (issueCustomFieldValueCondition.getCustomFieldType() != null && !issueCustomFieldValueCondition.getCustomFieldType().equals("")) {
			// 사용자정의필드 타입이 IP_ADDRESS 또는 SITE 일 경우
			results = this.issueMapper.findByCustomFieldValueByCompany(issueCustomFieldValueCondition);
			} else {
			results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
			}
			@@ -1661,7 +1717,6 @@
			IssueVo issueVo = new IssueVo();
			Pageable relPageable = issueCondition.getRelPageable();
			Pageable downPageable = issueCondition.getDownPageable();
			boolean hideCompleteIssue = issueCondition.getHideCompleteIssue();

			if (issueCondition.getId() != null) {
			Issue issue = this.getIssue(issueCondition.getId());
			@@ -1693,11 +1748,14 @@
			this.setAttachedFiles(issue, issueVo); // 첨부 파일 정보 셋팅
			this.setIssueCustomFields(issue, issueVo); // 사용자 정의 필드 값 정보 셋팅
			this.setRelationIssue(issue, issueVo); //연관 일감 셋팅
			this.setDownIssues(issue, issueVo, hideCompleteIssue); //하위 이슈 세팅
			this.setDownIssues(issue, issueVo, issueCondition.getHideCompleteIssue()); //하위 이슈 세팅
			break;

			case "02": // 프로젝트, 이슈 유형, 이슈 상태, 우선순위, 중요도, 담당자, 첨부파일, 사용자 정의 필드 정보, 댓글, 기록을 셋팅한다.
			this.setIssueDetail(issueVo, issue, user, hideCompleteIssue); // 이슈 상세 정보를 셋팅한다.
			if (issueCondition.getHideCompleteIssue() == null) {
			issueCondition.setHideCompleteIssue(true);
			}
			this.setIssueDetail(issueVo, issue, user, issueCondition.getHideCompleteIssue()); // 이슈 상세 정보를 셋팅한다.
			this.setIssueTableConfigs(issue, issueVo, issueCondition);
			issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
			break;
			@@ -1731,10 +1789,6 @@


			// 하위 이슈 정보를 셋팅한다
			private void setDownIssues(Issue issue, IssueVo issueVo) {
			setDownIssues(issue, issueVo, false);
			}

			private void setDownIssues(Issue issue, IssueVo issueVo, boolean hideCompleteIssue) {
			Page<Issue> downIssues = null;