somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

상세검색 모든 검색파라미터 검색필터에 추가 (수정중)

Browse Source
This commit is contained in:
JSYOO 2021-11-11 14:20:45 +09:00
parent fbd3a26ee7
commit 9ac531709e
8 changed files with 123 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/nlib/col/web/InterestController.java
View File

@ -80,10 +80,18 @@ public class InterestController extends NlibCommonController
* @return * @return
*/ */
@RequestMapping("/interest/listInterests.do") @RequestMapping("/interest/listInterests.do")
public String listInterests(HttpServletRequest req, Authentication authentication, public String listInterests(HttpServletRequest req, HttpServletRequest request, Authentication authentication,
@RequestParam Map<String, String> paramMap, @RequestParam Map<String, String> paramMap,
CollectionVO searchCollectionVO, ModelMap model) throws Exception { CollectionVO searchCollectionVO, ModelMap model) throws Exception {
String message = "";
String mbInfoId = getMbInfoId(request);
if(StringUtil.isEmpty(mbInfoId)) {
message = "로그인하신 후, 이용바랍니다.";
model.addAttribute("message", message);
model.addAttribute("url", "/login/loginForm.do");
return "nlib/cmm/alert";
}
List<DeptVO> vo = new ArrayList(); List<DeptVO> vo = new ArrayList();
//사용자 정보를 가져온다. //사용자 정보를 가져온다.

1
src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
View File

@ -270,7 +270,6 @@ public class NlibSearchServiceImpl implements NlibSearchService{
} }
tmp = (JsonObject) tmp.get("DocumentSet"); tmp = (JsonObject) tmp.get("DocumentSet");
System.out.println(tmp.get("TotalCount").getAsString());
searchVO.setTotalCount(tmp.get("TotalCount").getAsString()); searchVO.setTotalCount(tmp.get("TotalCount").getAsString());
colArray = (JsonArray) tmp.get("Document"); colArray = (JsonArray) tmp.get("Document");

1
src/main/java/nlib/sch/web/NlibSearchController.java
View File

@ -245,6 +245,7 @@ public class NlibSearchController extends NlibCommonController {
vo.setRtnExpctDd(strNewDtFormat); vo.setRtnExpctDd(strNewDtFormat);
} }
model.addAttribute("result", vo); model.addAttribute("result", vo);
model.addAttribute("searchVO", searchVO);
model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri"));
return "nlib/collection/searchItemDetail"; return "nlib/collection/searchItemDetail";
} }

3
src/main/java/nlib/user/web/MemberController.java
View File

@ -238,7 +238,6 @@ public class MemberController extends NlibCommonController{
memberService.insertMemberSns(oauthUser); memberService.insertMemberSns(oauthUser);
vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail()))); vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail())));
vo.setName(StringUtil.maskName(vo.getName())); vo.setName(StringUtil.maskName(vo.getName()));
System.out.println(oauthUser.getSnsUserId());
oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId())); oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId()));
model.addAttribute("NlibLoginVO",vo); model.addAttribute("NlibLoginVO",vo);
model.addAttribute("oauthUser",oauthUser); model.addAttribute("oauthUser",oauthUser);
@ -454,7 +453,6 @@ public class MemberController extends NlibCommonController{
//인증번호 생성 //인증번호 생성
String CertNumber=memberService.numberGen(6,1); String CertNumber=memberService.numberGen(6,1);
System.out.println(CertNumber);
//내 정보 페이지 //내 정보 페이지
if("myInfo".equals(pageName)) if("myInfo".equals(pageName))
@ -761,7 +759,6 @@ public class MemberController extends NlibCommonController{
String councilNm = (String)session.getAttribute("councilNm"); String councilNm = (String)session.getAttribute("councilNm");
Map<String, Object> replaceContents = new HashMap<String, Object>(); Map<String, Object> replaceContents = new HashMap<String, Object>();
System.out.println(loginVO.getLoginUserId()+initPwd);
loginVO.setPassword(egovPasswordEncoder.encryptPassword(loginVO.getLoginUserId()+initPwd)); loginVO.setPassword(egovPasswordEncoder.encryptPassword(loginVO.getLoginUserId()+initPwd));
memberService.changePassword(loginVO); memberService.changePassword(loginVO);

2
src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
View File

@ -139,8 +139,6 @@
%> %>
var jsonObj = JSON.parse(data); var jsonObj = JSON.parse(data);
console.log(jsonObj);
//$("#itemsCount").val(jsonOjb.itemsCount);
// 건수 // 건수
if(jsonObj.itemsCount == undefined) { if(jsonObj.itemsCount == undefined) {
$("#itemsCount").text("0"); $("#itemsCount").text("0");

37
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -43,23 +43,34 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="format-detection" content="telephone=no" /> <meta name="format-detection" content="telephone=no" />
<title>소장자료관 - 소장자료 상세페이지</title> <title>소장자료관 - 소장자료 상세페이지</title>
<link rel="shortcut icon" type="image/x-icon" href="#">
<link href="/css/common.css" rel="stylesheet">
<link href="/css/jquery.mCustomScrollbar.css" rel="stylesheet">
<link href="/css/swiper.min.css" rel="stylesheet">
<link href="/css/default.css" rel="stylesheet">
<script src="/js/jquery-1.11.2.min.js"></script>
<script src="/js/jquery.mCustomScrollbar.js"></script>
<script src="/js/swiper.min.js"></script>
<script src="/js/default.js"></script>
</head> </head>
<body> <body>
<script>
function goList(){
document.referenceDetailForm.action="/search/searchList.do";
document.referenceDetailForm.submit();
}
</script>
<div class="wrap sub"> <div class="wrap sub">
<!-- 소장자료 상세페이지 섹션 --> <!-- 소장자료 상세페이지 섹션 -->
<div class="data detail"> <div class="data detail">
<form id="referenceDetailForm" name="referenceDetailForm" method="post">
<input type="hidden" name="collection" id="collection" value="<c:out value='${searchVO.collection}'/>" />
<input type="hidden" name="pageIndex" title="페이지번호" value="${searchVO.pageIndex }" />
<input type="hidden" name="pageSize" value="${searchVO.pageSize }" />
<input type="hidden" name="filter_creatYyyy" value='${searchVO.filter_creatYyyy}' />
<input type="hidden" name="creatYyyyYn" value='${searchVO.creatYyyyYn}' />
<input type="hidden" name="filter_class" value="<c:out value='${searchVO.filter_class}'/>" />
<input type="hidden" name="filter_category" value="<c:out value='${searchVO.filter_category}'/>"/>
<input type="hidden" name="filter_agency" value="<c:out value='${searchVO.filter_agency}'/>"/>
<input type="hidden" name="filter_mylist" value="<c:out value='${searchVO.filter_mylist}'/>"/>
<input type="hidden" name="reQueryChk" value="<c:out value='${searchVO.reQueryChk}'/>"/>
<input type="hidden" name="query" value="<c:out value='${searchVO.query}'/>"/>
<input type="hidden" name="reQuery" value="<c:out value='${searchVO.reQuery}'/>"/>
<h2 class="blind">소장자료 상세페이지 섹션영역</h2> <h2 class="blind">소장자료 상세페이지 섹션영역</h2>
<div class="inner"> <div class="inner">
<div class="row-top"> <div class="row-top">
@ -479,11 +490,11 @@
</div> </div>
<div class="btn-box"> <div class="btn-box">
<button type="button" class="btn btn-black">목록으로</button> <button type="button" class="btn btn-black" onclick="goList();">목록으로</button>
</div> </div>
</div> </div>
</div> </div>
</form>
</div> </div>
<footer id="footer"> <footer id="footer">

10
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -158,15 +158,21 @@ function fn_search_article(pageIndex) {
<!-- 소장자료 섹션 --> <!-- 소장자료 섹션 -->
<form name="referencelistForm" id="referencelistForm" method="post" action="/search/searchList.do"> <form name="referencelistForm" id="referencelistForm" method="post" action="/search/searchList.do">
<input type="hidden" name="collection" id="collection" value="<c:out value='${searchVO.collection}'/>" /> <input type="hidden" name="collection" id="collection" value="<c:out value='${searchVO.collection}'/>" />
<input type="hidden" id="pageIndex" name="pageIndex" title="페이지번호" value="${searchVO.pageIndex }" /> <input type="hidden" id="pageIndex" name="pageIndex" title="페이지번호" value="<c:out value='${searchVO.pageIndex }' />"/>
<input type="hidden" id="masterId" name="masterId" value="" /> <input type="hidden" id="masterId" name="masterId" value="" />
<input type="hidden" id="filter_creatYyyy" name="filter_creatYyyy" value='${searchVO.filter_creatYyyy}' /> <input type="hidden" id="filter_creatYyyy" name="filter_creatYyyy" value="<c:out value='${searchVO.filter_creatYyyy}'/>" />
<input type="hidden" name="filter_class" value="<c:out value='${searchVO.filter_class}'/>" /> <input type="hidden" name="filter_class" value="<c:out value='${searchVO.filter_class}'/>" />
<input type="hidden" name="filter_category" value="<c:out value='${searchVO.filter_category}'/>"/> <input type="hidden" name="filter_category" value="<c:out value='${searchVO.filter_category}'/>"/>
<input type="hidden" id="filter_agency" name="filter_agency" value="<c:out value='${searchVO.filter_agency}'/>"/> <input type="hidden" id="filter_agency" name="filter_agency" value="<c:out value='${searchVO.filter_agency}'/>"/>
<input type="hidden" id="filter_mylist" name="filter_mylist" value="<c:out value='${searchVO.filter_mylist}'/>"/> <input type="hidden" id="filter_mylist" name="filter_mylist" value="<c:out value='${searchVO.filter_mylist}'/>"/>
<input type="hidden" id="bookIndex" name="bookIndex" value="<c:out value='${searchVO.bookIndex}'/>"/>
<input type="hidden" id="mngtNo" name="mngtNo" value="<c:out value='${searchVO.mngtNo}'/>"/>
<input type="hidden" id="createStartDate" name="createStartDate" value="<c:out value='${searchVO.createStartDate}'/>"/>
<input type="hidden" id="createEndDate" name="createEndDate" value="<c:out value='${searchVO.createEndDate}'/>"/>
<input type="hidden" id="ageCode" name="ageCode" value="<c:out value='${searchVO.ageCode}'/>"/>
<input type="hidden" id="collectionList" name="collectionList" value="<c:out value='${searchVO.collectionList}'/>"/>
<div class="location data"> <div class="location data">
<h2 class="blind">소장자료 섹션영역</h2> <h2 class="blind">소장자료 섹션영역</h2>
<div class="inner"> <div class="inner">

91
src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
View File

@ -113,13 +113,17 @@ $(document).ready(function() {
}); });
// 상세검색 초기화 // 상세검색 선택조건 초기화
$('.pop-advanced-search .btn-reset-conditions').on('click', function() { $('.pop-advanced-search .btn-reset-conditions').on('click', function() {
$("input[id^='"+$(this).attr('name')+"-chk']").each(function() { $("input[id^='"+$(this).attr('name')+"-chk']").each(function() {
$(this).prop('checked', false); if($(this).is(':checked'))
{
$(this).trigger('click');
}
}); });
$(this).parents('.title').siblings('.conditions').find('*').remove(); $(this).parents('.title').siblings('.conditions').find('*').remove();
}); });
// depth-1 열고 닫기 // depth-1 열고 닫기
$('.filter-tit .btn-toggle').on('click', function() { $('.filter-tit .btn-toggle').on('click', function() {
if($(this).text() == '닫기') { if($(this).text() == '닫기') {
@ -182,15 +186,80 @@ $(document).ready(function() {
detailSearchSetting(); detailSearchSetting();
} }
}); });
<%//상세검색 ALL 초기화%>
function allReset(){
$("#d_query").val("");
$("#d_bookIndex").val("");
$("#d_mngtNo").val("");
$("#d_creatYyyyStart").val("");
$("#d_creatYyyyEnd").val("");
$("#d_createStartDate").val("");
$("#d_createEndDate").val("");
$('#d_referencelistForm input[name=ageCode]').each(function() {
$(this).prop("checked",false);
});
$("#times-chk1").prop("checked",true);
$('#d_referencelistForm input[name=collectionList]').each(function() {
$(this).prop("checked",false);
});
$("#class-chk1").prop("checked",true);
$('.pop-advanced-search .btn-reset-conditions').each(function(){
$(this).trigger('click');
});
}
function d_search(){ function d_search(){
var colCount=0;
var ageCount=0;
var filter_myList = $("#d_filter_mylist").val();
if($("#d_creatYyyyStart").val() != "" && $("#d_creatYyyyEnd").val() != "") if($("#d_creatYyyyStart").val() != "" && $("#d_creatYyyyEnd").val() != "")
{ {
$("#d_filter_creatYyyy").val("date"); $("#d_filter_creatYyyy").val("date");
$("#d_filter_mylist").val($("#d_filter_mylist").val() + "creat_date,"); filter_myList+= "creat_date,";
}else{ }else{
$("#d_filter_creatYyyy").val("all"); $("#d_filter_creatYyyy").val("all");
} }
if($("#d_query").val() != "")
{
filter_myList+= "search_query,";
}
if($("#d_bookIndex").val() != "")
{
filter_myList+= "search_bookIndex,";
}
if($("#d_mngtNo").val() != "")
{
filter_myList+= "search_mngtNo,";
}
if($("#d_createStartDate").val() != "" && $("#d_createEndDate").val() != "")
{
filter_myList+= "search_era,";
}
$("input[name='ageCode']").each(function() {
if($(this).is(":checked"))
{
ageCount += 1;
}
});
if(ageCount > 0)
{
filter_myList+= "search_age,";
}
$("input[name='collectionList']").each(function() {
if($(this).is(":checked"))
{
colCount += 1;
}
});
if(colCount > 0)
{
filter_myList+= "search_collection,";
}
$("#d_filter_mylist").val(filter_myList);
document.d_referencelistForm.submit(); document.d_referencelistForm.submit();
} }
@ -247,19 +316,19 @@ function detailSearchSetting(){
</div> </div>
</li> </li>
<li class="row-keyword-detail"> <li class="row-keyword-detail">
<p class="tit"><label for="bookIndex">목차검색</label></p> <p class="tit"><label for="d_bookIndex">목차검색</label></p>
<div class="input-area"> <div class="input-area">
<input type="text" placeholder="검색어를 입력하세요." id="bookIndex" name="bookIndex" value="" /> <input type="text" placeholder="검색어를 입력하세요." id="d_bookIndex" name="bookIndex" value="" />
</div> </div>
</li> </li>
<li class="row-control-num"> <li class="row-control-num">
<p class="tit"><label for="mgnt_no">관리번호</label></p> <p class="tit"><label for="d_mngtNo">관리번호</label></p>
<div class="input-area"> <div class="input-area">
<input type="text" placeholder="예) KCCF201808030000234" id="d_mngtNo" name="mngtNo" value="" /> <input type="text" placeholder="예) KCCF201808030000234" id="d_mngtNo" name="mngtNo" value="" />
</div> </div>
</li> </li>
<li class="row-issued-year"> <li class="row-issued-year">
<p class="tit"><label for="genyear_start">생산년도</label></p> <p class="tit"><label for="d_creatYyyyStart">생산년도</label></p>
<div class="input-area"> <div class="input-area">
<input type="text" placeholder="예) 2018" id="d_creatYyyyStart" name="creatYyyyStart" value="" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4'/> <input type="text" placeholder="예) 2018" id="d_creatYyyyStart" name="creatYyyyStart" value="" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4'/>
<span class="tilde">~</span> <span class="tilde">~</span>
@ -267,11 +336,11 @@ function detailSearchSetting(){
</div> </div>
</li> </li>
<li class="row-age"> <li class="row-age">
<p class="tit"><label for="chronological_start">연 대</label></p> <p class="tit"><label for="d_createStartDate">연 대</label></p>
<div class="input-area"> <div class="input-area">
<input type="text" placeholder="예) 2017" id="d_createStartDate" name="createStartDate" value=""/> <input type="text" placeholder="예) 2017" id="d_createStartDate" name="createStartDate" value="" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4'/>
<span class="tilde">~</span> <span class="tilde">~</span>
<input type="text" placeholder="예) 2018" id="d_createEndDate" name="createEndDate" value=""/><label for="d_createEndDate" class="blind">연대 끝</label> <input type="text" placeholder="예) 2018" id="d_createEndDate" name="createEndDate" value="" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4'/><label for="d_createEndDate" class="blind">연대 끝</label>
</div> </div>
</li> </li>
<li class="row-times fw"> <li class="row-times fw">
@ -373,7 +442,7 @@ function detailSearchSetting(){
</div><!-- //scroll-wrap --> </div><!-- //scroll-wrap -->
<div class="btn-wrap"> <div class="btn-wrap">
<button type="button" class="btn btn-white" id="cmm_popudp_del">초기화</button> <button type="button" class="btn btn-white" id="cmm_popudp_del" onclick="allReset();">초기화</button>
<button type="button" onclick="d_search();" class="btn btn-color" id="cmm_popudp_submit">검색</button> <button type="button" onclick="d_search();" class="btn btn-color" id="cmm_popudp_submit">검색</button>
<button type="button" class="btn btn-gray btn-close-pop" onclick="fn_closeLayerPopup();">닫기</button> <button type="button" class="btn btn-gray btn-close-pop" onclick="fn_closeLayerPopup();">닫기</button>
</div> </div>