paramMap, ModelMap model) {
+
+ // 목록 이동시 전달할 매개변수
+ String searchKeyword = paramMap.get("searchKeyword");
+ String pageIndex = paramMap.get("pageIndex");
+ String pageSize = paramMap.get("pageSize");
+ String message = paramMap.get("message");
+
+ // 게시물 번호
+ String articleNo = paramMap.get("articleNo");
+
+ log.debug("selectRequestInfoForViewingItem > pageIndex = " + pageIndex);
+ log.debug("selectRequestInfoForViewingItem > pageSize = " + pageSize);
+ log.debug("selectRequestInfoForViewingItem > searchKeyword = " + searchKeyword);
+ log.debug("selectRequestInfoForViewingItem > articleNo = " + articleNo);
+ log.debug("selectRequestInfoForViewingItem > message = " + message);
+
+ //-------------------------------
+ // REQ VO 구성
+ //-------------------------------
+ DataApiReqVO reqVO = new DataApiReqVO();
+ reqVO.setAuthKey(createAuthKey(req, authentication));
+ reqVO.setPageIndex(pageIndex);
+ reqVO.setPageSize(pageSize);
+ reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID
+ reqVO.addInfoItem("articleNo", articleNo); // 게시물번호
+
+ // 요청
+ DataApiResVO resVO = rentService.selectRequestInfoForViewingItem(reqVO);
+
+ // 반환 정보
+ model.addAttribute("articleNo" , articleNo);
+ model.addAttribute("article" , resVO.getInfo()); // 게시물 상세
+ model.addAttribute("preArticle" , resVO.getList().get(0)); // 이전글 정보
+ model.addAttribute("nextArticle" , resVO.getList().get(1)); // 다음글 정보
+ model.addAttribute("message" , message);
+ model.addAttribute("pageIndex" , pageIndex);
+ model.addAttribute("pageSize" , pageSize);
+ model.addAttribute("searchKeyword", searchKeyword);
+
+ return "nlib/rent/selectRequestInfoForViewingItem";
+ }
}
\ 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 fd86b76d..1381fe13 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -74,6 +74,8 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/index.do").permitAll()
.antMatchers("/main/header.do").permitAll()
.antMatchers("/main/menu.do").permitAll()
+ .antMatchers("/rent/*.do").permitAll()
+ .antMatchers("/collection/*.do").permitAll()
.antMatchers("/sample/password/getSampleEncoder.do").permitAll()
.anyRequest().authenticated()
.and().formLogin()
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
new file mode 100644
index 00000000..dff9b40e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
@@ -0,0 +1,186 @@
+<%
+/**
+ *
+ * @Class Name : listInterests.jsp
+ *
+ * @Description : 관심 자료를 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 28. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 28.
+ * @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" %>
+
+관심 자료
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp
new file mode 100644
index 00000000..f70aeb42
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp
@@ -0,0 +1,186 @@
+<%
+/**
+ *
+ * @Class Name : listItems.jsp
+ *
+ * @Description : 소장 자료를 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 28. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 28.
+ * @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" %>
+
+소장 자료
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp
deleted file mode 100644
index 04d264d9..00000000
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp
+++ /dev/null
@@ -1,181 +0,0 @@
-<%
-/**
- *
- * @Class Name : listCancelRentItems.jsp
- *
- * @Description : 대출 취소목록을 조회한다.
- *
- *
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- *
- * @ ------------ -------- ---------------------------
- * @ 수정일 수정자 수정내용
- * @ ------------ -------- ---------------------------
- * @ 2021. 7. 21. JSYOO 최초 생성
- *
- *
- * @author 이씨플라자 * DIGITALSHIP JSYOO
- * @since 2021. 7. 21.
- * @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" %>
-
-대출 취소
-
-
-
-
-${pageTitle}
-
-
-
-
-
-
-
-
-
-
-대출 취소
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listCanceledRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listCanceledRentItems.jsp
new file mode 100644
index 00000000..c1bcaa1d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listCanceledRentItems.jsp
@@ -0,0 +1,179 @@
+<%
+/**
+ *
+ * @Class Name : listCanceledRentItems.jsp
+ *
+ * @Description : 대출 취소목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 취소 목록
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
index 509f280c..8f3bd007 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
@@ -1,181 +1,189 @@
-<%
-/**
- *
- * @Class Name : listRentItems.jsp
- *
- * @Description : 대출 목록을 조회한다.
- *
- *
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- *
- * @ ------------ -------- ---------------------------
- * @ 수정일 수정자 수정내용
- * @ ------------ -------- ---------------------------
- * @ 2021. 7. 21. JSYOO 최초 생성
- *
- *
- * @author 이씨플라자 * DIGITALSHIP JSYOO
- * @since 2021. 7. 21.
- * @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" %>
-
-대출 목록
-
-
-
-
-${pageTitle}
-
-
-
-
-
-
-
-
-
-
-대출 목록
-
-
-
-
-
-
-
+<%
+/**
+ *
+ * @Class Name : listRentItems.jsp
+ *
+ * @Description : 대출 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 목록
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRequestsForViewingItem.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRequestsForViewingItem.jsp
new file mode 100644
index 00000000..0afb5482
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRequestsForViewingItem.jsp
@@ -0,0 +1,179 @@
+<%
+/**
+ *
+ * @Class Name : listRequestsForViewingItem.jsp
+ *
+ * @Description : 열람 요청을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+열람 요청
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp
index 52ba516a..efd369c2 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp
@@ -1,181 +1,371 @@
-<%
-/**
- *
- * @Class Name : listReserVations.jsp
- *
- * @Description : 대출 예약 목록을 조회한다.
- *
- *
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- *
- * @ ------------ -------- ---------------------------
- * @ 수정일 수정자 수정내용
- * @ ------------ -------- ---------------------------
- * @ 2021. 7. 21. JSYOO 최초 생성
- *
- *
- * @author 이씨플라자 * DIGITALSHIP JSYOO
- * @since 2021. 7. 21.
- * @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" %>
-
-대출 예약
-
-
-
-
-${pageTitle}
-
-
-
-
-
-
-
-
-
-
-대출 예약
-
-
-
-
-
-
-
+<<<<<<< HEAD
+<%
+/**
+ *
+ * @Class Name : listReserVations.jsp
+ *
+ * @Description : 대출 예약 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 예약 목록
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+
+${pageTitle }
+
+
+
+
+
+=======
+<%
+/**
+ *
+ * @Class Name : listReserVations.jsp
+ *
+ * @Description : 대출 예약 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 예약
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+대출 예약
+
+
+
+
+
+
+
+>>>>>>> refs/remotes/origin/master
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/selectRequestInfoForViewingItem.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/selectRequestInfoForViewingItem.jsp
new file mode 100644
index 00000000..64993956
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/selectRequestInfoForViewingItem.jsp
@@ -0,0 +1,169 @@
+<%
+/**
+ *
+ * @Class Name : selectRequestInfoForViewingItem.jsp
+ *
+ * @Description : 열람요청 상세내용을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 30. JSYOO 최초 생성
+ *
+ *
+ * @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" %>
+
+열람요청 - 상세조회
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+${pageTitle }
+
+메시지 : ${message }
+
+
+
+
+
+