diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 9edb1c16..f0dda77a 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -381,12 +381,27 @@ public class MyPageController { , ModelMap model ) throws Exception { - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); // 권한에 따른 로그인 정보 가져오기 +// try { + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. +// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + + notifyManageService.updateM7DaysUseYnN(); + + //1.pageing step1 PaginationInfo paginationInfo = this.setNotiPagingStep1(notifyManageVO); //2. pageing step2 notifyManageVO = this.setNotiPagingStep2(notifyManageVO, paginationInfo); // + + notifyManageVO.setToUserId(loginVO.getUniqId()); @@ -412,7 +427,10 @@ public class MyPageController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", notifyManageVOList); - +// } catch (Exception e) { +// e.printStackTrace(); +// // TODO: handle exception +// } // return "web/my/myQnaMngList"; return "web/my/myNotifyMngList"; } diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java index c0a945b4..1e95bc60 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java @@ -59,6 +59,8 @@ public interface NotifyManageService { int selectNotifyCnt(String uniqId); + void updateM7DaysUseYnN(); + } diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java index 0fa2b6d0..81a71248 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java @@ -1,150 +1,152 @@ -package kcc.let.uss.notify.service; - -import java.io.Serializable; - -import kcc.com.cmm.ComDefaultVO; - -/** - * - * 알림 관리자 관리 - * @author 이호영 - * @since 2023.12.14 - * @version 1.0 - * @see - * - *
- * << 개정이력(Modification Information) >> - * - * 수정일 수정자 수정내용 - * ------- -------- --------------------------- - * 2023.12.14 이호영 최초 생성 - * - * - *- */ -public class NotifyManageVO extends ComDefaultVO implements Serializable { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 1L; - - private String cmmNotifyOrd; - private String toUserId; - private String notifyCn; - private String notifyChk; - private String lctrDivCd; - private String notifyPath; - private String eduAplctOrd; - private String eduChasiOrd; - private String frstRegistPnttm; - private String frstRegisterId; - private String lastUpdtPnttm; - private String lastUpdusrId; - private String cmmNotifyMngOrd; - private String useYn; - private String mngUserId; - private String mngUserNm; - public String getCmmNotifyOrd() { - return cmmNotifyOrd; - } - public void setCmmNotifyOrd(String cmmNotifyOrd) { - this.cmmNotifyOrd = cmmNotifyOrd; - } - public String getToUserId() { - return toUserId; - } - public void setToUserId(String toUserId) { - this.toUserId = toUserId; - } - public String getNotifyCn() { - return notifyCn; - } - public void setNotifyCn(String notifyCn) { - this.notifyCn = notifyCn; - } - public String getNotifyChk() { - return notifyChk; - } - public void setNotifyChk(String notifyChk) { - this.notifyChk = notifyChk; - } - public String getLctrDivCd() { - return lctrDivCd; - } - public void setLctrDivCd(String lctrDivCd) { - this.lctrDivCd = lctrDivCd; - } - public String getNotifyPath() { - return notifyPath; - } - public void setNotifyPath(String notifyPath) { - this.notifyPath = notifyPath; - } - public String getEduAplctOrd() { - return eduAplctOrd; - } - public void setEduAplctOrd(String eduAplctOrd) { - this.eduAplctOrd = eduAplctOrd; - } - public String getEduChasiOrd() { - return eduChasiOrd; - } - public void setEduChasiOrd(String eduChasiOrd) { - this.eduChasiOrd = eduChasiOrd; - } - public String getFrstRegistPnttm() { - return frstRegistPnttm; - } - public void setFrstRegistPnttm(String frstRegistPnttm) { - this.frstRegistPnttm = frstRegistPnttm; - } - public String getFrstRegisterId() { - return frstRegisterId; - } - public void setFrstRegisterId(String frstRegisterId) { - this.frstRegisterId = frstRegisterId; - } - public String getLastUpdtPnttm() { - return lastUpdtPnttm; - } - public void setLastUpdtPnttm(String lastUpdtPnttm) { - this.lastUpdtPnttm = lastUpdtPnttm; - } - public String getLastUpdusrId() { - return lastUpdusrId; - } - public void setLastUpdusrId(String lastUpdusrId) { - this.lastUpdusrId = lastUpdusrId; - } - public String getCmmNotifyMngOrd() { - return cmmNotifyMngOrd; - } - public void setCmmNotifyMngOrd(String cmmNotifyMngOrd) { - this.cmmNotifyMngOrd = cmmNotifyMngOrd; - } - public String getUseYn() { - return useYn; - } - public void setUseYn(String useYn) { - this.useYn = useYn; - } - public String getMngUserId() { - return mngUserId; - } - public void setMngUserId(String mngUserId) { - this.mngUserId = mngUserId; - } - public String getMngUserNm() { - return mngUserNm; - } - public void setMngUserNm(String mngUserNm) { - this.mngUserNm = mngUserNm; - } - - - - - - -} +package kcc.let.uss.notify.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + +/** + * + * 알림 관리자 관리 + * @author 이호영 + * @since 2023.12.14 + * @version 1.0 + * @see + * + *
+ * << 개정이력(Modification Information) >> + * + * 수정일 수정자 수정내용 + * ------- -------- --------------------------- + * 2023.12.14 이호영 최초 생성 + * + * + *+ */ +public class NotifyManageVO extends ComDefaultVO implements Serializable { + + /** + * serialVersionUID + */ + private static final long serialVersionUID = 1L; + + private String cmmNotifyOrd; + private String toUserId; + private String notifyCn; + private String notifyChk; + private String lctrDivCd; + private String notifyPath; + private String eduAplctOrd; + private String eduChasiOrd; + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + private String cmmNotifyMngOrd; + private String useYn; + private String mngUserId; + private String mngUserNm; + + + public String getCmmNotifyOrd() { + return cmmNotifyOrd; + } + public void setCmmNotifyOrd(String cmmNotifyOrd) { + this.cmmNotifyOrd = cmmNotifyOrd; + } + public String getToUserId() { + return toUserId; + } + public void setToUserId(String toUserId) { + this.toUserId = toUserId; + } + public String getNotifyCn() { + return notifyCn; + } + public void setNotifyCn(String notifyCn) { + this.notifyCn = notifyCn; + } + public String getNotifyChk() { + return notifyChk; + } + public void setNotifyChk(String notifyChk) { + this.notifyChk = notifyChk; + } + public String getLctrDivCd() { + return lctrDivCd; + } + public void setLctrDivCd(String lctrDivCd) { + this.lctrDivCd = lctrDivCd; + } + public String getNotifyPath() { + return notifyPath; + } + public void setNotifyPath(String notifyPath) { + this.notifyPath = notifyPath; + } + public String getEduAplctOrd() { + return eduAplctOrd; + } + public void setEduAplctOrd(String eduAplctOrd) { + this.eduAplctOrd = eduAplctOrd; + } + public String getEduChasiOrd() { + return eduChasiOrd; + } + public void setEduChasiOrd(String eduChasiOrd) { + this.eduChasiOrd = eduChasiOrd; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getCmmNotifyMngOrd() { + return cmmNotifyMngOrd; + } + public void setCmmNotifyMngOrd(String cmmNotifyMngOrd) { + this.cmmNotifyMngOrd = cmmNotifyMngOrd; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } + public String getMngUserId() { + return mngUserId; + } + public void setMngUserId(String mngUserId) { + this.mngUserId = mngUserId; + } + public String getMngUserNm() { + return mngUserNm; + } + public void setMngUserNm(String mngUserNm) { + this.mngUserNm = mngUserNm; + } + + + + + + +} diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java index a6d89fd0..9938ac02 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java @@ -82,5 +82,9 @@ public class NotifyManageDAO extends EgovAbstractDAO { return (int) select("VEANotifyDAO.selectNotifyCnt", uniqId); } + public void updateM7DaysUseYnN() { + update("VEANotifyDAO.updateM7DaysUseYnN"); + } + } diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 81038897..42ff852e 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -386,4 +386,10 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements public int selectNotifyCnt(String uniqId) { return notifyManageDAO.selectNotifyCnt(uniqId); } + + @Override + public void updateM7DaysUseYnN() { + notifyManageDAO.updateM7DaysUseYnN(); + + } } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml index a29a3f0a..93155c2f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml @@ -27,6 +27,7 @@ , FRST_REGISTER_ID , LAST_UPDT_PNTTM , LAST_UPDUSR_ID + , USE_YN @@ -43,7 +44,8 @@ a.FRST_REGIST_PNTTM as frstRegistPnttm , a.FRST_REGISTER_ID as frstRegisterId , a.LAST_UPDT_PNTTM as lastUpdtPnttm , - a.LAST_UPDUSR_ID as lastUpdusrId + a.LAST_UPDUSR_ID as lastUpdusrId , + a.USE_YN as useYn @@ -56,6 +58,7 @@