somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API 공통 모듈 변경에 따른 사용 함수 변경작업

Browse Source
This commit is contained in:
KNKIM 2021-10-05 09:09:39 +09:00
parent 9ec18d2ae9
commit c784ef39fb
5 changed files with 75 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/nlib/bbs/service/impl/BoardDAOApi.java
View File

@ -22,22 +22,22 @@ public class BoardDAOApi extends DataApi
public DataApiResVO listNotices(DataApiReqVO reqVO) { public DataApiResVO listNotices(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/notice/list"); reqVO.setReqUrl(RESOURCE_URI + "/notice/list");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO selectNotice(DataApiReqVO reqVO) { public DataApiResVO selectNotice(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/notice"); reqVO.setReqUrl(RESOURCE_URI + "/notice");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO listFAQs(DataApiReqVO reqVO) { public DataApiResVO listFAQs(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/faq/list"); reqVO.setReqUrl(RESOURCE_URI + "/faq/list");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO selectFAQ(DataApiReqVO reqVO) { public DataApiResVO selectFAQ(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/faq"); 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) { public DataApiResVO listQnAs(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/qna/list"); reqVO.setReqUrl(RESOURCE_URI + "/qna/list");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO selectQnA(DataApiReqVO reqVO) { public DataApiResVO selectQnA(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/qna"); reqVO.setReqUrl(RESOURCE_URI + "/qna");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO verifyWriter(DataApiReqVO reqVO) { public DataApiResVO verifyWriter(DataApiReqVO reqVO) {
@ -63,17 +63,17 @@ public class BoardDAOApi extends DataApi
public DataApiResVO updateQnA(DataApiReqVO reqVO) { public DataApiResVO updateQnA(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/qna"); reqVO.setReqUrl(RESOURCE_URI + "/qna");
return post(reqVO); return request(reqVO);
} }
public DataApiResVO deleteQnA(DataApiReqVO reqVO) { public DataApiResVO deleteQnA(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/qna"); reqVO.setReqUrl(RESOURCE_URI + "/qna");
return delete(reqVO); return request(reqVO);
} }
public DataApiResVO insertQnA(DataApiReqVO reqVO) { public DataApiResVO insertQnA(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/qna"); reqVO.setReqUrl(RESOURCE_URI + "/qna");
return put(reqVO); return request(reqVO);
} }

78
src/main/java/nlib/bbs/web/BoardControllerApi.java
View File

@ -121,8 +121,8 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
reqVO.addInfoItem("articleType", articleType); reqVO.putInfoItem("articleType", articleType);
// 요청 // 요청
DataApiResVO resVO = boardService.listNotices(reqVO); DataApiResVO resVO = boardService.listNotices(reqVO);
@ -135,7 +135,7 @@ public class BoardControllerApi extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList("record"));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -172,8 +172,8 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = boardService.selectNotice(reqVO); DataApiResVO resVO = boardService.selectNotice(reqVO);
@ -181,8 +181,8 @@ public class BoardControllerApi extends NlibCommonController
// 반환 정보 // 반환 정보
model.addAttribute("articleNo" , articleNo); model.addAttribute("articleNo" , articleNo);
model.addAttribute("article" , resVO.getInfo()); // 게시물 상세 model.addAttribute("article" , resVO.getInfo()); // 게시물 상세
model.addAttribute("preArticle" , resVO.getList().get(0)); // 이전글 정보 model.addAttribute("preArticle" , resVO.getList("record").get(0)); // 이전글 정보
model.addAttribute("nextArticle" , resVO.getList().get(1)); // 다음글 정보 model.addAttribute("nextArticle" , resVO.getList("record").get(1)); // 다음글 정보
model.addAttribute("message" , message); model.addAttribute("message" , message);
model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageIndex" , pageIndex);
model.addAttribute("pageSize" , pageSize); model.addAttribute("pageSize" , pageSize);
@ -264,8 +264,8 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
reqVO.addInfoItem("faqType", faqType); reqVO.putInfoItem("faqType", faqType);
// 요청 // 요청
DataApiResVO resVO = boardService.listFAQs(reqVO); DataApiResVO resVO = boardService.listFAQs(reqVO);
@ -278,7 +278,7 @@ public class BoardControllerApi extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList("record"));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -303,14 +303,14 @@ public class BoardControllerApi extends NlibCommonController
// REQ VO 구성 // REQ VO 구성
//------------------------------- //-------------------------------
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.addInfoItem("boardNo", "FAQ"); // 게시판ID reqVO.putInfoItem("boardNo", "FAQ"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = boardService.selectFAQ(reqVO); 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(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = boardService.listQnAs(reqVO); DataApiResVO resVO = boardService.listQnAs(reqVO);
@ -382,7 +382,7 @@ public class BoardControllerApi extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList("record"));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -424,8 +424,8 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = boardService.selectQnA(reqVO); DataApiResVO resVO = boardService.selectQnA(reqVO);
@ -433,8 +433,8 @@ public class BoardControllerApi extends NlibCommonController
// 반환 정보 // 반환 정보
model.addAttribute("articleNo" , articleNo); model.addAttribute("articleNo" , articleNo);
model.addAttribute("article" , resVO.getInfo()); // 게시물 상세 model.addAttribute("article" , resVO.getInfo()); // 게시물 상세
model.addAttribute("preArticle" , resVO.getList().get(0)); // 이전글 정보 model.addAttribute("preArticle" , resVO.getList("record").get(0)); // 이전글 정보
model.addAttribute("nextArticle" , resVO.getList().get(1)); // 다음글 정보 model.addAttribute("nextArticle" , resVO.getList("record").get(1)); // 다음글 정보
model.addAttribute("message" , message); model.addAttribute("message" , message);
model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageIndex" , pageIndex);
model.addAttribute("pageSize" , pageSize); model.addAttribute("pageSize" , pageSize);
@ -490,11 +490,11 @@ public class BoardControllerApi extends NlibCommonController
// REQ VO 구성 // REQ VO 구성
//------------------------------- //-------------------------------
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.addInfoItem("boardNo" , "QNA"); reqVO.putInfoItem("boardNo" , "QNA");
reqVO.addInfoItem("title" , paramMap.get("title")); reqVO.putInfoItem("title" , paramMap.get("title"));
reqVO.addInfoItem("regUserName" , paramMap.get("regUserName")); reqVO.putInfoItem("regUserName" , paramMap.get("regUserName"));
reqVO.addInfoItem("email" , paramMap.get("email")); reqVO.putInfoItem("email" , paramMap.get("email"));
reqVO.addInfoItem("contentQeust", paramMap.get("contentQeust")); reqVO.putInfoItem("contentQeust", paramMap.get("contentQeust"));
String fileListJsonStr = paramMap.get("fileList"); String fileListJsonStr = paramMap.get("fileList");
if(fileListJsonStr.startsWith("\"")) fileListJsonStr = fileListJsonStr.substring(1); if(fileListJsonStr.startsWith("\"")) fileListJsonStr = fileListJsonStr.substring(1);
@ -524,7 +524,7 @@ public class BoardControllerApi extends NlibCommonController
log.debug("fileMap =" + fileList); log.debug("fileMap =" + fileList);
*/ */
reqVO.addInfoItem("fileList", fileListJsonStr); reqVO.putInfoItem("fileList", fileListJsonStr);
// 요청 // 요청
DataApiResVO resVO = boardService.insertQnA(reqVO); DataApiResVO resVO = boardService.insertQnA(reqVO);
@ -598,14 +598,14 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = boardService.selectQnA(reqVO); DataApiResVO resVO = boardService.selectQnA(reqVO);
// 비밀번호 확인 // 비밀번호 확인
HashMap<String, Object> article = resVO.getInfo(); HashMap<String, String> article = resVO.getInfo();
String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword); String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword);
log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword); log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword);
@ -677,7 +677,7 @@ public class BoardControllerApi extends NlibCommonController
//------------------------------- //-------------------------------
// 기존 정보 조회 // 기존 정보 조회
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.addInfoItem("articleNo", articleNo); reqVO.putInfoItem("articleNo", articleNo);
DataApiResVO resVO = boardService.selectQnA(reqVO); DataApiResVO resVO = boardService.selectQnA(reqVO);
String oldArticlePassword = resVO.getInfoItem("articlePassword"); String oldArticlePassword = resVO.getInfoItem("articlePassword");
@ -700,13 +700,13 @@ public class BoardControllerApi extends NlibCommonController
// REQ VO 구성 // REQ VO 구성
//------------------------------- //-------------------------------
DataApiReqVO updateReqVO = new DataApiReqVO(); DataApiReqVO updateReqVO = new DataApiReqVO();
updateReqVO.addInfoItem("boardNo" , "QNA"); updateReqVO.putInfoItem("boardNo" , "QNA");
updateReqVO.addInfoItem("articleNo" , articleNo); updateReqVO.putInfoItem("articleNo" , articleNo);
updateReqVO.addInfoItem("title" , paramMap.get("title")); updateReqVO.putInfoItem("title" , paramMap.get("title"));
updateReqVO.addInfoItem("regUserName" , paramMap.get("regUserName")); updateReqVO.putInfoItem("regUserName" , paramMap.get("regUserName"));
updateReqVO.addInfoItem("email" , paramMap.get("email")); updateReqVO.putInfoItem("email" , paramMap.get("email"));
updateReqVO.addInfoItem("contentQeust", paramMap.get("contentQeust")); updateReqVO.putInfoItem("contentQeust", paramMap.get("contentQeust"));
updateReqVO.addInfoItem("articlePassword", articlePassword); // SHA256 글비밀번호 updateReqVO.putInfoItem("articlePassword", articlePassword); // SHA256 글비밀번호
// 요청 // 요청
DataApiResVO updateResVO = boardService.updateQnA(updateReqVO); DataApiResVO updateResVO = boardService.updateQnA(updateReqVO);
@ -779,14 +779,14 @@ public class BoardControllerApi extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = boardService.selectQnA(reqVO); DataApiResVO resVO = boardService.selectQnA(reqVO);
// 비밀번호 확인 // 비밀번호 확인
HashMap<String, Object> article = resVO.getInfo(); HashMap<String, String> article = resVO.getInfo();
String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword); String shaArticlePassword = nlibPasswordEncoder.encode(articlePassword);
log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword); log.debug("updateQnAForm > 입력받은 비밀번호를 SHA256 암호화한 값 : " + shaArticlePassword);

12
src/main/java/nlib/col/service/impl/RentDAO.java
View File

@ -29,7 +29,7 @@ public class RentDAO extends DataApi
*/ */
public DataApiResVO listRentItems(DataApiReqVO reqVO) { public DataApiResVO listRentItems(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/list"); 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) { public DataApiResVO listPostpones(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/list"); 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) { public DataApiResVO listCanceledRentItems(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/list"); 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) { public DataApiResVO listReservations(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/list"); reqVO.setReqUrl(RESOURCE_URI + "/list");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO cancelReservations(DataApiReqVO reqVO) { public DataApiResVO cancelReservations(DataApiReqVO reqVO) {
@ -77,12 +77,12 @@ public class RentDAO extends DataApi
*/ */
public DataApiResVO listRequestsForViewingItem(DataApiReqVO reqVO) { public DataApiResVO listRequestsForViewingItem(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/read/list"); reqVO.setReqUrl(RESOURCE_URI + "/read/list");
return get(reqVO); return request(reqVO);
} }
public DataApiResVO selectRequestInfoForViewingItem(DataApiReqVO reqVO) { public DataApiResVO selectRequestInfoForViewingItem(DataApiReqVO reqVO) {
reqVO.setReqUrl(RESOURCE_URI + "/read"); reqVO.setReqUrl(RESOURCE_URI + "/read");
return get(reqVO); return request(reqVO);
} }

9
src/main/java/nlib/col/web/CollectionController.java
View File

@ -36,6 +36,7 @@ import nlib.col.service.DeptVO;
import nlib.col.service.RisVO; import nlib.col.service.RisVO;
import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiReqVO;
import nlib.restful.service.DataApiResVO; import nlib.restful.service.DataApiResVO;
import nlib.restful.service.DataApiVO;
import nlib.user.service.NlibLoginVO; import nlib.user.service.NlibLoginVO;
import nlib.util.StringUtil; import nlib.util.StringUtil;
@ -98,7 +99,7 @@ public class CollectionController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = collectionService.listItems(reqVO); DataApiResVO resVO = collectionService.listItems(reqVO);
@ -111,7 +112,7 @@ public class CollectionController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -214,8 +215,8 @@ public class CollectionController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = collectionService.selectItemInfo(reqVO); DataApiResVO resVO = collectionService.selectItemInfo(reqVO);

29
src/main/java/nlib/col/web/RentController.java
View File

@ -24,6 +24,7 @@ import nlib.cmm.service.NlibProperty;
import nlib.col.service.RentService; import nlib.col.service.RentService;
import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiReqVO;
import nlib.restful.service.DataApiResVO; import nlib.restful.service.DataApiResVO;
import nlib.restful.service.DataApiVO;
import nlib.util.StringUtil; import nlib.util.StringUtil;
/** /**
@ -102,7 +103,7 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = rentService.listRentItems(reqVO); DataApiResVO resVO = rentService.listRentItems(reqVO);
@ -115,7 +116,7 @@ public class RentController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -162,7 +163,7 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = rentService.listCanceledRentItems(reqVO); DataApiResVO resVO = rentService.listCanceledRentItems(reqVO);
@ -175,7 +176,7 @@ public class RentController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -222,7 +223,7 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = rentService.listPostpones(reqVO); DataApiResVO resVO = rentService.listPostpones(reqVO);
@ -235,7 +236,7 @@ public class RentController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -286,7 +287,7 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = rentService.listReservations(reqVO); DataApiResVO resVO = rentService.listReservations(reqVO);
@ -299,7 +300,7 @@ public class RentController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -352,7 +353,7 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("searchKeyword", searchKeyword); reqVO.putInfoItem("searchKeyword", searchKeyword);
// 요청 // 요청
DataApiResVO resVO = rentService.listRequestsForViewingItem(reqVO); DataApiResVO resVO = rentService.listRequestsForViewingItem(reqVO);
@ -365,7 +366,7 @@ public class RentController extends NlibCommonController
// itemsCount: 255 // itemsCount: 255
// } // }
HashMap<String, Object> retMap = new HashMap<String, Object>(); HashMap<String, Object> retMap = new HashMap<String, Object>();
retMap.put("data", resVO.getList()); retMap.put("data", resVO.getList(DataApiVO.XML_EL_NAME_RECORD));
retMap.put("itemsCount", resVO.getRecordTotCount()); retMap.put("itemsCount", resVO.getRecordTotCount());
return makeResponseEntityJson(retMap); return makeResponseEntityJson(retMap);
@ -401,8 +402,8 @@ public class RentController extends NlibCommonController
DataApiReqVO reqVO = new DataApiReqVO(); DataApiReqVO reqVO = new DataApiReqVO();
reqVO.setPageIndex(pageIndex); reqVO.setPageIndex(pageIndex);
reqVO.setPageSize(pageSize); reqVO.setPageSize(pageSize);
reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID reqVO.putInfoItem("boardNo", "QNA"); // 게시판ID
reqVO.addInfoItem("articleNo", articleNo); // 게시물번호 reqVO.putInfoItem("articleNo", articleNo); // 게시물번호
// 요청 // 요청
DataApiResVO resVO = rentService.selectRequestInfoForViewingItem(reqVO); DataApiResVO resVO = rentService.selectRequestInfoForViewingItem(reqVO);
@ -410,8 +411,8 @@ public class RentController extends NlibCommonController
// 반환 정보 // 반환 정보
model.addAttribute("articleNo" , articleNo); model.addAttribute("articleNo" , articleNo);
model.addAttribute("article" , resVO.getInfo()); // 게시물 상세 model.addAttribute("article" , resVO.getInfo()); // 게시물 상세
model.addAttribute("preArticle" , resVO.getList().get(0)); // 이전글 정보 model.addAttribute("preArticle" , resVO.getList(DataApiVO.XML_EL_NAME_RECORD).get(0)); // 이전글 정보
model.addAttribute("nextArticle" , resVO.getList().get(1)); // 다음글 정보 model.addAttribute("nextArticle" , resVO.getList(DataApiVO.XML_EL_NAME_RECORD).get(1)); // 다음글 정보
model.addAttribute("message" , message); model.addAttribute("message" , message);
model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageIndex" , pageIndex);
model.addAttribute("pageSize" , pageSize); model.addAttribute("pageSize" , pageSize);