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/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java index 9a67fa52..879700af 100644 --- a/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java @@ -44,13 +44,11 @@ public class MenuMgtController { return menuMgtService.saveMenuMgt(menuMgt); } - /* - 기본메뉴 설정 페이지 추후 개발할지도... @PostMapping("/deleteMenuMgt") @ResponseBody public String deleteMenuMgt(@RequestBody List menuMgt){ menuMgtService.deleteMenuMgt(menuMgt); return ""; - }*/ + } } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 07788d43..d7c803e9 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -67,6 +67,14 @@ content: url("/img/bootstrap-icons-1.9.1/caret-down.svg"); } +.btn-toggle3::before { + content: url("/img/bootstrap-icons-1.9.1/chevron-right.svg"); + filter: invert(100%); +} +.btn-toggle3[aria-expanded="true"]::before { + content: url("/img/bootstrap-icons-1.9.1/chevron-down.svg"); +} + .f-invert{ filter: invert(100%); } 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/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index 09e4baf1..4a4953ec 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -89,6 +89,7 @@ + @@ -123,7 +124,8 @@ - + + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html index 658cf686..f10a9216 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html @@ -47,7 +47,7 @@
- + diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index f3d4e7a1..4fdc6abe 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -338,7 +338,7 @@
순번 사건번호 나포일시 선명
- + @@ -562,9 +562,10 @@ - + +
순번 나포일시 위반내용 위반장소
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 375e0116..cf17a888 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -165,7 +165,7 @@ - + @@ -184,9 +184,9 @@ - + - +
순번 나포일시 나포해점 사건담당경찰서
diff --git a/src/main/resources/templates/faStatistics/processResult/processResult.html b/src/main/resources/templates/faStatistics/processResult/processResult.html index b1912620..38fcd8dd 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResult.html +++ b/src/main/resources/templates/faStatistics/processResult/processResult.html @@ -114,7 +114,7 @@ - + @@ -132,8 +132,9 @@ - + + diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index 8ee0625a..66ba94c5 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -7,15 +7,15 @@
-
    -
  • +
      +
    • - -
      +
      • @@ -23,13 +23,13 @@
        • - -
          @@ -39,12 +39,12 @@
          • -
          - +
      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 @@
-
+
diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html index 7d59e57a..aebdfd24 100644 --- a/src/main/resources/templates/police/career/careerMgt.html +++ b/src/main/resources/templates/police/career/careerMgt.html @@ -81,11 +81,11 @@
+ + - - @@ -100,11 +100,11 @@ + + - - + + - - + - @@ -99,11 +99,11 @@ + + - - diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatus.html b/src/main/resources/templates/police/personnelStatus/personnelStatus.html index c6ea8cdc..9781f2a5 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatus.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatus.html @@ -156,7 +156,7 @@ @@ -174,7 +174,7 @@ diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html index d74039c1..07ced379 100644 --- a/src/main/resources/templates/police/police/policeEditModal.html +++ b/src/main/resources/templates/police/police/policeEditModal.html @@ -153,7 +153,7 @@
- +
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html index b86b45f1..693d9708 100644 --- a/src/main/resources/templates/police/police/policeList.html +++ b/src/main/resources/templates/police/police/policeList.html @@ -95,11 +95,11 @@ + + - - @@ -123,19 +123,20 @@ + + - - - + + diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 4e2a84e4..b4d0826c 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -109,8 +109,8 @@
제목
순번관서부서 직책 계급 성명부서 생년월일 성별 외사경력
diff --git a/src/main/resources/templates/police/career/careerModal.html b/src/main/resources/templates/police/career/careerModal.html index 5e1728ab..346f6b4d 100644 --- a/src/main/resources/templates/police/career/careerModal.html +++ b/src/main/resources/templates/police/career/careerModal.html @@ -111,6 +111,6 @@ \ No newline at end of file diff --git a/src/main/resources/templates/police/education/eduEditModal.html b/src/main/resources/templates/police/education/eduEditModal.html index b21abcb6..c7744385 100644 --- a/src/main/resources/templates/police/education/eduEditModal.html +++ b/src/main/resources/templates/police/education/eduEditModal.html @@ -51,7 +51,7 @@
순번관서부서 직책 계급 성명현부서
생년월일 성별최종수정일
순번관서부서 직책 계급 성명현부서
생년월일 성별 최초
임용
O X
- - + + @@ -313,8 +313,8 @@ diff --git a/src/main/resources/templates/translator/translatorCareerInsert.html b/src/main/resources/templates/translator/translatorCareerInsert.html index 771beeb3..d3ce80f5 100644 --- a/src/main/resources/templates/translator/translatorCareerInsert.html +++ b/src/main/resources/templates/translator/translatorCareerInsert.html @@ -21,7 +21,7 @@
연번관서명순번관서 언어 경력 성명