From 9ac531709e154904aa39231b581a9961086d2e8d Mon Sep 17 00:00:00 2001 From: JSYOO Date: Thu, 11 Nov 2021 14:20:45 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EA=B2=80=EC=83=89=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0?= =?UTF-8?q?=EC=97=90=20=EC=B6=94=EA=B0=80=20(=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/col/web/InterestController.java | 12 ++- .../service/impl/NlibSearchServiceImpl.java | 1 - .../nlib/sch/web/NlibSearchController.java | 1 + .../java/nlib/user/web/MemberController.java | 3 - .../jsp/nlib/collection/listInterests.jsp | 2 - .../jsp/nlib/collection/searchItemDetail.jsp | 37 +++++--- .../jsp/nlib/collection/searchList.jsp | 10 +- .../search/getDetailedSearchFormPopup.jsp | 91 ++++++++++++++++--- 8 files changed, 123 insertions(+), 34 deletions(-) diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index ebd26a8c..7f3d2ba9 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -80,10 +80,18 @@ public class InterestController extends NlibCommonController * @return */ @RequestMapping("/interest/listInterests.do") - public String listInterests(HttpServletRequest req, Authentication authentication, + public String listInterests(HttpServletRequest req, HttpServletRequest request, Authentication authentication, @RequestParam Map paramMap, 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 vo = new ArrayList(); //사용자 정보를 가져온다. diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 0725449a..e973fce5 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -270,7 +270,6 @@ public class NlibSearchServiceImpl implements NlibSearchService{ } tmp = (JsonObject) tmp.get("DocumentSet"); - System.out.println(tmp.get("TotalCount").getAsString()); searchVO.setTotalCount(tmp.get("TotalCount").getAsString()); colArray = (JsonArray) tmp.get("Document"); diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 469b9828..eb622d7e 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -245,6 +245,7 @@ public class NlibSearchController extends NlibCommonController { vo.setRtnExpctDd(strNewDtFormat); } model.addAttribute("result", vo); + model.addAttribute("searchVO", searchVO); model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); return "nlib/collection/searchItemDetail"; } diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index b8a6a914..02f1fbab 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -238,7 +238,6 @@ public class MemberController extends NlibCommonController{ memberService.insertMemberSns(oauthUser); vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail()))); vo.setName(StringUtil.maskName(vo.getName())); - System.out.println(oauthUser.getSnsUserId()); oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId())); model.addAttribute("NlibLoginVO",vo); model.addAttribute("oauthUser",oauthUser); @@ -454,7 +453,6 @@ public class MemberController extends NlibCommonController{ //인증번호 생성 String CertNumber=memberService.numberGen(6,1); - System.out.println(CertNumber); //내 정보 페이지 if("myInfo".equals(pageName)) @@ -761,7 +759,6 @@ public class MemberController extends NlibCommonController{ String councilNm = (String)session.getAttribute("councilNm"); Map replaceContents = new HashMap(); - System.out.println(loginVO.getLoginUserId()+initPwd); loginVO.setPassword(egovPasswordEncoder.encryptPassword(loginVO.getLoginUserId()+initPwd)); memberService.changePassword(loginVO); 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 ac874c39..629a2f25 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -139,8 +139,6 @@ %> var jsonObj = JSON.parse(data); - console.log(jsonObj); - //$("#itemsCount").val(jsonOjb.itemsCount); // 건수 if(jsonObj.itemsCount == undefined) { $("#itemsCount").text("0"); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 171698ff..4c6b44b6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -43,23 +43,34 @@ 소장자료관 - 소장자료 상세페이지 - - - - - - - - - - - +
+
+ + + + + + + + + + + + + + +

소장자료 상세페이지 섹션영역

@@ -479,11 +490,11 @@
- +
-
+