diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 4280ea1d..433e68bb 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -1,5 +1,6 @@ package nlib.cmm.web; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -19,8 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.MainService; +import nlib.cmm.service.NlibProperty; import nlib.cmm.service.NotificationService; import nlib.col.service.CartService; +import nlib.col.service.CollectionVO; import nlib.util.StringUtil; /** @@ -84,9 +87,26 @@ public class MainController extends NlibCommonController { // 유형별 인기자료 List> listTypeDivCodes = codeService.listTypeDivCodes(); + List listPops = new ArrayList(); + if(listTypeDivCodes != null) { + Map itemMap = null; + String typeDivCd = null; + for(int i = (listTypeDivCodes.size() - 1); i>=0; i--) { + itemMap = listTypeDivCodes.get(i); + typeDivCd = itemMap.get("typeDivCd"); + List listPopsTemp = mainService.listPops(mngOrgCd, typeDivCd); + if(listPopsTemp == null || listPopsTemp.size() < 1) { + listTypeDivCodes.remove(i); + continue; + } + for(CollectionVO col : listPopsTemp) { + listPops.add(col); + } + } + } + model.addAttribute("listPops", listPops); model.addAttribute("listTypeDivCodes", listTypeDivCodes); - String typeDivCd = (listTypeDivCodes == null || listTypeDivCodes.size() < 1 ? null : listTypeDivCodes.get(0).get("typeDivCd")); - model.addAttribute("listPops", mainService.listPops(mngOrgCd, typeDivCd)); + // 온라인자료관 model.addAttribute("listOnline", mainService.listOnline(mngOrgCd)); @@ -130,6 +150,7 @@ public class MainController extends NlibCommonController { model.addAttribute("cartCnt", cartCnt); model.addAttribute("unreadNotiCnt", unreadNotiCnt); + model.addAttribute("docViewUrl", NlibProperty.getString("pdf.url")); return "nlib/cmm/headerSubPart"; } diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java index 358767ab..89e4ae20 100644 --- a/src/main/java/nlib/user/web/LoginController.java +++ b/src/main/java/nlib/user/web/LoginController.java @@ -273,7 +273,7 @@ public class LoginController extends NlibCommonController { log.debug("googleLogin.getOAuthURL() = "+googleLogin.getOAuthURL(encCouncilJsessionId)); model.addAttribute("googleUrl", googleLogin.getOAuthURL(encCouncilJsessionId)); - OAuthLogin kakaoLogin = new OAuthLogin(kakaoAuthVO, OAuthLogin.CALL_TYPE_LOGIN, councilJsessionId); + OAuthLogin kakaoLogin = new OAuthLogin(kakaoAuthVO, callType, councilJsessionId); log.debug("kakaoLogin.getOAuthURL() = "+kakaoLogin.getOAuthURL(encCouncilJsessionId)); model.addAttribute("kakaoUrl", kakaoLogin.getOAuthURL(encCouncilJsessionId)); diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 4bfd663d..764f59ad 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -106,6 +106,8 @@ , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) ) AS SUBJECT_NM , M.MOD_DD + , M.ORG_NM + , M.CREAT_YYYY FROM RG_MASTER M LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD' LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' @@ -120,7 +122,7 @@ AND IFNULL(M.BOOKCASE_ID, '') != '' /* 서가아이디 존재 */ AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ ORDER BY M.MOD_DD DESC - LIMIT 10 + LIMIT 4 ]]> @@ -146,6 +148,10 @@ , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) ) AS SUBJECT_NM , M.MOD_DD + , M.ORG_NM + , M.CREAT_YYYY + , M.RPRS_THUMB_URL + , IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) AS INTERFACE_ID FROM RG_MASTER M LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD' LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' @@ -155,7 +161,8 @@ AND M.USE_FLAG = 'Y' AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - AND IFNULL(M.M_INTERFACE_ID, '') = '' /* 미디어인터페이스ID */ + /* AND IFNULL(M.RPRS_THUMB_URL, '') != '' */ /* 썸네일존재하는 건 */ + AND IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) != ''/* IF존재하는 건 */ ORDER BY M.MOD_DD DESC LIMIT 10 ]]> diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 4a989c9c..a93818a3 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -194,8 +194,8 @@ shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90 #shorturl.api = https://local.nculture.org/yourls-api.php?signature=6882eb3237 -#\uc6d0\ubb38\ubcf4\uae30 (PDF) -# \uac1c\ubc1c -pdf.uri = https://port-dev.nculture.org/npdfView.do?npdf=I -# \uc6b4\uc601 -#pdf.uri = https://port-dev.nculture.org/npdfView.do?npdf= +# \uc6d0\ubb38\ubcf4\uae30 (PDF) +# \uac1c\ubc1c (\ud604\uc7ac) +pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=I +# \uac1c\ubc1c (\ucd94\ud6c4) +#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N 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 5dc52461..757c9d4b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -10,6 +10,9 @@ String councilCd = (String)session.getAttribute("councilCd"); String councilNm = (String)session.getAttribute("councilNm"); %> @@ -105,9 +109,9 @@ function fn_search(keyword) {
-
+
상세조회
- + ${itemPick.typeDivNm } ${itemPick.title } @@ -139,6 +143,7 @@ function fn_search(keyword) { +

인기자료 섹션영역

@@ -146,93 +151,41 @@ function fn_search(keyword) {

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

+
-
+ +
    + +
  • -
    문서
    -
    국역 경주읍지
    +
    ${itemPop.typeDivNm }
    +
    ${itemPop.title }
    -

    주제분야자연과지리 > 자연환경

    -

    생산기관경북경주문화원

    -

    생산년도2003

    -
    -
    • -
  • -
    -
    문서
    -
    慶州文化論叢(경주문화논총)/제20집
    -
    -
    -

    주제분야문화유산 > 선사 유적 및 유물

    -

    생산기관경북경주문화원

    -

    생산년도2017

    -
    -
    • -
  • -
    -
    문서
    -
    慶州지방 古書 調査 目錄 (경주지방 고서
    -
    -
    -

    주제분야자연과지리 > 자연환경

    -

    생산기관경북경주문화원

    -

    생산년도2017

    -
    -
    • -
  • -
    -
    문서
    -
    경주문화원 50년사
    -
    -
    -

    주제분야자연과지리 > 자연환경

    -

    생산기관경북경주문화원

    -

    생산년도2014

    +

    주제분야-${itemPop.subjectNm }

    +

    생산기관-${itemPop.orgNm }

    +

    생산년도-${itemPop.creatYyyy }

    • +     +
- -
- 02 -
- -
- 03 -
- -
- 04 -
- -
- 05 -
- -
- 06 -
- -
- 07 -
+
+ +

온라인자료관 섹션영역

@@ -241,175 +194,23 @@ function fn_search(keyword) {
+ +
- + 상세조회
- 2011 신라문화스토리텔러 교육교재 이론 + ${itemOnline.title }
    -
  • 주제유형도서간행물
    • +
  • 주제유형-${itemOnline.subjectNm }
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • +
  • 생산기관-${itemOnline.orgNm }
    • +
  • 생산년도-${itemOnline.creatYyyy }
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
-
RIS
-
-
-
-
-
-
-
-
-
-
- -
- 2011 신라문화스토리텔러 교육교재 이론 -
    -
  • 주제유형도서간행물
    • -
  • 주제분야문화유산
    • -
  • 생산기관마포문화원
    • -
  • 생산년도미상
    • -
-
-
원문보기
+
원문보기
RIS
@@ -417,6 +218,8 @@ function fn_search(keyword) {
+ +
@@ -424,6 +227,7 @@ function fn_search(keyword) {
+
diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index ce9f5ea0..8457f4c5 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -80,31 +80,31 @@ transition:all .3s ease; .wrap .nav-wrap .mobile .sub-menu .downarrow {position: absolute;right: 0;padding-right: 5%;} .wrap .nav-wrap #primary-nav.mobile .sub-menu .downarrow:before {content: '\25be';} .wrap .nav-wrap #primary-nav-button.mobile {display: inline-block;} -.wrap .Btn {display: inline-block;width:25px;height:25px;cursor: pointer;text-decoration: none;position: relative;display: none;} -.wrap .Btn i {position: relative;display: inline-block;width: 25px;height: 3px;color:#fff;font:bold 14px/.4 Helvetica;text-transform: uppercase;text-indent:-999999999px; +.wrap #primary-nav-button {display: inline-block;width:25px;height:25px;cursor: pointer;text-decoration: none;position: relative;display: none;} +.wrap #primary-nav-button i {position: relative;display: inline-block;width: 25px;height: 3px;color:#fff;font:bold 14px/.4 Helvetica;text-transform: uppercase;text-indent:-999999999px; background: #fff; -webkit-transition:all .2s ease-out; -moz-transition:all .2s ease-out; -o-transition:all .2s ease-out; transition:all .2s ease-out; } -.wrap .Btn i::before, .Btn i::after {content:'';width: 25px;height: 3px;position: absolute;left:0;background:#fff; +.wrap #primary-nav-button i::before, .Btn i::after {content:'';width: 25px;height: 3px;position: absolute;left:0;background:#fff; -webkit-transition:all .2s ease-out; -moz-transition:all .2s ease-out; -o-transition:all .2s ease-out; transition:all .2s ease-out; } -.wrap .Btn i::before {top: -9px;} -.wrap .Btn i::after {bottom: -9px;} +.wrap #primary-nav-button i::before {top: -9px;} +.wrap #primary-nav-button i::after {bottom: -9px;} -.wrap .Btn.selected i {background:none;} -.wrap .Btn.selected i::before {top:0;background: #fff; +.wrap #primary-nav-button.selected i {background:none;} +.wrap #primary-nav-button.selected i::before {top:0;background: #fff; -webkit-transform: rotateZ(45deg); -moz-transform: rotateZ(45deg); -o-transform: rotateZ(45deg); transform: rotateZ(45deg); } -.wrap .Btn.selected i::after {bottom:0;background: #fff; +.wrap #primary-nav-button.selected i::after {bottom:0;background: #fff; -webkit-transform: rotateZ(-45deg); -moz-transform: rotateZ(-45deg); -o-transform: rotateZ(-45deg); @@ -206,6 +206,7 @@ transform: rotate(45deg); .sec3 .pickSwiper .swiper-slide .list-box .images {padding:30px 0px;height:195px;border-bottom:1px solid #ddd;} .sec3 .pickSwiper .swiper-slide .list-box .images a img {width:140px;height:100%;} .sec3 .pickSwiper .swiper-slide .list-box .subject {padding:20px 30px 30px;text-align: left;} +.sec3 .pickSwiper .swiper-slide .list-box .subject a {display:inline-block;width:100%;height:85px;overflow:hidden;} .sec3 .pickSwiper .swiper-slide .list-box .subject .block {display:inline-block;width:100%;margin-bottom:10px;} .sec3 .pickSwiper .swiper-slide .list-box .subject .cla {display:inline;background:#e9e6df;padding:2px 10px;font-size:12px;color:#666;border-radius:30px;} .sec3 .pickSwiper .swiper-slide .list-box .subject .tit {display:inline;width:100%;font-size:18px;line-height:26px;color:#222;font-weight: 400} diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 7f07593b..5fa46115 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1010,8 +1010,8 @@
- -
+ +