From 47ea8c8a209213122257b7504ae66be8002cf785 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 19 Nov 2021 17:58:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/web/CartController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nlib/col/web/CartController.java b/src/main/java/nlib/col/web/CartController.java index 859fb843..9fda5d1a 100644 --- a/src/main/java/nlib/col/web/CartController.java +++ b/src/main/java/nlib/col/web/CartController.java @@ -90,7 +90,7 @@ public class CartController extends NlibCommonController list = cartService.listCartItemsFromCookie(request, response, cartTypeCd); // 카트 목록 자료에 대한 상세자료 설정 - collectionService.setDetailInfoForList(list, null, NlibProperty.getString("thumbnail.image.url.small")); + collectionService.setDetailInfoForList(list, null); // 문화원별 정렬 처리 list = sortCollectionListByMngOrgCd(list); @@ -103,7 +103,7 @@ public class CartController extends NlibCommonController list = cartService.listCartItems(mbInfoId, cartTypeCd); // 카트 목록 자료에 대한 상세자료 설정 - collectionService.setDetailInfoForList(list, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + collectionService.setDetailInfoForList(list, getMbInfoId(request)); // 카트 건수 cartTypeCd1Cnt = cartService.countCartItems(mbInfoId, "1"); From eee6c9caaf07044abc7fbdad64351e0c9fc0b2a7 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 08:11:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/nlib/cmm/MainDAO_SQL.xml | 46 +------------------ 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 1263f6e7..a3462236 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -86,21 +86,6 @@ AND IFNULL(M2.PE_STATUS, '') = '' /* 보존상태 */ ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC LIMIT 10 ) - UNION - (/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */ - SELECT - 2 AS RNK - , M2.MASTER_ID - , M2.TITLE - , M2.TYPE_DIV_CD - , TDC.S_CODE_NM AS TYPE_DIV_NM - , M2.RPRS_THUMB_URL - , M2.REG_DD - , M2.MOD_DD - FROM RG_MASTER M2 - JOIN SM_CODE_S TDC ON M2.TYPE_DIV_CD = TDC.S_CODE_ID AND TDC.L_CODE_ID = 'MASTER_TYPE_DIV_CD' - ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC - LIMIT 2 ) ) T ORDER BY RNK, T.MOD_DD DESC, T.REG_DD DESC LIMIT 10 @@ -156,7 +141,7 @@ From 421176d703b7d0c7bde6632db87e241f3c64ea75 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 22 Nov 2021 10:42:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?DB=20=EC=BB=AC=EB=9F=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=B2=98=EB=A6=AC=20:=20CONTENT=20(TEXT)=20->=20CO?= =?UTF-8?q?NTENT=5FLBL=20(LONGBLOB)=20=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nlib/col/service/impl/CollectionServiceImpl.java | 2 +- src/main/java/nlib/col/web/InterestController.java | 2 +- src/main/java/nlib/user/web/UserInfoController.java | 6 +++--- .../egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml | 4 ++-- .../egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml | 6 +++--- .../egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml | 12 ++++++------ .../egovframework/mapper/nlib/info/InformDAO_SQL.xml | 1 - .../webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp | 7 +++---- .../webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp | 2 +- .../webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp | 4 ++-- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index 093384b6..b77acc0d 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -196,7 +196,7 @@ public class CollectionServiceImpl implements CollectionService { vo.setReqPsblYn (StringUtil.getString(cVO.getReqPsblYn() , vo.getReqPsblYn())); vo.setInterestYn (StringUtil.getString(cVO.getInterestYn() , vo.getInterestYn())); vo.setMUseYn (StringUtil.getString(cVO.getMUseYn() , vo.getMUseYn())); - vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); + vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); vo.setMngOrgCd (StringUtil.getString(cVO.getMngOrgCd() , vo.getMngOrgCd())); vo.setMngOrgNm (StringUtil.getString(cVO.getMngOrgNm() , vo.getMngOrgNm())); diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index ad3d1ace..b31f1572 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -137,7 +137,7 @@ public class InterestController extends NlibCommonController totalCount = interestService.countListInterests(searchCollectionVO); String mbInfoId = getMbInfoId(request); - operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request)); //------------------------------- // JSON변환 응답 처리 //------------------------------- diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index e2410acc..8fcbb3f4 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -352,7 +352,7 @@ public class UserInfoController extends NlibCommonController { List interestList = interestService.listInterests(searchCollectionVO); int interestTotalCount = interestService.countListInterests(searchCollectionVO); - interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId()); model.addAttribute("interestList", interestList); model.addAttribute("interestTotalCount", interestTotalCount); @@ -361,14 +361,14 @@ public class UserInfoController extends NlibCommonController { // 조회 // 대출상태구분코드("": 전체, A:신청, B:대출준비완료, C:취소, W:대출중, R0:정상반납, R1:연체반납, P:연체) DataApiResVO resRentVO = rentService.listRentItems(searchCollectionVO); - List rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + List rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId()); model.addAttribute("rentList", rentList); model.addAttribute("rentTotalCount", resRentVO.getRecordTotCount()); // 방문열람내역 (최근 5개) searchCollectionVO.setReqStatusDivCd(null); DataApiResVO resReadVO = readService.listReadItems(searchCollectionVO); - List readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); + List readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId()); model.addAttribute("readList", readList); model.addAttribute("readTotalCount", resReadVO.getRecordTotCount()); diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml index c360e53c..7badcfa7 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -18,7 +18,7 @@ - AND IFNULL(S.CONTENT,'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%') AND IFNULL(S.DELETE_YN, 'N') = 'N' @@ -71,7 +71,7 @@ , A.MNG_ORG_CD , B.DEPT_NM AS MNG_ORG_NM , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN , A.OPEN_YN , A.POST_START_DATE diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml index 0bdd7175..7ad87a63 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml @@ -19,7 +19,7 @@ - AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') @@ -80,9 +80,9 @@ , A.QUESTION_TYPE , D.S_CODE_NM AS QUESTION_TYPE_NAME , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN - , A.ANSWER + , CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER , IFNULL(A.USE_YN, 'Y') AS USE_YN , A.VIEW_CNT , A.BD_ATTACH_FILE_ID diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml index 2a01a66b..1888a245 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml @@ -18,7 +18,7 @@ - AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') @@ -86,10 +86,10 @@ , B.DEPT_NM AS MNG_ORG_NM , A.QUESTION_TYPE , A.TITLE - , A.CONTENT + , CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT , IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN , IFNULL(A.EMAIL_RECV_YN, 'N') AS EMAIL_RECV_YN - , A.ANSWER + , CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER , IFNULL(A.USE_YN, 'Y') AS USE_YN , IFNULL(A.SECRET_YN, 'N') AS SECRET_YN , A.VIEW_CNT @@ -138,9 +138,9 @@ , BD_TYPE , QUESTION_TYPE , TITLE - , CONTENT + , CONTENT_LBL , ANSWER_YN - , ANSWER + , ANSWER_LBL , EMAIL_RECV_YN , SECRET_YN , USE_YN @@ -174,7 +174,7 @@ /* QNA : updateArticle : 삭제되지 않은 건 중 답변이 아직 없는 건에 한하여 수정 가능 */ UPDATE BD_NLIB_QNA SET TITLE = #{title} - , CONTENT = #{content} + , CONTENT_LBL = #{content} , EMAIL_RECV_YN = #{emailRecvYn} , SECRET_YN = #{secretYn} , BD_ATTACH_FILE_ID = #{bdAttachFileId} diff --git a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml index 1a087e4f..58e41935 100644 --- a/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml @@ -10,7 +10,6 @@ , MNG_ORG_CD , TITLE , CONTENT - , BD_ATTACH_FILE_ATTACH_FILE_ID FROM BD_NLIB_CONTENT_PAGE A WHERE A.CONTENT_TYPE = #{contentType} AND A.MNG_ORG_CD = #{mngOrgCd} diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index b9941f40..0d47a4d3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -303,7 +303,6 @@ $(document).ready(function() {
${cart.interestYn } 썸네일 - 즐겨찾기 아이콘 @@ -319,15 +318,15 @@ $(document).ready(function() {
- + 온라인열람 - + 대출 - + 방문열람 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 26eb06f5..08e794e7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -139,7 +139,7 @@ function fn_listCartItems() { - history.back(); + location.href = "/"; } 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 f1228ae2..3e0f51d3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp @@ -128,7 +128,7 @@ function fn_listCartItems() { - history.back(); + location.href = "/"; } @@ -258,7 +258,7 @@ $(document).ready(function() {
- + 온라인열람