From 96ca01d7979bcc21954ecee612fd37aed9591b33 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 8 Nov 2021 10:47:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=20:=20=ED=8D=BC=EB=B8=94=20?= =?UTF-8?q?=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=A0=81=EC=9A=A9=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/cmm/service/NotificationVO.java | 15 + .../nlib/cmm/web/NotificationController.java | 11 +- .../mapper/nlib/cmm/NotificationDAO_SQL.xml | 34 +- src/main/webapp/Notifications.html | 2 +- .../WEB-INF/jsp/nlib/cmm/headerSubPart.jsp | 3 - src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 9 +- .../jsp/nlib/cmm/listNotifications.jsp | 324 ++++++++++-------- src/main/webapp/js/nlib.js | 29 +- 8 files changed, 244 insertions(+), 183 deletions(-) diff --git a/src/main/java/nlib/cmm/service/NotificationVO.java b/src/main/java/nlib/cmm/service/NotificationVO.java index 57dd86b4..3c14d835 100644 --- a/src/main/java/nlib/cmm/service/NotificationVO.java +++ b/src/main/java/nlib/cmm/service/NotificationVO.java @@ -17,6 +17,9 @@ public class NotificationVO extends PagingVO { private int totCnt = 0; /* 알림건수(최근1개월) */ private int rno = 0; /* 행번호 */ + private String mngOrgCd; /* 관리문화원코드 */ + private String mngOrgNm; /* 관리문화원명 */ + public String getNotiId() { return notiId; } @@ -95,5 +98,17 @@ public class NotificationVO extends PagingVO { public void setRno(int rno) { this.rno = rno; } + public String getMngOrgCd() { + return mngOrgCd; + } + public void setMngOrgCd(String mngOrgCd) { + this.mngOrgCd = mngOrgCd; + } + public String getMngOrgNm() { + return mngOrgNm; + } + public void setMngOrgNm(String mngOrgNm) { + this.mngOrgNm = mngOrgNm; + } } diff --git a/src/main/java/nlib/cmm/web/NotificationController.java b/src/main/java/nlib/cmm/web/NotificationController.java index b37fc717..6b638b74 100644 --- a/src/main/java/nlib/cmm/web/NotificationController.java +++ b/src/main/java/nlib/cmm/web/NotificationController.java @@ -23,6 +23,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import nlib.cmm.NlibCommonController; import nlib.cmm.service.NotificationService; import nlib.cmm.service.NotificationVO; +import nlib.cmm.service.PagingVO; import nlib.cmm.service.NlibProperty; import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiResVO; @@ -110,7 +111,7 @@ public class NotificationController extends NlibCommonController { Authentication authentication, @RequestBody Map paramMap) throws Exception { String mbInfoId = getMbInfoId(req); - String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); + int pageIndex = StringUtil.toNumber(paramMap.get("pageIndex"), 1); int pageSize = StringUtil.toNumber(paramMap.get("pageSize"), DEFUALT_PAGE_SIZE); log.debug("listNotificationsAjax > pageIndex = " + pageIndex); @@ -136,6 +137,14 @@ public class NotificationController extends NlibCommonController { retMap.put("data", list); retMap.put("itemsCount", totRecordCount); + PagingVO pageVO = new PagingVO(); + pageVO.setPagingVO(totRecordCount, pageIndex, pageSize); + retMap.put("pagingPageIndex" , pageVO.getPageIndex()); + retMap.put("pagingTotRecordCount", pageVO.getTotRecordCount()); + retMap.put("pagingStartPage" , pageVO.getStartPage()); + retMap.put("pagingEndPage" , pageVO.getEndPage()); + retMap.put("pagingLastPage" , pageVO.getLastPage()); + return makeResponseEntityJson(retMap); } diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml index 830b377f..524c5c92 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml @@ -3,30 +3,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - -
- -
- - - - - - - - + +
+

알림 섹션영역

+
+
+
+
    +
  • HOME
    • +
  • ${pageTitle}
    • +
+
    +
  • ${pageTitle}
    • +
+
+
화살표 아이콘
+
+
+
+
+ 총 0건 +
+

- 최근 한달동안 발송된 알림 내역만 보관됩니다.

+
+
+ +
+
+
    + +
+
+
    +
    + +
    +
    +
    +
    + +
    + + + +
    diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index ffb368a3..b1be0bae 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -94,13 +94,40 @@ function fn_closeLayerPopup() { } function fn_myAlert(newAlertNum) { + if(newAlertNum == "undefined" || newAlertNum == null || newAlertNum < 1) { return; } - fn_openLayerPopup("알림", "아직 확인하지 않은 새로운 알림이 " + newAlertNum + "건 있습니다", "알림 목록으로", CONTEXT_PATH + "/cmm/listNotifications.do"); + var notiHtml = + '
    ' + + '

    지방문화원 소장자료

    ' + + '

    알림

    ' + + '
    ' + + '
    ' + + '
    ' + + '

    아직 확인하지 않은
    새로운 알림이 ' + newAlertNum + '건 있습니다.

    ' + + '
    ' + + '
    ' + + ' ' + + ' ' + + '
    ' + + ' ' + + '
    ' + + '
    '; + fn_layerPopWithHtml(notiHtml, "pop-notice"); } +function fn_layerPopWithHtml(cHtml, addClasses) { + $("#NLIB_LAYER_POPUP").removeClass(); + $("#NLIB_LAYER_POPUP").addClass(addClasses); + $("#NLIB_LAYER_POPUP").html(cHtml); + $("#NLIB_LAYER_POPUP").show(); + + var classes = addClasses.split(" "); + + $("." + classes[0]).fadeIn(); +} function fn_layerPopWithClass(url, addClasses) { // 클릭 시, 로딩되도록 처리 (2021.10.20)