diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 433e68bb..7215f8d4 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -17,6 +17,9 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import nlib.bbs.service.ArticleVO; +import nlib.bbs.service.BoardService; +import nlib.bbs.service.QnaService; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.MainService; @@ -65,6 +68,12 @@ public class MainController extends NlibCommonController { @Resource(name = "mainService") private MainService mainService; + @Resource(name = "ancmntService") + private BoardService ancmntService; + + @Resource(name = "qnaService") + private QnaService qnaService; + @RequestMapping( {"/index.do"} ) public String setContent( HttpServletRequest request, @@ -78,6 +87,10 @@ public class MainController extends NlibCommonController { String mngOrgCd = getCurCouncilCd(request); + //------------------------------------------------ + // 추천 자료 관련 + //------------------------------------------------ + // 추천키워드 List> listKeywords = mainService.listKeywords(mngOrgCd); model.addAttribute("listKeywords", listKeywords); @@ -107,10 +120,27 @@ public class MainController extends NlibCommonController { model.addAttribute("listPops", listPops); model.addAttribute("listTypeDivCodes", listTypeDivCodes); - // 온라인자료관 model.addAttribute("listOnline", mainService.listOnline(mngOrgCd)); - + + //------------------------------------------------ + // 게시판관련 + //------------------------------------------------ + ArticleVO searchArticleVO = new ArticleVO(); + searchArticleVO.setPageIndex(1); + searchArticleVO.setPageSize(3); + searchArticleVO.setMngOrgCd(getCurCouncilCd(request)); + + // 공지사항 + List listAncmnt = ancmntService.listArticles(searchArticleVO); + model.addAttribute("listAncmnt", listAncmnt); + + // Q&A + String mbInfoId = getMbInfoId(request); + searchArticleVO.setLoginedMbInfoId(mbInfoId); + List listQna = qnaService.listArticles(searchArticleVO); + model.addAttribute("listQna", listQna); + return "nlib/cmm/home"; } 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 764f59ad..63d35303 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -21,7 +21,6 @@ AND RM.REG_STATUS = 'REG_OK' AND RM.USE_FLAG = 'Y' AND RM.OPER_READ_RANGE_CD IN ('01','02') - AND IFNULL(RM.BOOKCASE_ID, '') != '' /* 서가배치자료 */ ) T GROUP BY T.KEY_NAME ORDER BY CNT DESC, T.KEY_NAME @@ -137,35 +136,31 @@ , M.DTLS_TYPE_DIV_CD , C2.S_CODE_NM DTLS_TYPE_DIV_NM , M.SUBJECT_CODE - , CONCAT( - NVL(( - SELECT CONCAT(CLSF_NM, ' > ') - FROM CT_CLSF - WHERE CLSF_ID = ( - SELECT UP_CLSF_ID FROM CT_CLSF - WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35)) ) - AND UP_CLSF_ID = '2') , '') - , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) - ) AS SUBJECT_NM + , ( SELECT CLSF_NM + FROM CT_CLSF + WHERE CLSF_ID = ( + SELECT UP_CLSF_ID FROM CT_CLSF + WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35)) ) + AND UP_CLSF_ID = '2') AS SUBJECT_NM_UP + , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) AS SUBJECT_NM , M.MOD_DD , M.ORG_NM , M.CREAT_YYYY , M.RPRS_THUMB_URL - , IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) AS INTERFACE_ID + , IFNULL(M.M_INTERFACE_ID, '') AS INTERFACE_ID FROM RG_MASTER M LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD' LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' WHERE M.MNG_ORG_CD = #{mngOrgCd} AND M.OPEN_DIV_CD = '1' /* 공개구분 : 공개 */ - AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ + /* AND M.REG_STATUS = 'REG_OK' -- DDDDDDDDDDDDDDDDD 확인데이터 없어서 임시 주석 막음 */ /* 등록상태 : 등록완료 */ AND M.USE_FLAG = 'Y' AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - /* AND IFNULL(M.RPRS_THUMB_URL, '') != '' */ /* 썸네일존재하는 건 */ - AND IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) != ''/* IF존재하는 건 */ + AND IFNULL(M.M_INTERFACE_ID, '') != ''/* IF존재하는 건 */ ORDER BY M.MOD_DD DESC LIMIT 10 ]]> - + \ No newline at end of file diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index a93818a3..96530c30 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -85,9 +85,9 @@ list.paging.page.size = 10 #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 # \ub85c\uceec LLLLLLLLLLLLLLL -fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload # \uac1c\ubc1c\uc11c\ubc84 -#fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload +fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 fileupload.temp.subpath = /temp @@ -98,13 +98,13 @@ fileupload.bbs.ancmnt.subpath = /bbs/ancmnt # \uba54\uc77c \uacbd\ub85c # \ub85c\uceec LLLLLLLLLLLLLLL -mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html -mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html -mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html +#mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html +#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html +#mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html # \uac1c\ubc1c\uc11c\ubc84 -#mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html -#mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html -#mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html +mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html +mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html +mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html #\uba54\uc77c \uc774\ubbf8\uc9c0 \uacbd\ub85c # \ub85c\uceec diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 724a9708..14f90ded 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -29,6 +29,43 @@ function fn_search(keyword) { return; } + +function fn_viewAncmnt(articleId) { + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "/bbs/selectAncmntArticle.do"); + $(form).attr("method", "post"); + + var element = document.createElement("input"); + $(element).attr("name", "articleId"); + + $(element).attr("value", articleId); + form.appendChild(element); + document.body.appendChild(form); + form.submit(); + document.body.removeChild(form); + + return; +} + +function fn_viewQna(articleId) { + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "/bbs/selectQnaArticle.do"); + $(form).attr("method", "post"); + + var element = document.createElement("input"); + $(element).attr("name", "articleId"); + + $(element).attr("value", articleId); + form.appendChild(element); + document.body.appendChild(form); + form.submit(); + document.body.removeChild(form); + + return; +} + function fn_listPops(typeDivCd) { $("div.tab_content div.tabs_item").hide(); $("#listPops_" + typeDivCd).show(); @@ -204,14 +241,14 @@ function fn_listPops(typeDivCd) {
${itemOnline.title }
    -
  • 주제유형-${itemOnline.subjectNm }
    • -
  • 주제분야문화유산
    • +
  • 자료유형-${itemOnline.typeDivNm }
    • +
  • 주제분야-${itemOnline.subjectNmUp }
  • 생산기관-${itemOnline.orgNm }
  • 생산년도-${itemOnline.creatYyyy }
원문보기
-
RIS
+
RIS
@@ -236,68 +273,45 @@ function fn_listPops(typeDivCd) {
공지사항더보기 더보기 아이콘
+
- -

05

21.09

+ +

${fn:substring(itemAncmnt.regDd,8,10) }

${fn:substring(itemAncmnt.regDd,2,4) }.${fn:substring(itemAncmnt.regDd,5,7) }

-

[공지] 경주문화원에 오신걸 환영합니다.파일 아이콘

-
- -
-
- -

05

21.09

-
-

소장자료관 이용 시 주의사항 안내파일 아이콘

-
- -
-
- -

05

21.09

-
-

[공지] 2021 문화원 휴관일 안내 드립니다.

+

[공지]${itemAncmnt.title} + 파일 아이콘
+
Q&A더보기 더보기 아이콘
+
- -

05

21.09

+ +

${fn:substring(itemQna.regDd,8,10) }

${fn:substring(itemQna.regDd,2,4) }.${fn:substring(itemQna.regDd,5,7) }

-

[공지] 경주문화원에 오신걸 환영합니다.잠금 아이콘

-
-
-

답변대기

-
- -
-
- -

05

21.09

-
-

소장자료관 이용 시 주의사항 안내잠금 아이콘

-
-
-

답변대기

-
- -
-
- -

05

21.09

-
-

[공지] 2021 문화원 휴관일 안내 드립니다.

+

${itemQna.title} + 파일 아이콘 + 잠금 아이콘 +

+

답변완료

+ + +
+

답변대기

+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp index 84edf35c..9f6a5046 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -246,7 +246,7 @@ function d_search(){ }); if(ageCount > 0) { - filter_myList+= "search_age,"; + filter_myList+= "search_ageCode,"; } $("input[name='collectionList']").each(function() { @@ -257,7 +257,7 @@ function d_search(){ }); if(colCount > 0) { - filter_myList+= "search_collection,"; + filter_myList+= "search_collectionList,"; } $("#d_filter_mylist").val(filter_myList); document.d_referencelistForm.submit(); @@ -346,20 +346,20 @@ function detailSearchSetting(){

  • -
    +
    -
    +
    -
    -
    +
    +

  • -
    +
    diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index 4e17e0b4..e752a65c 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -423,8 +423,6 @@ function fn_formatDateStr(yyyymmdd, defVal) { // 원문보기 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N"; function gfn_showDocPdf(interfaceId) { - - alert(DOC_VIEW_URL + interfaceId); var openNewWindow = window.open(DOC_VIEW_URL + interfaceId, "_blank"); } @@ -526,5 +524,22 @@ function gfn_gotoUrl(url) { } function gfn_getDetail(masterId) { - gfn_openNewWindow("/search/searchItemDetail.do?masterId=" + masterId); + + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "/search/searchItemDetail.do"); + $(form).attr("method", "post"); + $(form).attr("target", "_blank"); + + var element = document.createElement("input"); + $(element).attr("name", "masterId"); + $(element).attr("value", masterId); + + form.appendChild(element); + document.body.appendChild(form); + form.submit(); + + document.body.removeChild(form); + + return; }