From 3967f56587fc40f6f6f27d16d264c8ba1669b8f3 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:28:11 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/CollectionService.java | 6 +++--- .../col/service/impl/CollectionServiceImpl.java | 14 +++++++------- src/main/java/nlib/col/web/ReadController.java | 4 ++-- src/main/java/nlib/col/web/RentController.java | 4 ++-- .../webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp | 2 +- .../WEB-INF/jsp/nlib/read/insertReadItems.jsp | 2 +- .../webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp | 2 +- .../WEB-INF/jsp/nlib/rent/insertRentItems.jsp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionService.java b/src/main/java/nlib/col/service/CollectionService.java index ba11fce9..3ebcd66d 100644 --- a/src/main/java/nlib/col/service/CollectionService.java +++ b/src/main/java/nlib/col/service/CollectionService.java @@ -55,7 +55,7 @@ public interface CollectionService { * @return * @throws Exception */ - public List setDetailInfoForList(List list, String mbInfoId, String defaultThumbnailUrl) throws Exception; + public List setDetailInfoForList(List list, String mbInfoId) throws Exception; /** * 목록의 자료정보에 상세정보를 조회하여 설정한 후 리턴한다. @@ -66,7 +66,7 @@ public interface CollectionService { * @return * @throws Exception */ - public List setDetailInfoForHashList(List> list, String mbInfoId, String defaultThumbnailUrl) throws Exception; + public List setDetailInfoForHashList(List> list, String mbInfoId) throws Exception; /** * 자료 마스터ID 목록 문자열을 받아 CollectionVO 리스트 생성하여 리턴한다. @@ -82,7 +82,7 @@ public interface CollectionService { * @param masterIds * @return */ - public List makeInfoListOfCollectionVO(String masterIds, String mbInfoId, String defaultThumbnailUrl) throws Exception; + public List makeInfoListOfCollectionVO(String masterIds, String mbInfoId) throws Exception; /** * 자료상세조회 및 원문보기시에 로그 diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index 18ed6c52..093384b6 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -103,7 +103,7 @@ public class CollectionServiceImpl implements CollectionService { * @throws Exception */ public List setDetailInfoForList(List list) throws Exception { - return setDetailInfoForList(list, null, null); + return setDetailInfoForList(list, null); } /** @@ -115,7 +115,7 @@ public class CollectionServiceImpl implements CollectionService { * @return * @throws Exception */ - public List setDetailInfoForList(List list, String mbInfoId, String defaultThumbnailUrl) throws Exception { + public List setDetailInfoForList(List list, String mbInfoId) throws Exception { if(list == null || list.size() < 1) return list; @@ -215,7 +215,7 @@ public class CollectionServiceImpl implements CollectionService { * @return * @throws Exception */ - public List setDetailInfoForHashList(List> list, String mbInfoId, String defaultThumbnailUrl) throws Exception { + public List setDetailInfoForHashList(List> list, String mbInfoId) throws Exception { List listObj = new ArrayList(); @@ -228,7 +228,7 @@ public class CollectionServiceImpl implements CollectionService { } } - return setDetailInfoForList(listObj, mbInfoId, defaultThumbnailUrl); + return setDetailInfoForList(listObj, mbInfoId); } @@ -267,13 +267,13 @@ public class CollectionServiceImpl implements CollectionService { * @param masterIds * @return */ - public List makeInfoListOfCollectionVO(String masterIds, String mbInfoId, String defaultThumbnailUrl) throws Exception { + public List makeInfoListOfCollectionVO(String masterIds, String mbInfoId) throws Exception { List retList = makeListOfCollectionVO(masterIds); if(retList == null || retList.size() < 1) return null; - return setDetailInfoForList(retList, mbInfoId, defaultThumbnailUrl); + return setDetailInfoForList(retList, mbInfoId); } /** @@ -305,5 +305,5 @@ public class CollectionServiceImpl implements CollectionService { public List selectSimilarList(CollectionVO vo) throws Exception { return collectionDAO.selectSimilarList(vo); } - + } diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index d095d6e6..7158e8a5 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -89,7 +89,7 @@ public class ReadController extends NlibCommonController { String selItems = readVO.getSelItems(); - List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); + List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId); List> listDates = readService.listDates(); model.addAttribute("readVO", readVO); @@ -153,7 +153,7 @@ public class ReadController extends NlibCommonController { List list = collectionService.makeListOfCollectionVO(selItems); list = readService.insertReadItems(list, mbInfoId, readVO, fromCart); - list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); + list = collectionService.setDetailInfoForList(list, mbInfoId); model.addAttribute("readVO", readVO); model.addAttribute("list", list); diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index d3df1e78..3db28504 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -236,7 +236,7 @@ public class RentController extends NlibCommonController String selItems = rentVO.getSelItems(); - List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); + List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId); model.addAttribute("rentVO", rentVO); model.addAttribute("list", list); @@ -273,7 +273,7 @@ public class RentController extends NlibCommonController List list = collectionService.makeListOfCollectionVO(selItems); list = rentService.insertRentItems(list, mbInfoId, rentVO.getMngOrgCd(), fromCart); - list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); + list = collectionService.setDetailInfoForList(list, mbInfoId); model.addAttribute("rentVO", rentVO); model.addAttribute("list", list); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index 4a319764..26eb06f5 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -249,7 +249,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index 57aca952..b55f1cbc 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -196,7 +196,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp index 7f148b6d..f1228ae2 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp @@ -243,7 +243,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp index 9aaabcfd..86b64b23 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp @@ -194,7 +194,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 From 81937fd479f532ef96e2739ce17c982aa8840cb1 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:29:14 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/nlib/collection/searchItemDetail.jsp | 874 +++++++------- .../jsp/nlib/collection/searchList.jsp | 1032 ++++++++--------- 2 files changed, 952 insertions(+), 954 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 b401a8a9..b22e1f3a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -1,439 +1,437 @@ -<% -/** - *
- * @Class Name : selectItemInfo.jsp
- * 
- * @Description : 소장자료 상세내용을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- * 
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 30. JSYOO 최초 생성 - * @ 2021.10. 28. KNKIM 대출예약, 방문열람신청, 카트담기 연결 처리 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 7. 30. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - -자료 상세 - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -

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

-
-
-
-
-
-
- - 온라인열람 - - - 대출 - - - 방문열람 - - - 기타 - -
-
- -
-
-
-
" alt="썸네일">
-
-
-
- - - - - - - - - - - - - - - -
-
-
-
    -
  • - 자료유형 - - - - - - - > - - - - - - - - - - -
  • -
  • - 연대 - - 년부터 - 까지 - - - -
  • -
  • - 주제분야 - - - - - - - > - - - - - - - - - - -
  • -
  • - 저자 - - -
  • -
  • - 생산기관 - - -
  • -
  • - 출판사 - - -
  • -
  • - 생산년도 - - -
  • -
  • - 발간유형 - - -
  • -
  • - 테마 - - -
  • -
  • - 발간매체 - - -
  • -
  • - 시대 - - -
  • -
  • - 청구기호 - - -
  • -
-
-
- - - -
- -
- 키워드 - - - -
-
-
-
-
-
-
-
-
-
-
이용상태 아이콘
-
이용상태
-
(대기자 명)
-
-
-
달력 아이콘
-
반납예정일
-
-
-
-
대출 아이콘
-
대출
-
- 신청가능 - 예약가능 - 신청/예약불가 -
-
-
-
방문 아이콘
-
방문열람
-
- 신청가능 - 신청불가 -
-
-
-
-

- 자료의 이용상태, 대출가능여부, 방문열람가능여부를 꼭 확인하신 후 이용해주시길 바랍니다.

-

- 다른 지방문화원 소장자료관 이용자들을 위해 꼭 필요한 자료만 예약한 후, 가능한 날짜에 예약 및 이용 부탁드립니다.

-
-
- -
-
-

목차정보

- -
-
-

없음

-
-
- - -
-
- -
-
-

함께 볼만한자료

-
-
- -
-
-
-
${result.title }
-
-
-

자료유형- ${result.typeDivNm } >${result.dtlsTypeDivNm}

-

주제분야- ${result.subjectNm } >${result.subjectNm}

-

생산기관-${result.orgNm }

-

생산년도-${result.creatYyyy }

-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
- -
-
-

이 자료와 유사한자료

-

,${list } 에 있습니다

-
-
- -
-
- -
-
-
-
- -
- ${result.title } -
    -
  • 주제유형-${result.typeDivNm }
  • -
  • 주제분야-${result.subjectNmUp }
  • -
  • 생산기관-${result.orgNm }
  • -
  • 생산년도-${result.creatYyyy }
  • -
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
- - - - - + +자료 상세 + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +

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

+
+
+
+
+
+
+ + 온라인열람 + + + 대출 + + + 방문열람 + + + 기타 + +
+
+ +
+
+
+
" alt="썸네일">
+
+
+
+ + + + + + + + + + + + + +
+
+
+
    +
  • + 자료유형 + + + + + + + > + + + + + - + + + + +
  • +
  • + 연대 + + 년부터 + 까지 + - + +
  • +
  • + 주제분야 + + + + + + + > + + + + + - + + + + +
  • +
  • + 저자 + - +
  • +
  • + 생산기관 + - +
  • +
  • + 출판사 + - +
  • +
  • + 생산년도 + - +
  • +
  • + 발간유형 + - +
  • +
  • + 테마 + - +
  • +
  • + 발간매체 + - +
  • +
  • + 시대 + - +
  • +
  • + 청구기호 + - +
  • +
+
+
+ + + +
+ +
+ 키워드 + + + +
+
+
+
+
+
+
+
+
+
+
이용상태 아이콘
+
이용상태
+
(대기자 명)
+
+
+
달력 아이콘
+
반납예정일
+
+
+
+
대출 아이콘
+
대출
+
+ 신청가능 + 예약가능 + 신청/예약불가 +
+
+
+
방문 아이콘
+
방문열람
+
+ 신청가능 + 신청불가 +
+
+
+
+

- 자료의 이용상태, 대출가능여부, 방문열람가능여부를 꼭 확인하신 후 이용해주시길 바랍니다.

+

- 다른 지방문화원 소장자료관 이용자들을 위해 꼭 필요한 자료만 예약한 후, 가능한 날짜에 예약 및 이용 부탁드립니다.

+
+
+ +
+
+

목차정보

+ +
+
+

없음

+
+
+ + +
+
+ +
+
+

함께 볼만한자료

+
+
+ +
+
+
+
${result.title }
+
+
+

자료유형- ${result.typeDivNm } >${result.dtlsTypeDivNm}

+

주제분야- ${result.subjectNm } >${result.subjectNm}

+

생산기관-${result.orgNm }

+

생산년도-${result.creatYyyy }

+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+ +
+
+

이 자료와 유사한자료

+

,${list } 에 있습니다

+
+
+ +
+
+ +
+
+
+
+ +
+ ${result.title } +
    +
  • 주제유형-${result.typeDivNm }
  • +
  • 주제분야-${result.subjectNmUp }
  • +
  • 생산기관-${result.orgNm }
  • +
  • 생산년도-${result.creatYyyy }
  • +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + \ No newline at end of file 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 99cf2d79..61984c37 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -1,517 +1,517 @@ -<% - /** - *
-     * @Class Name : searchList.jsp
-     * 
-     * @Description : 소장 자료를 조회한다.
-     * 
-     * 
-     * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
-     *
-     * 
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 10. 13. JSYOO 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 10. 13. - * @version 1.0 - * - */ -%> -<%@ page language="java" contentType="text/html; charset=UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="validator" - uri="http://www.springmodules.org/tags/commons-validator"%> - -소장 자료 - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
-

소장자료 섹션영역

-
-
-
-
    -
  • HOME
  • -
  • 소장자료
  • -
-
    -
  • 소장자료
  • -
-
-
화살표 아이콘
-
-
-
- -
-
-
- 검색결과 필터 - 닫기 아이콘 -
-
-

검색필터

- -
-
-
    -
-
-
-
-
-

자료유형

-
-
-
    - -
  • -
    on"> -
    - checked="checked" /> - -
    -
    -
      - - -
    • -
      checked="checked" /> - -
      -
    • -
      -
      -
    -
  • -
    -
-
- -
-
-
-

주제분야

- -
-
-
    - - - -
  • -
    on"> -
    checked="checked"/>
    -
    -
      - - -
    • checked="checked"/>
    • -
      -
      -
    -
  • - -
    -
    -
-
- -
- -
-
-

생산년도

-
-
-
    -
  • - -
  • -
  • - - ~ -
  • -
  • - -
  • -
-
- -
- -
-
-

생산기관

-
-
-
    - -
  • -
    -
    checked="checked"/>
    -
    -
  • -
    -
-
- -
- -
-
-
- -
-
- - -
- - - ${searchVO.realQuery}에 대한 검색결과는 총 - 건 입니다. - - - - - - -
- -
- - -
-
- - style="display:none;" placeholder="검색어를 입력하세요." value="${searchVO.query}" maxlength="50" /> - - style="display:none;" placeholder="결과내재검색" value="${searchVO.reQuery}" maxlength="50" /> - - -
-
-
- -
-
-
- -
-
-
-
자료정보
-
이용
-
- -
-
-
썸네일 - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - -
-
- - 온라인열람 - - - 대출 - - - 방문열람 - - - 기타 - -
-
-
-
- 자료유형 : - ${result.typeCodeNm} > ${result.dtlsTypeDivNm} - 주제분야 : - ${result.subjectNmUp} > ${result.subjectNm } - 생산기관 : -${result.orgNm } - 생산년도 : -${result.creatYyyy } -
-
-
- - -

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

-
- - -

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

-
-
-
- - - - -
-
-
- -
-
-

느낌표 아이콘

-

검색된 결과가 없습니다

-

지역N문화에서 더 많은 자료를 확인하세요!

-

-
-
-
-
-
- -
    -
- -
-
-
-
-
- -
-
-
-
+<% + /** + *
+     * @Class Name : searchList.jsp
+     * 
+     * @Description : 소장 자료를 조회한다.
+     * 
+     * 
+     * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+     *
+     * 
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 10. 13. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 10. 13. + * @version 1.0 + * + */ +%> +<%@ page language="java" contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" + uri="http://www.springmodules.org/tags/commons-validator"%> + +소장 자료 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

소장자료 섹션영역

+
+
+
+
    +
  • HOME
  • +
  • 소장자료
  • +
+
    +
  • 소장자료
  • +
+
+
화살표 아이콘
+
+
+
+ +
+
+
+ 검색결과 필터 + 닫기 아이콘 +
+
+

검색필터

+ +
+
+
    +
+
+
+
+
+

자료유형

+
+
+
    + +
  • +
    on"> +
    + checked="checked" /> + +
    +
    +
      + + +
    • +
      checked="checked" /> + +
      +
    • +
      +
      +
    +
  • +
    +
+
+ +
+
+
+

주제분야

+ +
+
+
    + + + +
  • +
    on"> +
    checked="checked"/>
    +
    +
      + + +
    • checked="checked"/>
    • +
      +
      +
    +
  • + +
    +
    +
+
+ +
+ +
+
+

생산년도

+
+
+
    +
  • + +
  • +
  • + + ~ +
  • +
  • + +
  • +
+
+ +
+ +
+
+

생산기관

+
+
+
    + +
  • +
    +
    checked="checked"/>
    +
    +
  • +
    +
+
+ +
+ +
+
+
+ +
+
+ + +
+ + + ${searchVO.realQuery}에 대한 검색결과는 총 + 건 입니다. + + + + + + +
+ +
+ + +
+
+ + style="display:none;" placeholder="검색어를 입력하세요." value="${searchVO.query}" maxlength="50" /> + + style="display:none;" placeholder="결과내재검색" value="${searchVO.reQuery}" maxlength="50" /> + + +
+
+
+ +
+
+
+ +
+
+
+
자료정보
+
이용
+
+ +
+
+
썸네일 + + + 즐겨찾기 아이콘 + 즐겨찾기 아이콘 + + + + + 즐겨찾기 아이콘 + 즐겨찾기 아이콘 + + +
+
+ + 온라인열람 + + + 대출 + + + 방문열람 + + + 기타 + +
+
+
+
+ 자료유형 : - ${result.typeCodeNm} > ${result.dtlsTypeDivNm} + 주제분야 : - ${result.subjectNmUp} > ${result.subjectNm } + 생산기관 : -${result.orgNm } + 생산년도 : -${result.creatYyyy } +
+
+
+ + +

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

+
+ + +

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

+
+
+
+ + + + +
+
+
+ +
+
+

느낌표 아이콘

+

검색된 결과가 없습니다

+

지역N문화에서 더 많은 자료를 확인하세요!

+

+
+
+
+
+
+ +
    +
+ +
+
+
+
+
+ +
+
+
+
\ No newline at end of file From 36ca6fa421c520ca16c3b1942f0fbf14b4b90f2c Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:34:06 +0900 Subject: [PATCH 03/15] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/nlib/collection/searchItemDetail.jsp | 439 --------------- .../jsp/nlib/collection/searchList.jsp | 519 ------------------ 2 files changed, 958 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 0efd72ca..b22e1f3a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -1,4 +1,3 @@ -<<<<<<< HEAD <% /** *
@@ -435,442 +434,4 @@ var swiper = new Swiper(".DetailSwiper2", {
     },
     */
 });
-=======
-<%
-/**
- * 
- * @Class Name : selectItemInfo.jsp
- * 
- * @Description : 소장자료 상세내용을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- * 
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 30. JSYOO 최초 생성 - * @ 2021.10. 28. KNKIM 대출예약, 방문열람신청, 카트담기 연결 처리 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 7. 30. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - -자료 상세 - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -

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

-
-
-
-
-
-
- - 온라인열람 - - - 대출 - - - 방문열람 - - - 기타 - -
-
- -
-
-
-
" alt="썸네일">
-
-
-
- - - - - - - - - - - - - -
-
-
-
    -
  • - 자료유형 - - - - - - - > - - - - - - - - - - -
  • -
  • - 연대 - - 년부터 - 까지 - - - -
  • -
  • - 주제분야 - - - - - - - > - - - - - - - - - - -
  • -
  • - 저자 - - -
  • -
  • - 생산기관 - - -
  • -
  • - 출판사 - - -
  • -
  • - 생산년도 - - -
  • -
  • - 발간유형 - - -
  • -
  • - 테마 - - -
  • -
  • - 발간매체 - - -
  • -
  • - 시대 - - -
  • -
  • - 청구기호 - - -
  • -
-
-
- - - -
- -
- 키워드 - - - -
-
-
-
-
-
-
-
-
-
-
이용상태 아이콘
-
이용상태
-
(대기자 명)
-
-
-
달력 아이콘
-
반납예정일
-
-
-
-
대출 아이콘
-
대출
-
- 신청가능 - 예약가능 - 신청/예약불가 -
-
-
-
방문 아이콘
-
방문열람
-
- 신청가능 - 신청불가 -
-
-
-
-

- 자료의 이용상태, 대출가능여부, 방문열람가능여부를 꼭 확인하신 후 이용해주시길 바랍니다.

-

- 다른 지방문화원 소장자료관 이용자들을 위해 꼭 필요한 자료만 예약한 후, 가능한 날짜에 예약 및 이용 부탁드립니다.

-
-
- -
-
-

목차정보

- -
-
-

없음

-
-
- - -
-
- -
-
-

함께 볼만한자료

-
-
- -
-
-
-
${result.title }
-
-
-

자료유형- ${result.typeDivNm } >${result.dtlsTypeDivNm}

-

주제분야- ${result.subjectNm } >${result.subjectNm}

-

생산기관-${result.orgNm }

-

생산년도-${result.creatYyyy }

-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
- -
-
-

이 자료와 유사한자료

-

,${list } 에 있습니다

-
-
- -
-
- -
-
-
-
- -
- ${result.title } -
    -
  • 주제유형-${result.typeDivNm }
  • -
  • 주제분야-${result.subjectNmUp }
  • -
  • 생산기관-${result.orgNm }
  • -
  • 생산년도-${result.creatYyyy }
  • -
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
- - - - - \ No newline at end of file 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 bec9024b..61984c37 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -1,4 +1,3 @@ -<<<<<<< HEAD <% /** *
@@ -515,522 +514,4 @@ function fn_search_article(pageIndex) {
             
-======= -<% - /** - *
-     * @Class Name : searchList.jsp
-     * 
-     * @Description : 소장 자료를 조회한다.
-     * 
-     * 
-     * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
-     *
-     * 
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 10. 13. JSYOO 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 10. 13. - * @version 1.0 - * - */ -%> -<%@ page language="java" contentType="text/html; charset=UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="validator" - uri="http://www.springmodules.org/tags/commons-validator"%> - -소장 자료 - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
-

소장자료 섹션영역

-
-
-
-
    -
  • HOME
  • -
  • 소장자료
  • -
-
    -
  • 소장자료
  • -
-
-
화살표 아이콘
-
-
-
- -
-
-
- 검색결과 필터 - 닫기 아이콘 -
-
-

검색필터

- -
-
-
    -
-
-
-
-
-

자료유형

-
-
-
    - -
  • -
    on"> -
    - checked="checked" /> - -
    -
    -
      - - -
    • -
      checked="checked" /> - -
      -
    • -
      -
      -
    -
  • -
    -
-
- -
-
-
-

주제분야

- -
-
-
    - - - -
  • -
    on"> -
    checked="checked"/>
    -
    -
      - - -
    • checked="checked"/>
    • -
      -
      -
    -
  • - -
    -
    -
-
- -
- -
-
-

생산년도

-
-
-
    -
  • - -
  • -
  • - - ~ -
  • -
  • - -
  • -
-
- -
- -
-
-

생산기관

-
-
-
    - -
  • -
    -
    checked="checked"/>
    -
    -
  • -
    -
-
- -
- -
-
-
- -
-
- - -
- - - ${searchVO.realQuery}에 대한 검색결과는 총 - 건 입니다. - - - - - - -
- -
- - -
-
- - style="display:none;" placeholder="검색어를 입력하세요." value="${searchVO.query}" maxlength="50" /> - - style="display:none;" placeholder="결과내재검색" value="${searchVO.reQuery}" maxlength="50" /> - - -
-
-
- -
-
-
- -
-
-
-
자료정보
-
이용
-
- -
-
-
썸네일 - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - -
-
- - 온라인열람 - - - 대출 - - - 방문열람 - - - 기타 - -
-
-
-
- 자료유형 : - ${result.typeCodeNm} > ${result.dtlsTypeDivNm} - 주제분야 : - ${result.subjectNmUp} > ${result.subjectNm } - 생산기관 : -${result.orgNm } - 생산년도 : -${result.creatYyyy } -
-
-
- - -

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

-
- - -

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

-
-
-
- - - - -
-
-
- -
-
-

느낌표 아이콘

-

검색된 결과가 없습니다

-

지역N문화에서 더 많은 자료를 확인하세요!

-

-
-
-
-
-
- -
    -
- -
-
-
-
-
- -
-
-
-
->>>>>>> refs/remotes/origin/master
\ No newline at end of file From ed7dc3ed87478047cca2b821a776d1e7a3fa263b Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:35:06 +0900 Subject: [PATCH 04/15] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EB=B3=B4?= =?UTF-8?q?=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/sch/web/NlibSearchController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index beecb4e6..1a9ce04c 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -124,10 +124,10 @@ public class NlibSearchController extends NlibCommonController { if(StringUtil.isEmpty(mbInfoId)) { // 검색엔진에서 받아온 masterId로 상세정보 조회 - operList = collectionService.setDetailInfoForList(searchVO.getResultList(), null, NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(searchVO.getResultList(), null); } else { // 검색엔진에서 받아온 masterId로 상세정보 조회 - operList = collectionService.setDetailInfoForList(searchVO.getResultList(), getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(searchVO.getResultList(), getMbInfoId(request)); } //결과 데이터 담기 From 311a2377d860c0c4eed95323ec6ce67c47a9f1c2 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:39:37 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=EC=97=B4=EB=9E=8C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 61984c37..f89951a8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -454,12 +454,13 @@ function fn_search_article(pageIndex) { 대출 - + 방문열람 기타 +
From 8332914efb22e760d9b6c7fa865afdfaac95679a Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:39:48 +0900 Subject: [PATCH 06/15] =?UTF-8?q?=EA=B8=B0=ED=83=80=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/service/CollectionVO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index 2839695f..7babfe00 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -231,15 +231,15 @@ public class CollectionVO extends PagingVO { */ public boolean isAbleOther() { - // 기본공개 - if(!isPub()) return false; - // 방문열람여부 if(isAbleRead()) return false; // 대출여부 if(isAbleRent()) return false; + // 온라인여부 + if(isAbleOnline()) return false; + return true; } From 47ea8c8a209213122257b7504ae66be8002cf785 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:58:49 +0900 Subject: [PATCH 07/15] =?UTF-8?q?=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/web/CartController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nlib/col/web/CartController.java b/src/main/java/nlib/col/web/CartController.java index 859fb843..9fda5d1a 100644 --- a/src/main/java/nlib/col/web/CartController.java +++ b/src/main/java/nlib/col/web/CartController.java @@ -90,7 +90,7 @@ public class CartController extends NlibCommonController list = cartService.listCartItemsFromCookie(request, response, cartTypeCd); // 카트 목록 자료에 대한 상세자료 설정 - collectionService.setDetailInfoForList(list, null, NlibProperty.getString("thumbnail.image.url.small")); + collectionService.setDetailInfoForList(list, null); // 문화원별 정렬 처리 list = sortCollectionListByMngOrgCd(list); @@ -103,7 +103,7 @@ public class CartController extends NlibCommonController list = cartService.listCartItems(mbInfoId, cartTypeCd); // 카트 목록 자료에 대한 상세자료 설정 - collectionService.setDetailInfoForList(list, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + collectionService.setDetailInfoForList(list, getMbInfoId(request)); // 카트 건수 cartTypeCd1Cnt = cartService.countCartItems(mbInfoId, "1"); From eee6c9caaf07044abc7fbdad64351e0c9fc0b2a7 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 08:11:50 +0900 Subject: [PATCH 08/15] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/nlib/cmm/MainDAO_SQL.xml | 46 +------------------ 1 file changed, 2 insertions(+), 44 deletions(-) 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 1263f6e7..a3462236 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -86,21 +86,6 @@ AND IFNULL(M2.PE_STATUS, '') = '' /* 보존상태 */ ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC LIMIT 10 ) - UNION - (/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */ - SELECT - 2 AS RNK - , M2.MASTER_ID - , M2.TITLE - , M2.TYPE_DIV_CD - , TDC.S_CODE_NM AS TYPE_DIV_NM - , M2.RPRS_THUMB_URL - , M2.REG_DD - , M2.MOD_DD - FROM RG_MASTER M2 - JOIN SM_CODE_S TDC ON M2.TYPE_DIV_CD = TDC.S_CODE_ID AND TDC.L_CODE_ID = 'MASTER_TYPE_DIV_CD' - ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC - LIMIT 2 ) ) T ORDER BY RNK, T.MOD_DD DESC, T.REG_DD DESC LIMIT 10 @@ -156,7 +141,7 @@ From 421176d703b7d0c7bde6632db87e241f3c64ea75 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 10:42:42 +0900 Subject: [PATCH 09/15] =?UTF-8?q?DB=20=EC=BB=AC=EB=9F=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=B2=98=EB=A6=AC=20:=20CONTENT=20(TEXT)=20->=20CO?= =?UTF-8?q?NTENT=5FLBL=20(LONGBLOB)=20=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nlib/col/service/impl/CollectionServiceImpl.java | 2 +- src/main/java/nlib/col/web/InterestController.java | 2 +- src/main/java/nlib/user/web/UserInfoController.java | 6 +++--- .../egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml | 4 ++-- .../egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml | 6 +++--- .../egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml | 12 ++++++------ .../egovframework/mapper/nlib/info/InformDAO_SQL.xml | 1 - .../webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp | 7 +++---- .../webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp | 2 +- .../webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp | 4 ++-- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index 093384b6..b77acc0d 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -196,7 +196,7 @@ public class CollectionServiceImpl implements CollectionService { vo.setReqPsblYn (StringUtil.getString(cVO.getReqPsblYn() , vo.getReqPsblYn())); vo.setInterestYn (StringUtil.getString(cVO.getInterestYn() , vo.getInterestYn())); vo.setMUseYn (StringUtil.getString(cVO.getMUseYn() , vo.getMUseYn())); - vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); + vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); vo.setMngOrgCd (StringUtil.getString(cVO.getMngOrgCd() , vo.getMngOrgCd())); vo.setMngOrgNm (StringUtil.getString(cVO.getMngOrgNm() , vo.getMngOrgNm())); diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index ad3d1ace..b31f1572 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -137,7 +137,7 @@ public class InterestController extends NlibCommonController totalCount = interestService.countListInterests(searchCollectionVO); String mbInfoId = getMbInfoId(request); - operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request)); //------------------------------- // JSON변환 응답 처리 //------------------------------- diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index e2410acc..8fcbb3f4 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -352,7 +352,7 @@ public class UserInfoController extends NlibCommonController { List interestList = interestService.listInterests(searchCollectionVO); int interestTotalCount = interestService.countListInterests(searchCollectionVO); - interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId()); model.addAttribute("interestList", interestList); model.addAttribute("interestTotalCount", interestTotalCount); @@ -361,14 +361,14 @@ public class UserInfoController extends NlibCommonController { // 조회 // 대출상태구분코드("": 전체, A:신청, B:대출준비완료, C:취소, W:대출중, R0:정상반납, R1:연체반납, P:연체) DataApiResVO resRentVO = rentService.listRentItems(searchCollectionVO); - List rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + List rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId()); model.addAttribute("rentList", rentList); model.addAttribute("rentTotalCount", resRentVO.getRecordTotCount()); // 방문열람내역 (최근 5개) searchCollectionVO.setReqStatusDivCd(null); DataApiResVO resReadVO = readService.listReadItems(searchCollectionVO); - List readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + List readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId()); model.addAttribute("readList", readList); model.addAttribute("readTotalCount", resReadVO.getRecordTotCount()); diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml index c360e53c..7badcfa7 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -18,7 +18,7 @@ - AND IFNULL(S.CONTENT,'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%') AND IFNULL(S.DELETE_YN, 'N') = 'N' @@ -71,7 +71,7 @@ , A.MNG_ORG_CD , B.DEPT_NM AS MNG_ORG_NM , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN , A.OPEN_YN , A.POST_START_DATE diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml index 0bdd7175..7ad87a63 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml @@ -19,7 +19,7 @@ - AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') @@ -80,9 +80,9 @@ , A.QUESTION_TYPE , D.S_CODE_NM AS QUESTION_TYPE_NAME , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN - , A.ANSWER + , CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER , IFNULL(A.USE_YN, 'Y') AS USE_YN , A.VIEW_CNT , A.BD_ATTACH_FILE_ID diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml index 2a01a66b..1888a245 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml @@ -18,7 +18,7 @@ - AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') @@ -86,10 +86,10 @@ , B.DEPT_NM AS MNG_ORG_NM , A.QUESTION_TYPE , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN , IFNULL(A.EMAIL_RECV_YN, 'N') AS EMAIL_RECV_YN - , A.ANSWER + , CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER , IFNULL(A.USE_YN, 'Y') AS USE_YN , IFNULL(A.SECRET_YN, 'N') AS SECRET_YN , A.VIEW_CNT @@ -138,9 +138,9 @@ , BD_TYPE , QUESTION_TYPE , TITLE - , CONTENT + , CONTENT_LBL , ANSWER_YN - , ANSWER + , ANSWER_LBL , EMAIL_RECV_YN , SECRET_YN , USE_YN @@ -174,7 +174,7 @@ /* QNA : updateArticle : 삭제되지 않은 건 중 답변이 아직 없는 건에 한하여 수정 가능 */ UPDATE BD_NLIB_QNA SET TITLE = #{title} - , CONTENT = #{content} + , CONTENT_LBL = #{content} , EMAIL_RECV_YN = #{emailRecvYn} , SECRET_YN = #{secretYn} , BD_ATTACH_FILE_ID = #{bdAttachFileId} 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 1a087e4f..58e41935 100644 --- a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml @@ -10,7 +10,6 @@ , MNG_ORG_CD , TITLE , CONTENT - , BD_ATTACH_FILE_ATTACH_FILE_ID 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/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index b9941f40..0d47a4d3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -303,7 +303,6 @@ $(document).ready(function() {
${cart.interestYn } 썸네일 - 즐겨찾기 아이콘 @@ -319,15 +318,15 @@ $(document).ready(function() {
- + 온라인열람 - + 대출 - + 방문열람 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index 26eb06f5..08e794e7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -139,7 +139,7 @@ function fn_listCartItems() { - history.back(); + location.href = "/"; } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp index f1228ae2..3e0f51d3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp @@ -128,7 +128,7 @@ function fn_listCartItems() { - history.back(); + location.href = "/"; } @@ -258,7 +258,7 @@ $(document).ready(function() {
- + 온라인열람 From 757ee74776627e0af32fc35b178f7aec22e72fa1 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 22 Nov 2021 10:56:03 +0900 Subject: [PATCH 10/15] =?UTF-8?q?=EA=B3=B5=EC=9C=A0=ED=95=98=EA=B8=B0=20IN?= =?UTF-8?q?TERFACEID=20=EC=97=86=EC=9D=84=EC=8B=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/web/InterestController.java | 2 +- .../nlib/sch/web/NlibSearchController.java | 2 -- .../jsp/nlib/collection/searchItemDetail.jsp | 2 +- src/main/webapp/js/nlib.js | 36 +++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index ad3d1ace..b31f1572 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -137,7 +137,7 @@ public class InterestController extends NlibCommonController totalCount = interestService.countListInterests(searchCollectionVO); String mbInfoId = getMbInfoId(request); - operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request)); //------------------------------- // JSON변환 응답 처리 //------------------------------- diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 1a9ce04c..5a965cc9 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -205,7 +205,6 @@ public class NlibSearchController extends NlibCommonController { //로그인 상태인지 확인 model.addAttribute("loginVO", loginVO); - model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); searchVO.setQuery(searchVO.getQuery().replaceAll("\\\"", """)); return "nlib/collection/searchList"; } @@ -320,7 +319,6 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("result", vo); model.addAttribute("searchVO", searchVO); model.addAttribute("loginVO", loginVO); - model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); return "nlib/collection/searchItemDetail"; } 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 b22e1f3a..5e631b9c 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(){ - +
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index faa4b4a9..e8ff3335 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -406,8 +406,26 @@ function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) { var openNewWindow = window.open(url + interfaceId, "_blank"); } - -function snsShare(snsType, url) { +function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){ + var url=window.location.protocol + "//" + window.location.host + window.location.pathname + "?masterId=" + masterId; + + if(interfaceId != null && 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; + } + } + + $('#div_pop-sharing img').attr('data-cUrl',url); // url 모두 맵핑 + if(url != null && url != ''){ + getShortUrlData(url); + } +} +function gfn_snsShare(snsType, url) { var url,name,specs,changedUrl,title; if(document.title.indexOf("|") > -1){ title = encodeURIComponent($.trim(document.title.split("|")[1])); @@ -438,22 +456,10 @@ function snsShare(snsType, url) { window.open(url, name, specs); } -$( document ).on('click' , 'button.share', function (e) { - //e.preventDefault(); - var tUrl = $(this).attr('data-cUrl'); - $('#div_pop-sharing img').attr('data-cUrl',tUrl); // url 모두 맵핑 - if(tUrl != null && tUrl != ''){ - /*if(tUrl.indexOf(location.host) == -1){ - tUrl = location.protocol + '//' + location.host + tUrl; - }*/ - getShortUrlData(tUrl); - } -}); - $( document ) .on('click', '#div_pop-sharing img.sns-pop', function(e) { e.preventDefault(); - snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl')); + gfn_snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl')); }) .on('click', '#div_pop-sharing button.btn-close-pop', function(e) { e.preventDefault(); From a8c2c4ea4ba88b67aab611191ad872a77ccdb98e Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 22 Nov 2021 10:56:31 +0900 Subject: [PATCH 11/15] =?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/js/nlib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index e8ff3335..b885da6c 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -406,7 +406,7 @@ function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) { var openNewWindow = window.open(url + interfaceId, "_blank"); } -function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){ +function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){ var url=window.location.protocol + "//" + window.location.host + window.location.pathname + "?masterId=" + masterId; if(interfaceId != null && interfaceId != '') From c3039e74fc002d2d30704c87961c23d191137e56 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 22 Nov 2021 14:30:15 +0900 Subject: [PATCH 12/15] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=A4=84?= =?UTF-8?q?=EB=B0=94=EA=BF=88=20,=20=EC=83=81=EC=84=B8=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=8C=80=EC=B6=9C,=EB=B0=A9=EB=AC=B8?= =?UTF-8?q?=EC=97=B4=EB=9E=8C=20=EC=83=81=ED=83=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/sch/service/NlibSearchVO.java | 8 +++++ .../nlib/sch/web/NlibSearchController.java | 34 ++++++++----------- .../java/nlib/user/web/LoginController.java | 2 +- .../java/nlib/user/web/MemberController.java | 2 +- .../nlib/user/web/UserInfoController.java | 4 +-- .../jsp/nlib/collection/searchItemDetail.jsp | 12 +++---- .../jsp/nlib/collection/searchList.jsp | 1 + .../jsp/nlib/member/initPasswordFormPopup.jsp | 6 ++-- 8 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/main/java/nlib/sch/service/NlibSearchVO.java b/src/main/java/nlib/sch/service/NlibSearchVO.java index 6dd97c8d..7d50103c 100644 --- a/src/main/java/nlib/sch/service/NlibSearchVO.java +++ b/src/main/java/nlib/sch/service/NlibSearchVO.java @@ -48,6 +48,7 @@ public class NlibSearchVO extends PagingVO { private String typeDivCd = ""; //자료유형 private String subjectCode = ""; //주제분야 private String orgNm = ""; //생산기관 + private String mngOrgCd = ""; //문화원코드 private String reQuery = ""; //결과내 재검색 private String reQueryChk ="query"; //결과내재검색 체크 유지 @@ -354,6 +355,7 @@ public class NlibSearchVO extends PagingVO { add(map,"DTLS_TYPE_DIV_CD",URLEncoder.encode(StringUtil.getString(this.second_class,"").replace(",","|") , "UTF-8")); add(map,"SUBJECT_CODE",URLEncoder.encode(StringUtil.getString(this.second_category,"").replace(",","|") , "UTF-8")); add(map,"ORG_NM",URLEncoder.encode(StringUtil.getString(this.filter_agency,"").replace(",","|") , "UTF-8")); + add(map,"MNG_ORG_CD",URLEncoder.encode(this.mngOrgCd , "UTF-8")); //자료유형 2뎁스까지 나오게 고정 } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -405,4 +407,10 @@ public class NlibSearchVO extends PagingVO { public void setCollectionList(String collectionList) { this.collectionList = collectionList; } + public String getMngOrgCd() { + return mngOrgCd; + } + public void setMngOrgCd(String mngOrgCd) { + this.mngOrgCd = mngOrgCd; + } } diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 5a965cc9..25b44bb7 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -91,9 +91,12 @@ public class NlibSearchController extends NlibCommonController { , @ModelAttribute("searchVO") NlibSearchVO searchVO , HttpServletRequest request , HttpServletResponse res) throws Exception { - //사용자 정보를 가져온다. - NlibLoginVO loginVO = getNlibLoginVO(authentication); - + HttpSession session = request.getSession(); + String councilCd = (String)session.getAttribute("councilCd"); + + //검색엔진파라미터로 문화원코드 + searchVO.setMngOrgCd(councilCd); + List operList = new ArrayList(); // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); @@ -157,7 +160,6 @@ public class NlibSearchController extends NlibCommonController { count = 0; for(int j=0; j mngOrgList = new ArrayList<>(); List keywordList = new ArrayList<>(); @@ -271,12 +269,17 @@ public class NlibSearchController extends NlibCommonController { CollectionVO vo = new CollectionVO(); vo.setMasterId(masterId); - vo.setMbInfoId(mbInfoId); + vo = collectionService.getItemInfo(vo); + if(vo == null) + { + model.addAttribute("msg", "해당 자료를 조회할 수 없습니다.\\n관리자에게 문의하여 주시기 바랍니다."); + model.addAttribute("url","/search/searchList.do"); + return "nlib/cmm/alert"; + } String councilCd = (String)session.getAttribute("councilCd"); - vo.setMngOrgCd(councilCd); //함께 볼만한 자료 List seeTogetherListVO = collectionService.selectSeeTogetherList(vo); @@ -318,7 +321,6 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("keywordList",keywordList); model.addAttribute("result", vo); model.addAttribute("searchVO", searchVO); - model.addAttribute("loginVO", loginVO); return "nlib/collection/searchItemDetail"; } @@ -391,16 +393,10 @@ public class NlibSearchController extends NlibCommonController { public String getDetailedSearchFormPopup(HttpServletRequest request, ModelMap model) throws Exception { //주제분야 목록 조회 - List> clsf = null; - clsf = codeService.listCtClsfs(); + List> clsf = codeService.listCtClsfs(); model.addAttribute("firstCategoryList", clsf); model.addAttribute("secondCategoryList", clsf); - List> firstClassList = null; - firstClassList = codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD); - - List> secondClassList = null; - secondClassList = codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD); //자료유형 model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java index c9bbff68..14460608 100644 --- a/src/main/java/nlib/user/web/LoginController.java +++ b/src/main/java/nlib/user/web/LoginController.java @@ -675,7 +675,7 @@ public class LoginController extends NlibCommonController { if(ret < 1) { model.addAttribute("code", "NO_TARGET"); - model.addAttribute("message", "휴면사용자가 아닙니다. 다시 로그인하시거나 관리자에게 문의하여 주시기 바랍니다."); + model.addAttribute("message", "휴면사용자가 아닙니다. \\n다시 로그인하시거나 관리자에게 문의하여 주시기 바랍니다."); return "nlib/login/activateDormantAccForm"; } diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index 2b965c2f..d6202333 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -503,7 +503,7 @@ public class MemberController extends NlibCommonController{ if(result == "templateFail") { - map.put("msg","이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다."); + map.put("msg","이메일 발송에 실패하였습니다. \\n관리자에게 문의하여 주시기 바랍니다."); map.put("emailCertYn","N"); return map; } diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index 8fcbb3f4..2471645d 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -132,7 +132,7 @@ public class UserInfoController extends NlibCommonController { if(loginVO == null) { - model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다."); + model.addAttribute("msg","비정상적인 접근입니다. \\n관리자에게 문의하여 주시기 바랍니다."); model.addAttribute("url","/userInfo/pwCertMyInfo.do"); return "nlib/cmm/alert"; } @@ -142,7 +142,7 @@ public class UserInfoController extends NlibCommonController { loginVO = loginService.selectLoginUserInfo(loginVO); if(loginVO == null) { - model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다."); + model.addAttribute("msg","비정상적인 접근입니다. \\n관리자에게 문의하여 주시기 바랍니다."); model.addAttribute("url","/userInfo/pwCertMyInfo.do"); return "nlib/cmm/alert"; } 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 5e631b9c..3cb7c913 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -240,7 +240,7 @@ function goList(){
이용상태 아이콘
이용상태
-
(대기자 명)
+
<%-- (대기자 명) --%>
달력 아이콘
@@ -251,17 +251,17 @@ 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 f89951a8..c9e129b0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -97,6 +97,7 @@ window.onload = function() { //초기화 reference_filterReset(); + if("${message}" != "") alert("${message}"); }; // window.onload //페이지 로드시 초기값셋팅 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp index ba7bbd4c..8d56f323 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp @@ -67,7 +67,7 @@ function goFindPw(){ mailDoubleSubmitFlag = false; if(result == "success") { - alert("입력하신 이메일로 임시 비밀번호가 발송되었습니다. 메일을 확인해주세요."); + alert("입력하신 이메일로 임시 비밀번호가 발송되었습니다.\n메일을 확인해주세요."); var previousPage ="${loginVO.previousPage}"; if(previousPage == "alreadySignUpPopup") { @@ -84,12 +84,12 @@ function goFindPw(){ } else if(result == "templateFail") { - alert("이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다."); + alert("이메일 발송에 실패하였습니다. \n관리자에게 문의하여 주시기 바랍니다."); } },error : function(){ mailDoubleSubmitFlag = false; - alert("이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다."); + alert("이메일 발송에 실패하였습니다. \n관리자에게 문의하여 주시기 바랍니다."); } }) From dac6212a1edaa280c790db9a0dc3d32983a6b3b8 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 16:02:15 +0900 Subject: [PATCH 13/15] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=8F?= =?UTF-8?q?=20=EB=B3=B4=EC=99=84=EC=82=AC=ED=95=AD=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/CollectionVO.java | 8 +++ .../col/service/impl/RentServiceImpl.java | 2 + .../java/nlib/col/web/RentController.java | 5 ++ .../WEB-INF/jsp/nlib/cart/listCartItems.jsp | 4 +- .../WEB-INF/jsp/nlib/read/confirmRead.jsp | 40 ++++++------- .../WEB-INF/jsp/nlib/read/insertReadItems.jsp | 4 +- .../WEB-INF/jsp/nlib/rent/confirmRent.jsp | 56 +++++-------------- .../WEB-INF/jsp/nlib/rent/insertRentItems.jsp | 38 +++++++++---- .../WEB-INF/jsp/nlib/userInfo/getMyHome.jsp | 53 +++++++++++++----- src/main/webapp/common/error-throw.jsp | 21 +++++++ 10 files changed, 137 insertions(+), 94 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index 7babfe00..81500502 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -890,9 +890,17 @@ public class CollectionVO extends PagingVO { this.rtnDd = rtnDd; } + public String getmUseYn() { + return getMUseYn(); + } + public String getMUseYn() { return StringUtil.isEmpty(mUseYn) ? "N" : mUseYn; } + + public void setmUseYn(String mUseYn) { + setMUseYn(mUseYn); + } public void setMUseYn(String mUseYn) { this.mUseYn = mUseYn; diff --git a/src/main/java/nlib/col/service/impl/RentServiceImpl.java b/src/main/java/nlib/col/service/impl/RentServiceImpl.java index f1ab680c..a84e887e 100644 --- a/src/main/java/nlib/col/service/impl/RentServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/RentServiceImpl.java @@ -188,6 +188,8 @@ public class RentServiceImpl implements RentService } else { cVO.setRsrvId(null); cVO.setRsrvDd(null); + cVO.setResultCode(resVO.getResultCode()); + cVO.setResultMessage(resVO.getResultMessage()); } } diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index 3db28504..d6521dde 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -238,6 +238,11 @@ public class RentController extends NlibCommonController List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId); + if(StringUtil.isEmpty(rentVO.getMngOrgNm()) && list != null && list.size() > 0) { + rentVO.setMngOrgCd(list.get(0).getMngOrgCd()); + rentVO.setMngOrgNm(list.get(0).getMngOrgNm()); + } + model.addAttribute("rentVO", rentVO); model.addAttribute("list", list); if(fromCart) model.addAttribute("fromCart", fromCart ? "Y" : "N"); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index 0d47a4d3..25a6d312 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -304,13 +304,13 @@ $(document).ready(function() { 썸네일 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index 08e794e7..b6661cb5 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -1,9 +1,9 @@ <% /** *
- * @Class Name : confirmRent.jsp
+ * @Class Name : confirmRend.jsp
  * 
- * @Description : 대출신청 확인 화면 
+ * @Description : 방문열람신청 확인 화면 
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
@@ -126,10 +126,6 @@ function fn_changeInterest(masterId, onOff) {
 	alert("관심등록/삭제 준비중 : " + masterId + ", " + onOff);
 }
 
-function fn_gotoDetail(masterId) {
-    alert("상세보기 준비중 : " + masterId);
-}
-
 function fn_listCartItems() {
 	
 
@@ -217,7 +213,7 @@ $(document).ready(function() {
                                         
반납예정일
- + @@ -228,10 +224,10 @@ $(document).ready(function() { // 대출가능코드(operOutRangeCd)가 01:대출가능이면서 // 이용상태코드 (useStatus)가 01:이용가능, 또는 05 : 이용가능, 또는 04 : 열람대기(대출가능) 인 경우 %> - + - + <% @@ -241,45 +237,45 @@ $(document).ready(function() { // 대출가능코드(operOutRangeCd)가 01 :대출가능이면서 // 이용상태코드 (useStatus)가 02 : 대출중 (대기자 0명) 인 경우 %> - + - +
-
썸네일 - - +
썸네일 + + 즐겨찾기 아이콘 즐겨찾기 아이콘 - - + + 즐겨찾기 아이콘 즐겨찾기 아이콘
- + 온라인열람 - + 대출 - + 방문열람
- +
-
poss imposs">

${rent.useStatusNm }

-
${rent.rtnExpctDd }
+
poss imposs">

${read.useStatusNm }

+
${read.rtnExpctDd }
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index b55f1cbc..d13b1f54 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -1,9 +1,9 @@ <% /** *
- * @Class Name : confirmRent.jsp
+ * @Class Name : insertReadItems.jsp
  * 
- * @Description : 대출신청 확인 화면 
+ * @Description : 방문열람신청 결과 화면 
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
index 3e0f51d3..284b3fe4 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
@@ -83,14 +83,6 @@ $( document ).ready(function() {
 }); // document ready
 
 
-
-// 선택한 게시글 상세 보기로 이동
-function fn_viewDetail(articleNo) {
-    $("#articleNo").val(articleNo);
-    $("#articleForm").attr("action", "${pageContext.request.contextPath}/board/selectNotice.do");
-    $("#articleForm").submit();
-}
-
 function fn_insertRentItems() {
 	
 	
@@ -116,10 +108,6 @@ function fn_insertRentItems() {
     
 }
 
-function fn_changeInterest(masterId, onOff) {
-	alert("관심등록/삭제 준비중 : " + masterId + ", " + onOff);
-}
-
 function fn_listCartItems() {
 	
 	
@@ -132,10 +120,6 @@ function fn_listCartItems() {
     
 }
 
-function fn_gotoDetail(masterId) {
-    alert("상세보기 준비중 : " + masterId);
-}
-
 $(document).ready(function() {
 	
     /* 탭메뉴 */
@@ -198,7 +182,6 @@ $(document).ready(function() {
           
           
           
-          
           
           
                             

@@ -213,8 +196,6 @@ $(document).ready(function() { - - <% //----------------------------------- // 대출신청인 경우 @@ -224,7 +205,6 @@ $(document).ready(function() { %> - @@ -237,21 +217,20 @@ $(document).ready(function() { %> -
-
썸네일 - - +
썸네일 + + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -262,27 +241,27 @@ $(document).ready(function() { 온라인열람 - + 대출 - + 방문열람
- +
poss imposs">

${rent.useStatusNm }

${rent.rtnExpctDd }
-
poss imposs "> - 신청 불가 - 대출신청 - 대출예약 +
+ 신청 불가 + 대출신청 + 대출예약
- 이미 대출 대기자가 있거나 대출가능 자료가 아닙니다. - 대출신청 자료는 신청 다음날까지 방문대출이 가능합니다. - 대출예약 자료는 반납 즉시 문자(SMS)나 이메일로 안내 드립니다. + 이미 대출 대기자가 있거나 대출가능 자료가 아닙니다. + 대출신청 자료는 신청 다음날까지 방문대출이 가능합니다. + 대출예약 자료는 반납 즉시 문자(SMS)나 이메일로 안내 드립니다.
@@ -306,15 +285,8 @@ $(document).ready(function() {
-

- 대출예약 자료는 반납 즉시 문자(SMS)나 이메일을 통해 안내 드리며, 3일간 별도 보관됩니다. (3일이 지나면 예약이 취소됩니다.)

- 대출신청 자료의 경우 대출을 신청한 후 다음날까지 방문대출이 가능합니다.

-
- - -

- 자료 열람은 방문열람신청이 승인된 후, 지정된 시간에 가능합니다.

-

- 방문열람신청이 승인되면 문자(SMS)나 이메일을 통해 안내 드립니다.

-
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp index 86b64b23..880565d7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp @@ -1,9 +1,9 @@ <% /** *
- * @Class Name : confirmRent.jsp
+ * @Class Name : insertRentItems.jsp
  * 
- * @Description : 대출신청 확인 화면 
+ * @Description : 대출신청 결과 화면 
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
@@ -195,28 +195,28 @@ $(document).ready(function() {
                                             
썸네일 - - + + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘
- + 온라인열람 - + 대출 - + 방문열람
@@ -230,14 +230,22 @@ $(document).ready(function() {
- + 대출신청 자료는 신청 다음날까지 방문대출이 가능합니다. - + 대출예약 자료는 반납 즉시 문자(SMS)나 이메일로 안내 드립니다. + + + ${rent.resultMessage } + + + 잘못된 접근이거나, 정상처리되지 않았습니다. + +
@@ -250,7 +258,15 @@ $(document).ready(function() {
체크 아이콘
-
자료 ${rentType1Cnt }건 대출신청, 자료 ${rentType2Cnt }건 대출예약이 완료되었습니다.
+
+ + + 자료 ${rentType1Cnt }건 대출신청, + 자료 ${rentType2Cnt }건 대출예약완료되었습니다.
+ + + 처리 내역이 없습니다. +
+ + + + +
+

문화원로고<%=councilNm %>소장자료관

500 ERROR : Service Error

죄송합니다. 현재 서비스가 원활하지 않습니다.

에러 아이콘

@@ -22,3 +40,6 @@ String councilNm = (String)session.getAttribute("councilNm");
+ + + \ No newline at end of file From bdec9bc7cac57a91e5eeda881547db072efb6bc3 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 16:22:51 +0900 Subject: [PATCH 14/15] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=8F?= =?UTF-8?q?=20=EB=B3=B4=EC=99=84=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/web/ReadController.java | 5 + .../WEB-INF/jsp/nlib/read/insertReadItems.jsp | 136 +++--------------- 2 files changed, 24 insertions(+), 117 deletions(-) diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index 7158e8a5..c3e76306 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -91,6 +91,11 @@ public class ReadController extends NlibCommonController { List list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId); List> listDates = readService.listDates(); + + if(StringUtil.isEmpty(readVO.getMngOrgNm()) && list != null && list.size() > 0) { + readVO.setMngOrgCd(list.get(0).getMngOrgCd()); + readVO.setMngOrgNm(list.get(0).getMngOrgNm()); + } model.addAttribute("readVO", readVO); model.addAttribute("list", list); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index d13b1f54..5e6bbe7e 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -33,90 +33,14 @@ <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> @@ -192,43 +94,43 @@ $(document).ready(function() { - +
-
썸네일 - - +
썸네일 + + 즐겨찾기 아이콘 즐겨찾기 아이콘 - - + + 즐겨찾기 아이콘 즐겨찾기 아이콘
- + 온라인열람 - + 대출 - + 방문열람
- +
-

${rent.useStatusNm }

-
${rent.rtnExpctDd }
-
${rent.bookLtRvStatusNm } - - (${rent.rsrvDd }) +

${read.useStatusNm }

+
${read.rtnExpctDd }
+
${read.bookLtRvStatusNm } + + (${read.rsrvDd })
@@ -251,7 +153,7 @@ $(document).ready(function() {
처리에 실패하였습니다.
-
${readVO.resultMessage } (${readVO.resultCode })
+
${readVO.resultMessage }
From 55dc4cf87db40884b719070f5e45268bedd9a1bb Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 16:43:30 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tiles/inc/menu.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index 3eadf018..466aabc9 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -63,7 +63,7 @@ $(document).ready(function() {
  • 마이페이지