From 138f410fa7838485e6b861017aa1da54aea0be24 Mon Sep 17 00:00:00 2001 From: com02 Date: Tue, 23 Nov 2021 11:26:38 +0900 Subject: [PATCH 1/7] css --- src/main/webapp/css/media.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 6c6f0b5e..f334ca9c 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -280,8 +280,8 @@ a.pop-logo img { margin-right: 10px; } .cart .inner .loan-confirm .tabs_item .visit-select-box { padding: 25px 0 15px; } .cart .inner .loan-confirm .tabs_item .visit-select-box h3 { padding-top: 0; font-size: 18px; line-height: 27px; } .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box { display: flex; flex-direction: column; font-size: 14px; } - .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box span { display: flex; align-items: center; margin-bottom: 10px; } - .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box span select { flex: 1; } + .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box > div { display: flex; align-items: center; margin-bottom: 10px; } + .cart .inner .loan-confirm .tabs_item .visit-select-box .select-box > div select { flex: 1; } .cart .inner .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: flex; align-items: center; justify-content: space-between; height: 45px; background: #fff; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; padding: 0 10px 0; box-sizing: border-box; } .cart .inner .loan-confirm .tabs_item .list-cart-wrap .list-cart .list.t-tit-line { display: none; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div { color: #333333; } @@ -295,7 +295,7 @@ a.pop-logo img { margin-right: 10px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 189px; height: 144px; padding: 0; display: flex; align-items: center; justify-content: center; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img a, - .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { height: 100%; } + .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { width:100%;height: 100%;max-width:100px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { width: 100%; position: absolute; text-align: left; bottom: 184px; padding: 0; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date, .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan, From 4580465df24f201860d6f58cdf43d31d447a57a4 Mon Sep 17 00:00:00 2001 From: com02 Date: Tue, 23 Nov 2021 12:24:35 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=86=8C=EC=9E=A5=EC=9E=90=EB=A3=8C?= =?UTF-8?q?=EB=94=94=ED=85=8C=EC=9D=BC=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=AA=A9=EC=B0=A8=20css=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 30884259..3f9e89ec 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -920,6 +920,8 @@ transform: rotate(45deg);} .data.detail .inner .row-bottom .con-2 .bottom {padding:30px;height:105px;overflow: hidden;text-align: left;} .data.detail .inner .row-bottom .con-2 .bottom p {font-size:16px;margin-bottom:20px;color:#666;} .data.detail .inner .row-bottom .con-2 .bottom p span {margin-right:15px;} +.data.detail .inner .row-bottom .con-2 .bottom ul {display:grid;margin-block-start:0px;padding-inline-start:15px;white-space:normal;/*list-style:disc;*/} +.data.detail .inner .row-bottom .con-2 .bottom .first-indent {padding-inline-start:0px;} .data.detail .inner .row-bottom .con-3 {width:100%;display:inline-block;border-top:1px solid #333;border-bottom:0px solid #ddd;margin:0px 0px 100px;} .data.detail .inner .row-bottom .con-3 .top {padding:10px 0px;position: relative;border-bottom:1px solid #ddd;} .data.detail .inner .row-bottom .con-3 .top h3 {font-size:24px;text-align: center;} From 1c56bd4c472f87d68e1d4826a8ab58872fbfbc48 Mon Sep 17 00:00:00 2001 From: com02 Date: Wed, 24 Nov 2021 11:35:55 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=86=8C=EC=9E=A5=EC=9E=90=EB=A3=8C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 3f9e89ec..8b950fe9 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -917,7 +917,7 @@ transform: rotate(45deg);} .data.detail .inner .row-bottom .con-2 .top h3 span {color: #376795;} .data.detail .inner .row-bottom .con-2 .top .down-btn {position: absolute;top:0px;right:0px;text-indent: -999999px;background:url(/images/icon/icon-data-downarr2.png) no-repeat center;width:60px;height:60px;} .data.detail .inner .row-bottom .con-2 .top .down-btn.on {background:url(/images/icon/icon-data-downarr2-on.png) no-repeat center;} -.data.detail .inner .row-bottom .con-2 .bottom {padding:30px;height:105px;overflow: hidden;text-align: left;} +.data.detail .inner .row-bottom .con-2 .bottom {padding:30px;height:105px;overflow: hidden;text-align: left;white-space: pre-wrap;} .data.detail .inner .row-bottom .con-2 .bottom p {font-size:16px;margin-bottom:20px;color:#666;} .data.detail .inner .row-bottom .con-2 .bottom p span {margin-right:15px;} .data.detail .inner .row-bottom .con-2 .bottom ul {display:grid;margin-block-start:0px;padding-inline-start:15px;white-space:normal;/*list-style:disc;*/} From 7d5824581d10df593dbd69915b2cf0562105a9c9 Mon Sep 17 00:00:00 2001 From: com02 Date: Wed, 24 Nov 2021 12:16:44 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EB=A9=94=EC=9D=B8=EB=B0=B0=EB=84=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 5 ++++- src/main/webapp/css/media.css | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 8b950fe9..a7842077 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -169,6 +169,9 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;} .MainSwiper .loop-count button.remote.restart span {background-image:url('/images/btn/btn-mainvisual-play-white.png');} .MainSwiper .pagination {position:absolute;bottom:140px;left:calc(50% - -450px);} .MainSwiper .swiper-pagination-fraction {color:#fff;left:-40px;top:4px;} +.MainSwiper .swiper-slide {height:600px} +.MainSwiper .swiper-slide .img {height:600px;} +.MainSwiper .swiper-slide .img img {object-fit:cover;width:100%;height:100%;} .sec1 .inner .color-box {width:960px;margin:0 auto;text-align: center;position: relative;top:-108px;z-index:9;} .sec1 .inner .color-box .list {float:left;width:25%;height: 216px;background:#333;position: relative;overflow: hidden;} @@ -295,7 +298,7 @@ transition: all 0.2s ease-in-out; .sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame {display:block;display:flex;align-items:center;height:350px;background:url('/images/img/img-no-image.gif') no-repeat 50% 0;background-size:contain;} .sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame img {width:100%;vertical-align:middle;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover {position:absolute;left:0;right:0;top:0;height:100%;padding:0% 15px;border:1px solid #2e2e2e;font-size:12px;text-align:left;color:#fff;background-color:rgba(0,0,0,0.8);opacity:0;border-radius:10px;transition:opacity 0.3s ease;} -.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover strong {display:block;margin:30px 0px 20px;font-size:18px;height:55px;overflow:hidden;} +.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover > a {display:block;margin:30px 0px 20px;font-size:18px;height:55px;overflow:hidden;color:#fff;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover ul li {line-height:23px;font-weight:100;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover ul li em {font-weight:500;border-right:1px solid #ccc;height:10px;line-height: 10px;display:inline-block;margin-right:5px;padding-right:5px;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box {position: absolute;bottom:30px;width:88%;text-align: center;margin:0;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index f334ca9c..14d017de 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -121,7 +121,7 @@ a.pop-logo img { margin-right: 10px; } .sec2 .keyword-box { width: 100vw; } section h3 { font-size: 22px; margin-bottom: 0px; } section .inner p.desc { font-size: 14px; margin-bottom: 16px; } - section .inner ul.list-tag { height: 66px; overflow: hidden; } + section .inner ul.list-tag { height: 66px; overflow: hidden;padding:5px 0px 0px; } .sec3 { padding: 52px 0px 60px; } .sec3 .pickSwiper::before, .sec3 .pickSwiper::after { display: none; } @@ -153,8 +153,8 @@ a.pop-logo img { margin-right: 10px; } .popularSwiper .swiper-pagination-bullet-active { background: #376795; width: 35px; height: 10px; } .sec6 .onlineSwiper::before, .sec6 .onlineSwiper::after { display: none; } - .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover strong { padding: 25px 0px 20px; margin-bottom: 16px; font-size: 16px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); } - .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box { bottom: 0; } + .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover > a {margin-bottom: 16px; font-size: 16px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); } + .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box { } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .view { width: 100%; } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box .RIS { display: none; } .sec7 { padding: 54px 16px 60px; width: 100%; height: auto; box-sizing: border-box; } From 5f9e9686ecb2845d8afbfab62ac013fc813a969c Mon Sep 17 00:00:00 2001 From: com02 Date: Wed, 24 Nov 2021 13:26:11 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 81 ++++++++++--------- .../jsp/nlib/collection/searchItemDetail.jsp | 44 +++++----- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index a46ae989..d791ffa7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -89,30 +89,41 @@ function fn_listPops(typeDivCd) {
    -
  • -
    슬라이드 이미지 1
    -
    -

    온라인 대출/알람예약 서비스를 통해
    문화원 소장자료들을 만나보세요.

    -

    자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!
    온라인에서 쉽고 간편하게 할 수 있습니다.

    -

    자세히 보기 >

    -
    -
    • -
  • -
    슬라이드 이미지 1
    -
    -

    온라인 대출/알람예약 서비스를 통해
    문화원 소장자료들을 만나보세요.

    -

    자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!
    온라인에서 쉽고 간편하게 할 수 있습니다.

    -

    자세히 보기 >

    -
    -
    • -
  • -
    슬라이드 이미지 1
    -
    -

    온라인 대출/알람예약 서비스를 통해
    문화원 소장자료들을 만나보세요.

    -

    자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!
    온라인에서 쉽고 간편하게 할 수 있습니다.

    -

    자세히 보기 >

    -
    -
    • + + +
  • +
    슬라이드 이미지 1
    +
    +

    온라인 대출/알람예약 서비스를 통해
    문화원 소장자료들을 만나보세요.

    +

    자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!
    온라인에서 쉽고 간편하게 할 수 있습니다.

    +
    +
    • +     + + + + +
  • +
    + + 메인 슬라이딩 배너 이미지 + + + 메인 슬라이딩 배너 이미지 + +
    +
    +

    ${bannerItem.title }

    +

    ${bannerItem.bannerDesc }

    + +

    자세히 보기 >

    +     +
    +
    • +     +     + +
@@ -230,28 +241,19 @@ function fn_listPops(typeDivCd) { - +

인기자료 섹션영역

-

유형별 인기자료

-

자료유형별로 이런 인기자료들이 있어요!

-
-
- -
+

인기 자료

+

이런 인기자료들이 있어요!

+
- -
+
    -
  • ${itemPop.typeDivNm }
    @@ -263,14 +265,13 @@ function fn_listPops(typeDivCd) {

    생산년도-${itemPop.creatYyyy }

    • -
-
+
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 fb34c8ec..c0368627 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -128,7 +128,7 @@ function goList(){ - +
@@ -220,7 +220,7 @@ function goList(){
- +
@@ -240,7 +240,7 @@ function goList(){
이용상태 아이콘
이용상태
-
<%-- (대기자 명) --%>
+
달력 아이콘
@@ -276,7 +276,7 @@ function goList(){

목차정보

-
+

없음

@@ -328,24 +328,24 @@ function goList(){
-
-
-
-
- -
- ${result.title } -
    -
  • 주제유형-${result.typeDivNm }
    • -
  • 주제분야-${result.subjectNmUp }
    • -
  • 생산기관-${result.orgNm }
    • -
  • 생산년도-${result.creatYyyy }
    • -
-
-
-
-
-
+
+
+
+
+ +
+ ${result.title } +
    +
  • 주제유형-${result.typeDivNm }
    • +
  • 주제분야-${result.subjectNmUp }
    • +
  • 생산기관-${result.orgNm }
    • +
  • 생산년도-${result.creatYyyy }
    • +
+
+
+
+
+
From b7c6bdc4ea5cd9bc13bf2e6a0eed07bfa9b3b477 Mon Sep 17 00:00:00 2001 From: com02 Date: Wed, 24 Nov 2021 13:26:46 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index a7842077..d6dd6b28 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -184,7 +184,7 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;} -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -o-transform: rotate(45deg); -transform: rotate(45deg); +transform: rotate(45deg); } .sec1 .inner .color-box .list .open img {position: absolute;top:42px;left:24px; -webkit-transform: rotate(45deg); From 5fdc0bee93cc275ebee98b05fa4949445de5bf04 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 24 Nov 2021 14:23:43 +0900 Subject: [PATCH 7/7] =?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}

- - - +

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