diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 3e53091d..b364eddb 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -9,9 +9,11 @@ import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.publicBoard.model.PublicBoard; import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; +import com.dbnt.faisp.main.userInfo.model.UserAlarm; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.userInfo.service.UserAlarmService; import com.dbnt.faisp.main.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -34,6 +36,7 @@ public class BaseController { private final PublicBoardService publicBoardService; private final FaRptService faRptService; private final AffairService affairService; + private final UserAlarmService userAlarmService; @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { @@ -74,6 +77,13 @@ public class BaseController { noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); + UserAlarm alarm = new UserAlarm(); + alarm.setUserSeq(loginUser.getUserSeq()); + alarm.setViewYn("N"); + alarm.setRowCnt(7); + mav.addObject("alarmList", userAlarmService.selectAlarmList(alarm)); + mav.addObject("alarmListCnt", userAlarmService.selectAlarmListCnt(alarm)); + FaRptBoard faRpt = new FaRptBoard(); faRpt.setActiveTab("receive"); faRpt.setRowCnt(7); diff --git a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html index b841bf83..abc95942 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html @@ -78,7 +78,7 @@ - menuKey + 대분류 중분류 소분류 @@ -100,7 +100,7 @@ - + diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index dc43ac73..202fec47 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -20,7 +20,7 @@
-
+
@@ -42,9 +42,10 @@ - - - + + + + @@ -54,8 +55,41 @@
- -
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
메시지발생일시
+ + + +
+
+
+
+
+
+
@@ -65,7 +99,7 @@
- +
@@ -85,7 +119,7 @@ -
+
@@ -119,7 +153,7 @@
-
+
제목