From 4984d702e9c95c559168b2de1cb98cc2bb530bd9 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 1 Dec 2021 17:19:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=9B=B9=EC=B7=A8=EC=95=BD=EC=A0=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/restful/service/DataApiVO.java | 2 +- src/main/java/nlib/sch/service/CmmVO.java | 10 +++--- .../service/impl/NlibSearchServiceImpl.java | 3 +- .../nlib/sch/web/NlibSearchController.java | 32 +++++++++++-------- .../search/getDetailedSearchFormPopup.jsp | 2 +- .../WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp | 9 +++++- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/main/java/nlib/restful/service/DataApiVO.java b/src/main/java/nlib/restful/service/DataApiVO.java index fdda24e7..8b0d8c02 100644 --- a/src/main/java/nlib/restful/service/DataApiVO.java +++ b/src/main/java/nlib/restful/service/DataApiVO.java @@ -182,7 +182,7 @@ public class DataApiVO { int pageIndex = 0; try { pageIndex = Integer.parseInt(getInfoItem(XML_EL_NAME_PAGE_INDEX, "0")); - } catch(Exception e) { + } catch(NumberFormatException e) { log.error("getPageIndex > " + e.toString()); return 0; } diff --git a/src/main/java/nlib/sch/service/CmmVO.java b/src/main/java/nlib/sch/service/CmmVO.java index 729090b5..cdf3289c 100644 --- a/src/main/java/nlib/sch/service/CmmVO.java +++ b/src/main/java/nlib/sch/service/CmmVO.java @@ -624,33 +624,33 @@ public class CmmVO implements Serializable{ } public String[] getSearchLocaleArray() { - return searchLocaleArray; + return this.searchLocaleArray; } public void setSearchLocaleArray(String[] searchLocaleArray) { this.searchLocaleArray = searchLocaleArray; } public String[] getSearchAssetClassArray() { - return searchAssetClassArray; + return this.searchAssetClassArray; } public void setSearchAssetClassArray(String[] searchAssetClassArray) { this.searchAssetClassArray = searchAssetClassArray; } public String[] getSearchAssetTypeArray() { - return searchAssetTypeArray; + return this.searchAssetTypeArray; } public void setSearchAssetTypeArray(String[] searchAssetTypeArray) { this.searchAssetTypeArray = searchAssetTypeArray; } public String getsCouncilCd() { - return sCouncilCd; + return this.sCouncilCd; } public void setsCouncilCd(String sCouncilCd) { this.sCouncilCd = sCouncilCd; } public String[] getSearchFirstCategoryArray() { - return searchFirstCategoryArray; + return this.searchFirstCategoryArray; } public void setSearchFirstCategoryArray(String[] searchFirstCategoryArray) { this.searchFirstCategoryArray = searchFirstCategoryArray; diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 1d4ae839..65fada18 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.stereotype.Service; import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import com.google.gson.Gson; @@ -299,7 +300,7 @@ public class NlibSearchServiceImpl implements NlibSearchService{ searchVO.setSubjectCountList(subjectMap); searchVO.setTypeCountList(typeMap); searchVO.setOrgCountList(orgMap); - } catch(Exception e) { + } catch(RestClientException e) { log.error("getSearch > Exception 발생 : " + e.toString()); } return searchVO; diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 9e1daa0f..fcdaaa72 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -1,6 +1,7 @@ package nlib.sch.web; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; @@ -110,18 +111,19 @@ public class NlibSearchController extends NlibCommonController { if(searchVO.getPageIndex() < 1) searchVO.setPageIndex(1); if(searchVO.getPageSize() < 1) searchVO.setPageSize(DEFUALT_PAGE_SIZE); - //검색엔진 + searchVO.setQuery(StringUtil.getString(searchVO.getQuery(), "")); + searchVO.setReQuery(StringUtil.getString(searchVO.getReQuery(), "")); + + //결과내재검색만 입력했을경우 + if(searchVO.getQuery().length() == 0 && searchVO.getReQuery().length() > 0) + { + searchVO.setQuery(searchVO.getReQuery()); + searchVO.setReQuery(""); + searchVO.setReQueryChk("query"); + } + //검색엔진 try{ - searchVO.setQuery(StringUtil.getString(searchVO.getQuery(), "")); - searchVO.setReQuery(StringUtil.getString(searchVO.getReQuery(), "")); - - //결과내재검색만 입력했을경우 - if(searchVO.getQuery().length() == 0 && searchVO.getReQuery().length() > 0) - { - searchVO.setQuery(searchVO.getReQuery()); - searchVO.setReQuery(""); - searchVO.setReQueryChk("query"); - } + searchVO = nlibSearchService.getSearch(searchVO); @@ -144,12 +146,16 @@ public class NlibSearchController extends NlibCommonController { // 경로 NlibCmmUtil.setNfsPathModelMap(request,model); - + model.addAttribute("pageVO", pageVO); model.addAttribute("searchVO", searchVO); + + }catch(NumberFormatException e){ + log.error("searchList.do paging > NumberFormatException 발생 : " + e.toString()); }catch(Exception e){ log.error("searchList.do getSearch > Exception 발생 : " + e.toString()); } + //주제분야 목록 조회 List> clsf = codeService.listCtClsfs(); //자료유형 @@ -404,7 +410,7 @@ public class NlibSearchController extends NlibCommonController { break; } } - } catch (Exception e) { + } catch (IOException e) { log.error("shorturl-data.do 단축url > Exception 발생 : " + e.toString()); } return returnUrl; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp index c4a36c28..fb38918f 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -100,7 +100,7 @@ $(document).ready(function() { depth1 = $(this).parents('.depth2').siblings('.depth1-check').find('label').text(); depth2 = $("label[for='"+$(this).attr('id')+"']").text(); - html = "
    • " + html = "
    • " $(this).parents('.depth2').siblings('.depth1-check').find('input').prop('checked', true); $(this).parents('.conditions-box').siblings('.selected-conditions').find('.conditions').append(html); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp index 1576c1b4..e163c445 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp @@ -42,6 +42,10 @@ $(document).ready(function() { %> $("[id^='mobileSuc']").css("display","inline-block"); $("[id^='emailSuc']").css("display","inline-block"); + + $("[id^='service-chk2-']").change(function(){ + $(this).val(); + }); <% //새비밀번호,새비밀번호확인이 일치하는지 확인 %> @@ -752,7 +756,10 @@ function snsUnlink(snsId){

    - +

    + 일치합니다. + +

    9자리 이상, 숫자/문자/특수문자를 혼합하여 입력