From 2cdcee1306fea2361d475eb36cbf2e70caddc59e Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 23 Nov 2021 15:40:38 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp index 535e71a5..09c0bb9a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp @@ -325,7 +325,7 @@ function fn_downloadFile(attachFileId, fileSn) {
답변메일 수신여부
checked /> - +
  • From c2fd3eda98f474359b77b5df137bdddb24e4d1dc Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 23 Nov 2021 16:25:26 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A1=B0=ED=9A=8C=20POST?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 공유하기 상세로 나오게 수정 --- .../nlib/sch/service/NlibSearchService.java | 7 ------- .../nlib/sch/web/NlibSearchController.java | 5 +---- .../jsp/nlib/collection/searchItemDetail.jsp | 21 ++++++++++++++++--- .../jsp/nlib/collection/searchList.jsp | 2 +- src/main/webapp/js/nlib.js | 14 +------------ 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/main/java/nlib/sch/service/NlibSearchService.java b/src/main/java/nlib/sch/service/NlibSearchService.java index ca8351ff..45216032 100644 --- a/src/main/java/nlib/sch/service/NlibSearchService.java +++ b/src/main/java/nlib/sch/service/NlibSearchService.java @@ -8,11 +8,4 @@ public interface NlibSearchService { /** 검색결과 받기 * @return */ NlibSearchVO getSearch(NlibSearchVO searchVO) throws Exception; - /* - String getSearchEtc(SearchVO searchVO , Sf1VO sf1Vo) throws Exception; - - int getSearch_All_cnt(SearchVO searchVO, Sf1VO sf1Vo) throws Exception; - - SearchCollectionResult getSearch_ajax(SearchVO searchVO , Sf1VO sf1Vo) throws Exception; - */ } diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 9a239650..7e1be3c4 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -249,7 +249,7 @@ public class NlibSearchController extends NlibCommonController { * @param req * @return */ - @RequestMapping(value = "/search/searchItemDetail.do") + @RequestMapping(value = "/search/searchItemDetail.do", method = RequestMethod.POST) public String searchItemDetail( HttpServletRequest req , Authentication authentication @@ -264,9 +264,6 @@ public class NlibSearchController extends NlibCommonController { List mngOrgList = new ArrayList<>(); List keywordList = new ArrayList<>(); - //사용자 정보를 가져온다. - NlibLoginVO loginVO = getNlibLoginVO(authentication); - CollectionVO vo = new CollectionVO(); vo.setMasterId(masterId); 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..bc4048b5 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(){ - +
    @@ -240,7 +240,7 @@ function goList(){
    이용상태 아이콘
    이용상태
    -
    <%-- (대기자 명) --%>
    +
    달력 아이콘
    @@ -276,7 +276,22 @@ function goList(){

    목차정보

    -
    +
    +
      +
    • 황금찬/말하는 역사 마포 - 30
      • +
    • 황금찬/말하는 역사 마포 - 30 +
        +
      • 홈금자/마포연가 - 31
        • +
      • 가영심/숨은 꽃 - 32
        • +
      • 가영심/숨은 꽃 - 32 +
          +
        • 가영심/숨은 꽃 - 32
          • +
        • 가영심/숨은 꽃 - 32
          • +
        +
        • +
      +
      • +

    없음

    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 c9e129b0..960edea0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -211,7 +211,7 @@ function fn_search_article(pageIndex) { -
    + diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index 6a0e17cb..2976cdce 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -406,21 +406,9 @@ function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) { var openNewWindow = window.open(url + interfaceId, "_blank"); } -function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){ +function gfn_setSnsShare(masterId){ var url=window.location.protocol + "//" + window.location.host + window.location.pathname + "?masterId=" + masterId; - if(!fn_isEmpty(interfaceId)) - { - if(typeDivCd == "IT_PHOTO" && (dtlsTypeDivCd == "C199" || dtlsTypeDivCd == "C01")){ - url = IMAGE_VIEW_URL; - }else if((typeDivCd == "IT_VIDEO") && (dtlsTypeDivCd == "C290" || dtlsTypeDivCd == "C02" || dtlsTypeDivCd == "C03")){ - url = VIDEO_VIEW_URL; - }else{ - url = DOC_VIEW_URL; - } - url += interfaceId - } - $('#div_pop-sharing img').attr('data-cUrl',url); // url 모두 맵핑 if(url != null && url != ''){ getShortUrlData(url); From d8e7db7d680f1fcdd7b27881ec79ed9fe157f333 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 23 Nov 2021 16:26:37 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EC=B9=B4=ED=8A=B8=EB=8B=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bc4048b5..c7919793 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -220,7 +220,7 @@ function goList(){
    - +
    From 7a3b0cfe8741871832037407b0511d9723538ad9 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 23 Nov 2021 16:30:56 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=86=8D=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/cmm/web/MainController.java | 23 ++++--------------- .../mapper/nlib/cmm/MainDAO_SQL.xml | 23 ++++++++++--------- src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 22 +++++------------- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index da39374f..1b70202a 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -100,26 +100,11 @@ public class MainController extends NlibCommonController { model.addAttribute("listOrgPicks", mainService.listOrgPicks(mngOrgCd)); // 유형별 인기자료 - 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); - } - } - } + //List> listTypeDivCodes = codeService.listTypeDivCodes(); + //model.addAttribute("listTypeDivCodes", listTypeDivCodes); + + List listPops = mainService.listPops(mngOrgCd, null); // 전체 model.addAttribute("listPops", listPops); - model.addAttribute("listTypeDivCodes", listTypeDivCodes); // 온라인자료관 model.addAttribute("listOnline", mainService.listOnline(mngOrgCd)); 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 bf969d98..d9abb9e0 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -10,13 +10,13 @@ FROM ( SELECT TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(replace(RM.KEYWORD,',',';'), ';', NUMBERS.N), ';', -1)) AS KEY_NAME - FROM ( /* 키워드 길이 1000 이므로, 최대 가능 키워드수 500으로 맞춤 */ + FROM ( /* 키워드 길이 1000 이므로, 최대 가능 키워드수 500이나 속도 개선으로 10개로 제한 */ WITH RECURSIVE W1 AS ( SELECT 1 AS N UNION ALL SELECT 1+W1.N AS N FROM W1 - WHERE W1.N < 500 + WHERE W1.N < 10 ) SELECT N FROM W1 ) NUMBERS @@ -60,7 +60,6 @@ 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..f7ee531d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -230,28 +230,19 @@ function fn_listPops(typeDivCd) { - +

    인기자료 섹션영역

    -

    유형별 인기자료

    -

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

    -
    -
    - -
    +

    인기 자료

    +

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

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

      생산년도-${itemPop.creatYyyy }

      • -
    -
    +
    From 5aacfecc3ae98da2c227fa15c53c48add3243be9 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 23 Nov 2021 17:32:47 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=9E=90=EB=A3=8C=EA=B4=80=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EB=A9=94=EB=89=B4=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=93=A4=20CONTENT=20=EC=BB=AC=EB=9F=BC=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml | 2 +- .../WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml index 58e41935..32d2d3b7 100644 --- a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml @@ -9,7 +9,7 @@ , CONTENT_TYPE , MNG_ORG_CD , TITLE - , CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT FROM BD_NLIB_CONTENT_PAGE A WHERE A.CONTENT_TYPE = #{contentType} AND A.MNG_ORG_CD = #{mngOrgCd} diff --git a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp index b185f54b..deb950d6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp @@ -89,9 +89,7 @@
    -
    ${informContent } -
    From 0c62351f93eea5e2ece6f466954076725a1ee044 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 24 Nov 2021 09:36:13 +0900 Subject: [PATCH 6/9] =?UTF-8?q?POST=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/sch/web/NlibSearchController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 7e1be3c4..3920d116 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -249,7 +249,7 @@ public class NlibSearchController extends NlibCommonController { * @param req * @return */ - @RequestMapping(value = "/search/searchItemDetail.do", method = RequestMethod.POST) + @RequestMapping(value = "/search/searchItemDetail.do") public String searchItemDetail( HttpServletRequest req , Authentication authentication From 5d5eaed16dc3d4a2b9269a0f3baecb324ef92361 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 24 Nov 2021 10:25:51 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EB=AA=A9=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 --- .../jsp/nlib/collection/searchItemDetail.jsp | 15 --------------- 1 file changed, 15 deletions(-) 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 c7919793..d6651b41 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -277,21 +277,6 @@ function goList(){
    -
      -
    • 황금찬/말하는 역사 마포 - 30
      • -
    • 황금찬/말하는 역사 마포 - 30 -
        -
      • 홈금자/마포연가 - 31
        • -
      • 가영심/숨은 꽃 - 32
        • -
      • 가영심/숨은 꽃 - 32 -
          -
        • 가영심/숨은 꽃 - 32
          • -
        • 가영심/숨은 꽃 - 32
          • -
        -
        • -
      -
      • -

    없음

    From 2194fad76ab5954d25be5652ea8bc14c7617ebf4 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 24 Nov 2021 11:48:04 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=9C=A0=EC=82=AC=ED=95=9C=20=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=20=EC=BF=BC=EB=A6=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/nlib/col/CollectionDAO_SQL.xml | 7 ++-- .../jsp/nlib/collection/searchItemDetail.jsp | 36 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml index 0697e2b8..81c38af3 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/CollectionDAO_SQL.xml @@ -140,12 +140,11 @@ AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ AND M.USE_FLAG = 'Y' AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ - AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - AND IFNULL(M.M_INTERFACE_ID, '') != ''/* IF존재하는 건 */ AND ( M.OPER_OUT_RANGE_CD = '01' OR M.OPER_READ_RANGE_CD = '01' OR M.DIGITAL_READ_YN = 'Y')/* 대출 OR 열람 OR 온라인열람 가능 */ - AND M.TITLE = REPLACE(#{title},' ','') - AND M.CREAT_YYYY = REPLACE(#{creatYyyy},' ','') + AND REPLACE(M.TITLE,' ','') = REPLACE(#{title},' ','') + AND M.CREAT_YYYY LIKE CONCAT(#{creatYyyy},'%') AND M.ORG_NM = REPLACE(#{orgNm},' ','') + AND M.MASTER_ID != #{masterId} ORDER BY M.MOD_DD DESC LIMIT 10 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 d6651b41..c0368627 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -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 a716dda23e412629ff399f6cd41f09405aff6e64 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Wed, 24 Nov 2021 11:53:00 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=B0=B0=EB=84=88=20=EB=A1=A4=EB=A7=81=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/cmm/service/MainService.java | 18 +++++- .../java/nlib/cmm/service/impl/MainDAO.java | 14 +++++ .../cmm/service/impl/MainServiceImpl.java | 19 ++++++ .../java/nlib/cmm/web/MainController.java | 43 +++++++++++++- .../nlib/security/SpringSecurityConfig.java | 1 + .../mapper/nlib/cmm/MainDAO_SQL.xml | 48 +++++++++++++++ src/main/resources/nlib/nlib.properties | 9 +++ src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 59 +++++++++++-------- 8 files changed, 185 insertions(+), 26 deletions(-) diff --git a/src/main/java/nlib/cmm/service/MainService.java b/src/main/java/nlib/cmm/service/MainService.java index 6021a2a1..96b4dee7 100644 --- a/src/main/java/nlib/cmm/service/MainService.java +++ b/src/main/java/nlib/cmm/service/MainService.java @@ -58,4 +58,20 @@ public interface MainService */ public List listOnline(String mngOrgCd); -} \ No newline at end of file + /** + * 지방문화원별 배너 정보를 조회한다. + * + * @param mngOrgCd + * @return + */ + public List> listBannerInfos(String mngOrgCd); + + /** + * 메인화면 배너ID에 대한 정보를 가져온다. + * + * @return + */ + public Map getBannerInfo(String bannerId); + +} + diff --git a/src/main/java/nlib/cmm/service/impl/MainDAO.java b/src/main/java/nlib/cmm/service/impl/MainDAO.java index bf41b18a..2c2197d7 100644 --- a/src/main/java/nlib/cmm/service/impl/MainDAO.java +++ b/src/main/java/nlib/cmm/service/impl/MainDAO.java @@ -42,4 +42,18 @@ public interface MainDAO { */ public List listOnline(String mngOrgCd); + /** + * 지방문화원별 배너 정보를 조회한다. + * + * @param mngOrgCd + * @return + */ + public List> listBannerInfos(String mngOrgCd); + + /** + * 메인화면 배너ID에 대한 정보를 가져온다. + * + * @return + */ + public Map getBannerInfo(String bannerId); } diff --git a/src/main/java/nlib/cmm/service/impl/MainServiceImpl.java b/src/main/java/nlib/cmm/service/impl/MainServiceImpl.java index 90a128c8..60492701 100644 --- a/src/main/java/nlib/cmm/service/impl/MainServiceImpl.java +++ b/src/main/java/nlib/cmm/service/impl/MainServiceImpl.java @@ -93,4 +93,23 @@ public class MainServiceImpl implements MainService return mainDAO.listOnline(mngOrgCd); } + /** + * 지방문화원별 배너 정보를 조회한다. + * + * @param mngOrgCd + * @return + */ + public List> listBannerInfos(String mngOrgCd) { + return mainDAO.listBannerInfos(mngOrgCd); + } + + /** + * 메인화면 배너ID에 대한 정보를 가져온다. + * + * @return + */ + public Map getBannerInfo(String bannerId) { + return mainDAO.getBannerInfo(bannerId); + } + } \ No newline at end of file diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 1b70202a..00c3b280 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -1,9 +1,12 @@ package nlib.cmm.web; -import java.util.ArrayList; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.List; import java.util.Map; +import javax.activation.MimetypesFileTypeMap; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -16,6 +19,7 @@ import org.springframework.security.web.savedrequest.RequestCache; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import nlib.bbs.service.ArticleVO; import nlib.bbs.service.BoardService; @@ -127,6 +131,10 @@ public class MainController extends NlibCommonController { List listQna = qnaService.listArticles(searchArticleVO); model.addAttribute("listQna", listQna); + // 메인 화면 배너 + List> listBannerInfos = mainService.listBannerInfos(mngOrgCd); + model.addAttribute("listBannerInfos", listBannerInfos); + return "nlib/cmm/home"; } @@ -173,4 +181,37 @@ public class MainController extends NlibCommonController { return "nlib/cmm/headerSubPart"; } + @RequestMapping(value = "/main/bannerImage.do") + public void getBannerImage(HttpServletRequest request, HttpServletResponse response, String bannerId) throws IOException { + + Map bannerInfo = mainService.getBannerInfo(bannerId); + boolean exists = false; + + if(bannerInfo != null && StringUtil.isNotEmpty(bannerInfo.get("fileStreCours")) && StringUtil.isNotEmpty(bannerInfo.get("streFileNm")) && StringUtil.isNotEmpty(bannerInfo.get("orignlFileNm"))) { + try { + String fileName = bannerInfo.get("fileStreCours") + bannerInfo.get("streFileNm"); + MimetypesFileTypeMap mimetypesFileTypeMap = new MimetypesFileTypeMap(); + response.setContentType(mimetypesFileTypeMap.getContentType(bannerInfo.get("orignlFileNm"))); + response.getOutputStream().write(Files.readAllBytes(Paths.get(fileName))); + exists = true; + } catch(Exception e) { + log.error("메인 화면 배너 관련 파일을 확인할 수 없습니다. : bannerId=" + bannerId); + } + } + + if(!exists) { + try { + String fileName = NlibProperty.getString("main.banner.img.path"); + MimetypesFileTypeMap mimetypesFileTypeMap = new MimetypesFileTypeMap(); + response.setContentType(mimetypesFileTypeMap.getContentType(bannerInfo.get("orignlFileNm"))); + response.getOutputStream().write(Files.readAllBytes(Paths.get(fileName))); + exists = true; + } catch(Exception e) { + log.error("메인 화면 배너 기본 배너 파일을 확인할 수 없습니다. : main.banner.img.path=" + NlibProperty.getString("main.banner.img.path")); + } + } + + return; + } + } \ No newline at end of file diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java index 0b6cd329..d46df240 100644 --- a/src/main/java/nlib/security/SpringSecurityConfig.java +++ b/src/main/java/nlib/security/SpringSecurityConfig.java @@ -64,6 +64,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/temp/**") .antMatchers("/favicon/**") .antMatchers("/html/**") + .antMatchers("/banner/**") ; } 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 d9abb9e0..7317363a 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -143,5 +143,53 @@ LIMIT 10 ]]> + + + + + + + \ No newline at end of file diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 578c3b31..4335424a 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -80,6 +80,15 @@ crypto.aria.defaultKey = gdyYs/IZqY86VcWhT8emCYfqY1ahw2vtLG+/FzNqtrQ= list.paging.page.size = 10 +#---------------------------------------- +# \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108 +#---------------------------------------- +# \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108 \uc704\uce58 +# \ub85c\uceec LLLLLLLLLLLLLLL +#main.banner.img.path = C:/iams/workspace/nlib/src/main/webapp/images/bg/bg-mainbanner.jpg +# \uac1c\ubc1c\uc11c\ubc84 +main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/bg-mainbanner.jpg + #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 #---------------------------------------- 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 f7ee531d..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 }

      + +

      자세히 보기 >

      +       +
      +
      • +       +       + +