diff --git a/src/main/java/nlib/bbs/web/BoardController.java b/src/main/java/nlib/bbs/web/BoardController.java index a83c88ae..f014f9bf 100644 --- a/src/main/java/nlib/bbs/web/BoardController.java +++ b/src/main/java/nlib/bbs/web/BoardController.java @@ -83,7 +83,7 @@ public class BoardController extends NlibCommonController log.debug("listNotices > message = " + message); // 페이징 사이즈 코드 목록 조회 - List> pageSizeCodes = codeService.listCodes("PAGE_SIZE"); + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 공지사항 유형 코드 목록 조회 List> articleTypeCodes = codeService.listCodes("ARTICLE_TYPE"); @@ -227,7 +227,7 @@ public class BoardController extends NlibCommonController // 페이징 사이즈 코드 목록 조회 - List> pageSizeCodes = codeService.listCodes("PAGE_SIZE"); + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 유형 코드 목록 조회 List> articleTypeCodes = codeService.listCodes("FAQ_TYPE"); @@ -342,9 +342,8 @@ public class BoardController extends NlibCommonController log.debug("listQnAs > searchKeyword = " + searchKeyword); log.debug("listQnAs > message = " + message); - // 페이징 사이즈 코드 목록 조회 - List> pageSizeCodes = codeService.listCodes("PAGE_SIZE"); + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); diff --git a/src/main/java/nlib/col/web/CollectionController.java b/src/main/java/nlib/col/web/CollectionController.java index bcb349c8..0120b648 100644 --- a/src/main/java/nlib/col/web/CollectionController.java +++ b/src/main/java/nlib/col/web/CollectionController.java @@ -2,6 +2,7 @@ package nlib.col.web; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -44,23 +45,19 @@ public class CollectionController extends NlibCommonController * @return */ @RequestMapping("/collection/listItems.do") - public String listItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/collection/listItems"; } @@ -172,23 +169,19 @@ public class CollectionController extends NlibCommonController * @return */ @RequestMapping("/collection/listInterests.do") - public String listInterests(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listInterests(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/collection/listInterests"; } diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index 5916a8d4..7458c6b4 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -2,6 +2,7 @@ package nlib.col.web; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -65,23 +66,19 @@ public class RentController extends NlibCommonController * @return */ @RequestMapping("/rent/listRentItems.do") - public String listRentItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listRentItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/rent/listRentItems"; } @@ -130,23 +127,19 @@ public class RentController extends NlibCommonController * @return */ @RequestMapping("/rent/listCanceledRentItems.do") - public String listCanceledRentItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listCanceledRentItems(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/rent/listCanceledRentItems"; } @@ -195,23 +188,19 @@ public class RentController extends NlibCommonController * @return */ @RequestMapping("/rent/listPostpones.do") - public String listPostpones(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listPostpones(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/rent/listPostpones"; } @@ -264,23 +253,19 @@ public class RentController extends NlibCommonController * @return */ @RequestMapping("/rent/listReservations.do") - public String listReservations(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listReservations(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/rent/listReservations"; } @@ -335,23 +320,19 @@ public class RentController extends NlibCommonController * @return */ @RequestMapping("/rent/listRequestsForViewingItem.do") - public String listRequestsForViewingItem(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) { + public String listRequestsForViewingItem(HttpServletRequest req, Authentication authentication, @RequestParam Map paramMap, ModelMap model) throws Exception { String searchKeyword = paramMap.get("searchKeyword"); String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); - // 페이징 사이즈 코드 목록 조회 - DataApiReqVO reqVOforPageSize = new DataApiReqVO(); - reqVOforPageSize.setAuthKey(createAuthKey(req, authentication)); - reqVOforPageSize.setPageSize(0); - reqVOforPageSize.addInfoItem("codeUpperId", "PAGE_SIZE"); - DataApiResVO resVOforPageSize = codeService.listCodes(reqVOforPageSize); + // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); // 반환 정보 model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); model.addAttribute("searchKeyword", searchKeyword); - model.addAttribute("pageSizeCodes", resVOforPageSize.getList()); + model.addAttribute("pageSizeCodes", pageSizeCodes); return "nlib/rent/listRequestsForViewingItem"; }