diff --git a/src/main/java/nlib/bbs/service/impl/BoardDAOApi.java b/src/main/java/nlib/bbs/service/impl/BoardDAOApi.java index fdd89353..faf3cff0 100644 --- a/src/main/java/nlib/bbs/service/impl/BoardDAOApi.java +++ b/src/main/java/nlib/bbs/service/impl/BoardDAOApi.java @@ -22,22 +22,22 @@ public class BoardDAOApi extends DataApi public DataApiResVO listNotices(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/notice/list"); - return get(reqVO); + return request(reqVO); } public DataApiResVO selectNotice(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/notice"); - return get(reqVO); + return request(reqVO); } public DataApiResVO listFAQs(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/faq/list"); - return get(reqVO); + return request(reqVO); } public DataApiResVO selectFAQ(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/faq"); - return get(reqVO); + return request(reqVO); } @@ -49,12 +49,12 @@ public class BoardDAOApi extends DataApi */ public DataApiResVO listQnAs(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/qna/list"); - return get(reqVO); + return request(reqVO); } public DataApiResVO selectQnA(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/qna"); - return get(reqVO); + return request(reqVO); } public DataApiResVO verifyWriter(DataApiReqVO reqVO) { @@ -63,17 +63,17 @@ public class BoardDAOApi extends DataApi public DataApiResVO updateQnA(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/qna"); - return post(reqVO); + return request(reqVO); } public DataApiResVO deleteQnA(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/qna"); - return delete(reqVO); + return request(reqVO); } public DataApiResVO insertQnA(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/qna"); - return put(reqVO); + return request(reqVO); } diff --git a/src/main/java/nlib/bbs/web/BoardControllerApi.java b/src/main/java/nlib/bbs/web/BoardControllerApi.java index 0df77b4d..f19eb9f7 100644 --- a/src/main/java/nlib/bbs/web/BoardControllerApi.java +++ b/src/main/java/nlib/bbs/web/BoardControllerApi.java @@ -121,8 +121,8 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); - reqVO.addInfoItem("articleType", articleType); + reqVO.putInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("articleType", articleType); // 요청 DataApiResVO resVO = boardService.listNotices(reqVO); @@ -135,7 +135,7 @@ public class BoardControllerApi extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList("record")); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -172,8 +172,8 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = boardService.selectNotice(reqVO); @@ -181,8 +181,8 @@ public class BoardControllerApi extends NlibCommonController // 반환 정보 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("preArticle" , resVO.getList("record").get(0)); // 이전글 정보 + model.addAttribute("nextArticle" , resVO.getList("record").get(1)); // 다음글 정보 model.addAttribute("message" , message); model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); @@ -264,8 +264,8 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); - reqVO.addInfoItem("faqType", faqType); + reqVO.putInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("faqType", faqType); // 요청 DataApiResVO resVO = boardService.listFAQs(reqVO); @@ -278,7 +278,7 @@ public class BoardControllerApi extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList("record")); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -303,14 +303,14 @@ public class BoardControllerApi extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.addInfoItem("boardNo", "FAQ"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "FAQ"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = boardService.selectFAQ(reqVO); // 반환 정보 - return makeResponseEntityJson(resVO.getInfo()); + return makeResponseEntityJson(resVO); } /** @@ -369,7 +369,7 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = boardService.listQnAs(reqVO); @@ -382,7 +382,7 @@ public class BoardControllerApi extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList("record")); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -424,8 +424,8 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = boardService.selectQnA(reqVO); @@ -433,8 +433,8 @@ public class BoardControllerApi extends NlibCommonController // 반환 정보 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("preArticle" , resVO.getList("record").get(0)); // 이전글 정보 + model.addAttribute("nextArticle" , resVO.getList("record").get(1)); // 다음글 정보 model.addAttribute("message" , message); model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); @@ -490,11 +490,11 @@ public class BoardControllerApi extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.addInfoItem("boardNo" , "QNA"); - reqVO.addInfoItem("title" , paramMap.get("title")); - reqVO.addInfoItem("regUserName" , paramMap.get("regUserName")); - reqVO.addInfoItem("email" , paramMap.get("email")); - reqVO.addInfoItem("contentQeust", paramMap.get("contentQeust")); + reqVO.putInfoItem("boardNo" , "QNA"); + reqVO.putInfoItem("title" , paramMap.get("title")); + reqVO.putInfoItem("regUserName" , paramMap.get("regUserName")); + reqVO.putInfoItem("email" , paramMap.get("email")); + reqVO.putInfoItem("contentQeust", paramMap.get("contentQeust")); String fileListJsonStr = paramMap.get("fileList"); if(fileListJsonStr.startsWith("\"")) fileListJsonStr = fileListJsonStr.substring(1); @@ -524,7 +524,7 @@ public class BoardControllerApi extends NlibCommonController log.debug("fileMap =" + fileList); */ - reqVO.addInfoItem("fileList", fileListJsonStr); + reqVO.putInfoItem("fileList", fileListJsonStr); // 요청 DataApiResVO resVO = boardService.insertQnA(reqVO); @@ -598,14 +598,14 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = boardService.selectQnA(reqVO); // 비밀번호 확인 - HashMap article = resVO.getInfo(); + HashMap article = resVO.getInfo(); String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword); log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword); @@ -677,7 +677,7 @@ public class BoardControllerApi extends NlibCommonController //------------------------------- // 기존 정보 조회 DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.addInfoItem("articleNo", articleNo); + reqVO.putInfoItem("articleNo", articleNo); DataApiResVO resVO = boardService.selectQnA(reqVO); String oldArticlePassword = resVO.getInfoItem("articlePassword"); @@ -700,13 +700,13 @@ public class BoardControllerApi extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO updateReqVO = new DataApiReqVO(); - updateReqVO.addInfoItem("boardNo" , "QNA"); - updateReqVO.addInfoItem("articleNo" , articleNo); - updateReqVO.addInfoItem("title" , paramMap.get("title")); - updateReqVO.addInfoItem("regUserName" , paramMap.get("regUserName")); - updateReqVO.addInfoItem("email" , paramMap.get("email")); - updateReqVO.addInfoItem("contentQeust", paramMap.get("contentQeust")); - updateReqVO.addInfoItem("articlePassword", articlePassword); // SHA256 글비밀번호 + updateReqVO.putInfoItem("boardNo" , "QNA"); + updateReqVO.putInfoItem("articleNo" , articleNo); + updateReqVO.putInfoItem("title" , paramMap.get("title")); + updateReqVO.putInfoItem("regUserName" , paramMap.get("regUserName")); + updateReqVO.putInfoItem("email" , paramMap.get("email")); + updateReqVO.putInfoItem("contentQeust", paramMap.get("contentQeust")); + updateReqVO.putInfoItem("articlePassword", articlePassword); // SHA256 글비밀번호 // 요청 DataApiResVO updateResVO = boardService.updateQnA(updateReqVO); @@ -779,14 +779,14 @@ public class BoardControllerApi extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = boardService.selectQnA(reqVO); // 비밀번호 확인 - HashMap article = resVO.getInfo(); + HashMap article = resVO.getInfo(); String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword); log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword); diff --git a/src/main/java/nlib/col/service/impl/RentDAO.java b/src/main/java/nlib/col/service/impl/RentDAO.java index acff5a92..c333a69e 100644 --- a/src/main/java/nlib/col/service/impl/RentDAO.java +++ b/src/main/java/nlib/col/service/impl/RentDAO.java @@ -29,7 +29,7 @@ public class RentDAO extends DataApi */ public DataApiResVO listRentItems(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/list"); - return get(reqVO); + return request(reqVO); } /** @@ -40,7 +40,7 @@ public class RentDAO extends DataApi */ public DataApiResVO listPostpones(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/list"); - return get(reqVO); + return request(reqVO); } /** @@ -51,7 +51,7 @@ public class RentDAO extends DataApi */ public DataApiResVO listCanceledRentItems(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/list"); - return get(reqVO); + return request(reqVO); } /** @@ -62,7 +62,7 @@ public class RentDAO extends DataApi */ public DataApiResVO listReservations(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/list"); - return get(reqVO); + return request(reqVO); } public DataApiResVO cancelReservations(DataApiReqVO reqVO) { @@ -77,12 +77,12 @@ public class RentDAO extends DataApi */ public DataApiResVO listRequestsForViewingItem(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/read/list"); - return get(reqVO); + return request(reqVO); } public DataApiResVO selectRequestInfoForViewingItem(DataApiReqVO reqVO) { reqVO.setReqUrl(RESOURCE_URI + "/read"); - return get(reqVO); + return request(reqVO); } diff --git a/src/main/java/nlib/col/web/CollectionController.java b/src/main/java/nlib/col/web/CollectionController.java index 789ab859..6af2dc14 100644 --- a/src/main/java/nlib/col/web/CollectionController.java +++ b/src/main/java/nlib/col/web/CollectionController.java @@ -36,6 +36,7 @@ import nlib.col.service.DeptVO; import nlib.col.service.RisVO; import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiResVO; +import nlib.restful.service.DataApiVO; import nlib.user.service.NlibLoginVO; import nlib.util.StringUtil; @@ -98,7 +99,7 @@ public class CollectionController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = collectionService.listItems(reqVO); @@ -111,7 +112,7 @@ public class CollectionController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -214,8 +215,8 @@ public class CollectionController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = collectionService.selectItemInfo(reqVO); diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index 66eebb92..9c50d5c7 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -24,6 +24,7 @@ import nlib.cmm.service.NlibProperty; import nlib.col.service.RentService; import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiResVO; +import nlib.restful.service.DataApiVO; import nlib.util.StringUtil; /** @@ -102,8 +103,8 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); - + reqVO.putInfoItem("searchKeyword", searchKeyword); + // 요청 DataApiResVO resVO = rentService.listRentItems(reqVO); @@ -115,7 +116,7 @@ public class RentController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -162,7 +163,7 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = rentService.listCanceledRentItems(reqVO); @@ -175,7 +176,7 @@ public class RentController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -222,7 +223,7 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = rentService.listPostpones(reqVO); @@ -235,7 +236,7 @@ public class RentController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -286,7 +287,7 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = rentService.listReservations(reqVO); @@ -299,7 +300,7 @@ public class RentController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -352,7 +353,7 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("searchKeyword", searchKeyword); + reqVO.putInfoItem("searchKeyword", searchKeyword); // 요청 DataApiResVO resVO = rentService.listRequestsForViewingItem(reqVO); @@ -365,7 +366,7 @@ public class RentController extends NlibCommonController // itemsCount: 255 // } HashMap retMap = new HashMap(); - retMap.put("data", resVO.getList()); + retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD)); retMap.put("itemsCount", resVO.getRecordTotCount()); return makeResponseEntityJson(retMap); @@ -401,8 +402,8 @@ public class RentController extends NlibCommonController DataApiReqVO reqVO = new DataApiReqVO(); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); - reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID - reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 + reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID + reqVO.putInfoItem("articleNo", articleNo); // 게시물번호 // 요청 DataApiResVO resVO = rentService.selectRequestInfoForViewingItem(reqVO); @@ -410,8 +411,8 @@ public class RentController extends NlibCommonController // 반환 정보 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("preArticle" , resVO.getList(DataApiVO.XML_EL_NAME_RECORD).get(0)); // 이전글 정보 + model.addAttribute("nextArticle" , resVO.getList(DataApiVO.XML_EL_NAME_RECORD).get(1)); // 다음글 정보 model.addAttribute("message" , message); model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize);