diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 28e19566..08c37548 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -194,98 +194,103 @@ public class NlibSearchServiceImpl implements NlibSearchService{ { //주제분야 , 자료유형 ,생산기관 별 카운트 tmpList = (JsonArray) tmp.get("CategoryGroup"); - - for( k=0; k < tmpList.size(); k++){ - filterObject = (JsonObject) tmpList.get(k); - - if(filterObject.get("SUBJECT_CATE") != null) - { - subjectList = (JsonArray) filterObject.get("SUBJECT_CATE"); - } - if(filterObject.get("DIV_CATE") != null) - { - typeList = (JsonArray) filterObject.get("DIV_CATE"); - } - if(filterObject.get("ORG_NM") != null) - { - orgList = (JsonArray) filterObject.get("ORG_NM"); - } - } - if(subjectList.size()>0) + if(tmpList != null) { - filterObject =(JsonObject) subjectList.get(0); - filterObject = (JsonObject) filterObject.get("Categories"); - subjectList = (JsonArray) filterObject.get("Category"); - }; - if(typeList.size()>0) - { - filterObject =(JsonObject) typeList.get(0); - filterObject = (JsonObject) filterObject.get("Categories"); - typeList = (JsonArray) filterObject.get("Category"); - }; - if(orgList.size()>0) - { - filterObject =(JsonObject) orgList.get(0); - filterObject = (JsonObject) filterObject.get("Categories"); - orgList = (JsonArray) filterObject.get("Category"); - }; - for(k = 0; k < subjectList.size(); k++){ - HashMap temp = new HashMap(); - filterObject = (JsonObject)subjectList.get(k); - nameTemp = filterObject.get("Name").getAsString(); - //상위코드값 - code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^")); - temp.put("category_nm_up",code_up); - - //코드값 - code = nameTemp.substring(nameTemp.lastIndexOf("@")+1); - temp.put("category_nm",code); - temp.put("category_cnt",filterObject.get("Count").getAsString()); - subjectMap.add(temp); - } - for(k = 0; k < typeList.size(); k++){ - HashMap temp = new HashMap(); - filterObject = (JsonObject)typeList.get(k); - nameTemp = filterObject.get("Name").getAsString(); - //상위코드값 - code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^")); - temp.put("class_nm_up",code_up); - - //코드값 - code = nameTemp.substring(nameTemp.lastIndexOf("@")+1); - temp.put("class_nm",code); - temp.put("class_cnt",filterObject.get("Count").getAsString()); - typeMap.add(temp); - } - for(k = 0; k < orgList.size(); k++){ - HashMap temp = new HashMap(); - filterObject = (JsonObject)orgList.get(k); - nameTemp = filterObject.get("Name").getAsString(); - if(!"null".equals(nameTemp)) { - temp.put("org_nm",nameTemp); - temp.put("org_cnt",filterObject.get("Count").getAsString()); - orgMap.add(temp); - } + for( k=0; k < tmpList.size(); k++){ + filterObject = (JsonObject) tmpList.get(k); + + if(filterObject.get("SUBJECT_CATE") != null) + { + subjectList = (JsonArray) filterObject.get("SUBJECT_CATE"); + } + if(filterObject.get("DIV_CATE") != null) + { + typeList = (JsonArray) filterObject.get("DIV_CATE"); + } + if(filterObject.get("ORG_NM") != null) + { + orgList = (JsonArray) filterObject.get("ORG_NM"); + } + } + if(subjectList.size()>0) + { + filterObject =(JsonObject) subjectList.get(0); + filterObject = (JsonObject) filterObject.get("Categories"); + subjectList = (JsonArray) filterObject.get("Category"); + }; + if(typeList.size()>0) + { + filterObject =(JsonObject) typeList.get(0); + filterObject = (JsonObject) filterObject.get("Categories"); + typeList = (JsonArray) filterObject.get("Category"); + }; + if(orgList.size()>0) + { + filterObject =(JsonObject) orgList.get(0); + filterObject = (JsonObject) filterObject.get("Categories"); + orgList = (JsonArray) filterObject.get("Category"); + }; + for(k = 0; k < subjectList.size(); k++){ + HashMap temp = new HashMap(); + filterObject = (JsonObject)subjectList.get(k); + nameTemp = filterObject.get("Name").getAsString(); + //상위코드값 + code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^")); + temp.put("category_nm_up",code_up); + + //코드값 + code = nameTemp.substring(nameTemp.lastIndexOf("@")+1); + temp.put("category_nm",code); + temp.put("category_cnt",filterObject.get("Count").getAsString()); + subjectMap.add(temp); + } + for(k = 0; k < typeList.size(); k++){ + HashMap temp = new HashMap(); + filterObject = (JsonObject)typeList.get(k); + nameTemp = filterObject.get("Name").getAsString(); + //상위코드값 + code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^")); + temp.put("class_nm_up",code_up); + + //코드값 + code = nameTemp.substring(nameTemp.lastIndexOf("@")+1); + temp.put("class_nm",code); + temp.put("class_cnt",filterObject.get("Count").getAsString()); + typeMap.add(temp); + } + for(k = 0; k < orgList.size(); k++){ + HashMap temp = new HashMap(); + filterObject = (JsonObject)orgList.get(k); + nameTemp = filterObject.get("Name").getAsString(); + if(!"null".equals(nameTemp)) { + temp.put("org_nm",nameTemp); + temp.put("org_cnt",filterObject.get("Count").getAsString()); + orgMap.add(temp); + } + } } tmp = (JsonObject) tmp.get("DocumentSet"); searchVO.setTotalCount(tmp.get("TotalCount").getAsString()); colArray = (JsonArray) tmp.get("Document"); - //vo list로 json list 파싱 - for(j=0;j snsList = new ArrayList(); @@ -158,6 +173,7 @@ public class UserInfoController extends NlibCommonController { * @return * @exception Exception */ + @Secured("ROLE_USER") @RequestMapping(value="/userInfo/updateMyInfo.do" , method=RequestMethod.POST) public String updateMyInfo(NlibLoginVO vo,Authentication authentication,HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{ @@ -209,6 +225,7 @@ public class UserInfoController extends NlibCommonController { * 내 정보 수정 전 password 인증 * @exception Exception */ + @Secured("ROLE_USER") @RequestMapping(value="/userInfo/pwCertMyInfo.do") public String pwCertMyInfo(HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{ NlibLoginVO nlibLoginVO = getNlibLoginVO(request); diff --git a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml index 5a496088..e67fa76a 100644 --- a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml @@ -37,9 +37,9 @@ FROM UAC_CLTR_DB.MB_INFO A /* 사용자정보 */ JOIN UAC_CLTR_DB.MB_SNS B /* 사용자 SNS 정보 */ ON A.MB_INFO_ID = B.MB_INFO_ID - WHERE B.SNS_ID = #{snsId} - AND UPPER(SNS_TYPE) = UPPER(#{snsType}) + WHERE A.MB_INFO_ID = #{mbInfoId} AND B.UNLINK_DD IS NULL /* 연동해제건 제외 */ + ORDER BY B.REG_DD LIMIT 1 ]]> diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index ec5f48ad..a8a43ab3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -17,10 +17,10 @@ $(document).ready(function() { }); function goSearch(){ - if($("#top_query").val() != "") + /* if($("#top_query").val() != "") { $('#searchHeaderForm input[name=filter_mylist]').val("search_query,"); - } + } */ document.searchHeaderForm.submit(); } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index a5beac5d..0052300e 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -154,7 +154,6 @@ // 출력 $.each(jsonObj.data,function(key,obj) { var t_data = ""; - var count = 0; t_data += "
"; t_data += "\"즐겨찾기\"즐겨찾기
"; t_data += "
" @@ -184,32 +183,55 @@ t_data += "
" t_data += "
" - if(!fn_isEmpty(obj.typeCodeNm)) - { - count += 1; - t_data += "자료유형 : " + obj.typeCodeNm + " > " + obj.dtlsTypeDivNm + "" + + t_data += "자료유형 : " + if(!fn_isEmpty(obj.typeCodeNm)){ + t_data += obj.typeCodeNm } - if(!fn_isEmpty(obj.subjectNmUp)) - { - if(count > 0) - t_data += " | "; - count += 1; - t_data += "주제분야 : " + obj.subjectNmUp + " > " + obj.subjectNm + "" + if(!fn_isEmpty(obj.typeCodeNm) && !fn_isEmpty(obj.dtlsTypeDivNm)){ + t_data += " > " } - if(!fn_isEmpty(obj.orgNm)) - { - if(count > 0) - t_data += " | "; - count += 1; - t_data += "생산기관 : " + obj.orgNm + "" + if(fn_isEmpty(obj.typeCodeNm) && fn_isEmpty(obj.dtlsTypeDivNm)){ + t_data += "-" } - if(!fn_isEmpty(obj.creatYyyy)) - { - if(count > 0) - t_data += " | "; - count += 1; - t_data += "생산년도 : " + obj.creatYyyy + "" + if(!fn_isEmpty(obj.dtlsTypeDivNm)){ + t_data += obj.dtlsTypeDivNm } + t_data += "" + + t_data += "  |  " + t_data += "주제분야 : " + if(!fn_isEmpty(obj.subjectNmUp)){ + t_data += obj.subjectNmUp + } + if(!fn_isEmpty(obj.subjectNmUp) && !fn_isEmpty(obj.subjectNm)){ + t_data += " > " + } + if(fn_isEmpty(obj.subjectNmUp) && fn_isEmpty(obj.subjectNm)){ + t_data += "-" + } + if(!fn_isEmpty(obj.subjectNm)){ + t_data += obj.subjectNm + } + t_data += "" + + t_data += "  |  " + t_data += "생산기관 : " + if(!fn_isEmpty(obj.orgNm)){ + t_data += obj.orgNm + }else{ + t_data += "-" + } + t_data += "" + + t_data += "  |  " + t_data += "생산년도 : " + if(!fn_isEmpty(obj.creatYyyy)){ + t_data += obj.creatYyyy + }else{ + t_data += "-" + } + t_data += "" t_data += "
" var t_btn = ""; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 52d69b2d..f4197a66 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -131,6 +131,52 @@ function fnSetInitialValue() $("#m-year-1").prop('checked',true); } } + + +function goSearchNculture() { + + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "https://www.nculture.org/sch/totalSearchList.do"); + $(form).attr("method", "post"); + $(form).attr("target", "_blank"); + + var collection = document.createElement("input"); + $(collection).attr("name", "collection"); + $(collection).attr("value","reference_Coll"); + form.appendChild(collection); + + if(!fn_isEmpty($("#query").val())) + { + var query = document.createElement("input"); + $(query).attr("name", "query"); + $(query).attr("value", $("#query").val()); + form.appendChild(query); + } + if(!fn_isEmpty($("#reQuery").val())) + { + var reQuery = document.createElement("input"); + $(reQuery).attr("name", "reQuery"); + $(reQuery).attr("value", $("#reQuery").val()); + form.appendChild(reQuery); + } + if(!fn_isEmpty($("#filter_mylist").val())) + { + var filter_mylist = document.createElement("input"); + $(filter_mylist).attr("name", "filter_mylist"); + $(filter_mylist).attr("value", "category_A01,"); + form.appendChild(filter_mylist); + } + + document.body.appendChild(form); + form.submit(); + + document.body.removeChild(form); + + return; +} + + //탭 이동 function fnTabMoveSch(collection){ $("#collection").val(collection); @@ -443,9 +489,14 @@ function fn_search_article(pageIndex) { -
  • - 검색결과가 없습니다. -
    • +
    +
    +

    느낌표 아이콘

    +

    검색된 결과가 없습니다

    +

    지역N문화에서 더 많은 자료를 확인하세요!

    +

    +
    +
    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 480edc23..797ee68d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -223,11 +223,11 @@ function d_search(){ }else{ $("#d_filter_creatYyyy").val("all"); } - if($("#d_query").val() != "") +/* if($("#d_query").val() != "") { filter_myList+= "search_query,"; } - if($("#d_bookIndex").val() != "") + */ if($("#d_bookIndex").val() != "") { filter_myList+= "search_bookIndex,"; } diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js index 2eca2fe7..b4ac3a39 100644 --- a/src/main/webapp/js/search/reference.js +++ b/src/main/webapp/js/search/reference.js @@ -310,9 +310,9 @@ function fnLabel_reference(){ }else if(mylist_arr[j].indexOf("agency") >= 0){ var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_query") >= 0){ + }/*else if(mylist_arr[j].indexOf("search_query") >= 0){ $("#reference_fillter_append").append("
  • 검색어 > "+ $("#realQuery").val() + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ + }*/else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ $("#reference_fillter_append").append("
  • 목차 > "+ $("#bookIndex").val() + "
    • ").text(); }else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){ $("#reference_fillter_append").append("
  • 관리번호 > "+ $("#mngtNo").val() + "
    • ").text();