From 3967f56587fc40f6f6f27d16d264c8ba1669b8f3 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:28:11 +0900 Subject: [PATCH] =?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() {
-
썸네일 +
썸네일 즐겨찾기 아이콘