From 5fdc0bee93cc275ebee98b05fa4949445de5bf04 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 24 Nov 2021 14:23:43 +0900 Subject: [PATCH] =?UTF-8?q?mb=5Fsite=20=EA=B4=80=EB=A0=A8=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=9C=EA=B1=B0=20,=20=20=EC=86=8C=EC=9E=A5?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=8C=80?= =?UTF-8?q?=EC=B6=9C=EC=98=88=EC=95=BD,=EB=B0=A9=EB=AC=B8=20=EB=93=B1?= =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=20=EC=86=8C=EC=8A=A4=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/CollectionVO.java | 16 ++-- .../java/nlib/user/service/LoginService.java | 2 - .../java/nlib/user/service/impl/LoginDAO.java | 5 -- .../user/service/impl/LoginServiceImpl.java | 4 - .../java/nlib/user/web/LoginController.java | 81 ------------------- .../mapper/nlib/user/LoginDAO_SQL.xml | 26 ------ src/main/resources/nlib/nlib.properties | 2 - .../jsp/nlib/collection/searchItemDetail.jsp | 2 +- .../jsp/nlib/collection/searchList.jsp | 28 ++++--- 9 files changed, 24 insertions(+), 142 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index 81500502..1ea714be 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -474,12 +474,8 @@ public class CollectionVO extends PagingVO { this.operReadRangeCd = operReadRangeCd; } public String getOperReadRangeNm() { - /* 01:전체열람 02: 목록열람 03:열람불가 */ - if("01".equals(operReadRangeCd)) return "전체열람"; - else if("02".equals(operReadRangeCd)) return "목록열람"; - else if("03".equals(operReadRangeCd)) return "열람불가"; - - return operReadRangeNm; + if(isAbleReadNow()) return "01"; //방문열람신청 가능 + else return "02"; //방문열람신청 불가 } public void setOperReadRangeNm(String operReadRangeNm) { this.operReadRangeNm = operReadRangeNm; @@ -491,11 +487,9 @@ public class CollectionVO extends PagingVO { this.operOutRangeCd = operOutRangeCd; } public String getOperOutRangeNm() { - /* 01:대출가능 02: 대출불가 */ - if("01".equals(operOutRangeCd)) return "대출가능"; - else if("02".equals(operOutRangeCd)) return "대출불가"; - - return operOutRangeNm; + if(isAbleRentAppNow()) return "01"; //대출신청 가능 + else if(isAbleRentResNow()) return "02"; //대출예약 가능 + else return "03"; //대출신청/예약 불가 } public void setOperOutRangeNm(String operOutRangeNm) { this.operOutRangeNm = operOutRangeNm; diff --git a/src/main/java/nlib/user/service/LoginService.java b/src/main/java/nlib/user/service/LoginService.java index 8175cb60..5d963676 100644 --- a/src/main/java/nlib/user/service/LoginService.java +++ b/src/main/java/nlib/user/service/LoginService.java @@ -35,8 +35,6 @@ public interface LoginService public int activateDormantAcc(NlibLoginVO loginVO); - public int agreeProvInfo(NlibLoginVO loginVO); - public NlibLoginVO selectLoginUserInfo(NlibLoginVO loginVO); } \ No newline at end of file diff --git a/src/main/java/nlib/user/service/impl/LoginDAO.java b/src/main/java/nlib/user/service/impl/LoginDAO.java index d32dbf76..60672283 100644 --- a/src/main/java/nlib/user/service/impl/LoginDAO.java +++ b/src/main/java/nlib/user/service/impl/LoginDAO.java @@ -49,9 +49,4 @@ public class LoginDAO extends EgovComAbstractDAO { public int activateDormantAcc(NlibLoginVO loginVO) { return update("LoginDAO.activateDormantAcc", loginVO); } - - public int agreeProvInfo(NlibLoginVO loginVO) { - return insert("LoginDAO.agreeProvInfo", loginVO); - } - } \ No newline at end of file diff --git a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java index 20c9f1d1..1bca2986 100644 --- a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java +++ b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java @@ -215,10 +215,6 @@ public class LoginServiceImpl implements LoginService return loginDAO.activateDormantAcc(loginVO); } - public int agreeProvInfo(NlibLoginVO loginVO) { - return loginDAO.agreeProvInfo(loginVO); - } - public NlibLoginVO selectLoginUserInfo(NlibLoginVO loginVO) { return loginDAO.selectLoginUserInfo(loginVO); } diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java index 14460608..e15325e6 100644 --- a/src/main/java/nlib/user/web/LoginController.java +++ b/src/main/java/nlib/user/web/LoginController.java @@ -683,85 +683,4 @@ public class LoginController extends NlibCommonController { return "nlib/login/activateDormantAcc"; } - - @RequestMapping("/login/agreeProvInfoForm.do") - public String agreeProvInfoForm( - HttpServletRequest req, - RedirectAttributes redirectAttrs, - @RequestParam Map paramMap, - Model model, - HttpSession session) { - - //---------------------------------------------- - // 지방문화원 사이트에서 접속한 경우, 지방문화원 정보 확인 - //---------------------------------------------- - String councilJsessionId = (String)session.getAttribute("councilJsessionId"); - String councilDnsHost = (String)session.getAttribute("councilDnsHost"); - String councilReturnUrl = (String)session.getAttribute("councilReturnUrl"); - String councilHomeUrl = (String)session.getAttribute("councilHomeUrl"); - String councilCd = (String)session.getAttribute("councilCd"); - String councilNm = (String)session.getAttribute("councilNm"); - - log.debug("activateDormantAccForm > sessionid=" + session.getId()); - log.debug("activateDormantAccForm > councilDnsHost = " + councilDnsHost); - log.debug("activateDormantAccForm > councilReturnUrl = " + councilReturnUrl); - log.debug("activateDormantAccForm > councilHomeUrl = " + councilHomeUrl); - log.debug("activateDormantAccForm > councilCd = " + councilCd); - log.debug("activateDormantAccForm > councilNm = " + councilNm); - - OAuthUniversalUser oauthUser = SessionConfig.getLoginInfo(session.getId()); - model.addAttribute("oauthUser", oauthUser); - model.addAttribute("councilCd", councilCd); - model.addAttribute("councilNm", councilNm); - - return "nlib/login/agreeProvInfoForm"; - } - - - @RequestMapping("/login/agreeProvInfo.do") - public String agreeProvInfo( - HttpServletRequest req, - RedirectAttributes redirectAttrs, - @RequestParam Map paramMap, - ModelMap model, - HttpSession session) throws Exception { - - //---------------------------------------------- - // 지방문화원 사이트에서 접속한 경우, 지방문화원 정보 확인 - //---------------------------------------------- - String councilJsessionId = (String)session.getAttribute("councilJsessionId"); - String councilDnsHost = (String)session.getAttribute("councilDnsHost"); - String councilReturnUrl = (String)session.getAttribute("councilReturnUrl"); - String councilHomeUrl = (String)session.getAttribute("councilHomeUrl"); - String councilCd = (String)session.getAttribute("councilCd"); - String councilNm = (String)session.getAttribute("councilNm"); - - String pCouncilCd = paramMap.get("councilCd"); - - if(StringUtil.isEmpty(pCouncilCd) || StringUtil.isEmpty(councilCd) || !StringUtil.equalsIgnoreCase(councilCd, pCouncilCd)) { - throw new Exception("잘못된 접근입니다."); - } - - log.debug("agreeProvInfo > sessionid=" + session.getId()); - log.debug("agreeProvInfo > councilDnsHost = " + councilDnsHost); - log.debug("agreeProvInfo > councilReturnUrl = " + councilReturnUrl); - log.debug("agreeProvInfo > councilHomeUrl = " + councilHomeUrl); - log.debug("agreeProvInfo > councilCd = " + councilCd); - log.debug("agreeProvInfo > councilNm = " + councilNm); - - // 지방문화원 추가 - OAuthUniversalUser oauthUser = SessionConfig.getLoginInfo(session.getId()); - NlibLoginVO nlibLoginVO = oauthUser.getNlibVO(); - nlibLoginVO.setJoinCouncilCd(pCouncilCd); - nlibLoginVO.setJoinType(oauthUser.getSnsType()); - int resultCount = loginService.agreeProvInfo(nlibLoginVO); - - model.addAttribute("resultCount", resultCount); - model.addAttribute("oauthUser", oauthUser); - model.addAttribute("councilCd", councilCd); - model.addAttribute("councilNm", councilNm); - - return "nlib/login/agreeProvInfo"; - } - } \ No newline at end of file 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 064581d0..afb95893 100644 --- a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml @@ -96,30 +96,4 @@ ,'02' /* 2021.10.05 추가 (소장자료관) */ ) - - - - INSERT INTO MB_SITE /* 가입문화원정보 */ - ( MB_INFO_ID - ,JOIN_TYPE - ,JOIN_AGREE_DD - ,JOIN_COUNCIL_CD - ,MASTER_YN - ) - SELECT - #{mbInfoId} - ,#{joinType} - ,NOW() - ,#{joinCouncilCd} - ,'N' - FROM SM_DEPT - WHERE ORG_CD = #{joinCouncilCd} - AND NOT EXISTS ( - SELECT MB_SITE_ID - FROM MB_SITE S - WHERE S.MB_INFO_ID = #{mbInfoId} - AND S.JOIN_COUNCIL_CD = #{joinCouncilCd} - ) - - \ No newline at end of file diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 4335424a..3a1eb756 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -30,8 +30,6 @@ login.url = /login/loginForm.do login.back.url = /login/loginGuide.do # \ud734\uba74\uacc4\uc88c \ud574\uc9c0\uc548\ub0b4 \uc8fc\uc18c login.dormant.url = /login/activateDormantAccForm.do -# \uc2e0\uaddc \uc9c0\ubc29\ubb38\ud654\uc6d0 \uc815\ubcf4\uc81c\uacf5 \ub3d9\uc758 \uc8fc\uc18c -login.newcouncil.url = /login/agreeProvInfoForm.do # \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 URL \uc815\ubcf4 nculture.login.redirect.uri = /login/loginForm.do 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 c0368627..b469bbfc 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -329,7 +329,7 @@ function goList(){
-
+
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 960edea0..0e6409d9 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -473,16 +473,24 @@ function fn_search_article(pageIndex) {
- - -

${result.operOutRangeNm}
${result.operReadRangeNm}

- - - -

${result.operOutRangeNm}${result.operReadRangeNm}

- - - +

+ + 대출신청 가능 + + + 대출예약 가능 + + + 대출신청/예약 불가 + +
+ + 방문열람신청 가능 + + + 방문열람신청 불가 + +