From 4bd8d140a6464b7506e788a3bc589d6301f50992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 21 Feb 2022 18:41:19 +0900 Subject: [PATCH] =?UTF-8?q?tiles=20=EC=A0=81=EC=9A=A9=EC=A4=91=20bootstrap?= =?UTF-8?q?=205.1.3=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mca/cmmn/web/AdminController.java | 27 +- .../java/com/mca/sec/LoginSuccessHandler.java | 2 +- .../springmvc/dispatcher-servlet.xml | 43 +- .../webapp/WEB-INF/jsp/admin/dashBoard.jsp | 33 + .../webapp/WEB-INF/jsp/admin/fieldData.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/fieldView.jsp | 2 +- src/main/webapp/WEB-INF/jsp/admin/history.jsp | 2 +- src/main/webapp/WEB-INF/jsp/admin/request.jsp | 166 +- .../webapp/WEB-INF/jsp/admin/requestView.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/userInfo.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/userInfoView.jsp | 2 +- .../WEB-INF/jsp/error/EgovAccessDenied.jsp | 2 +- .../webapp/WEB-INF/jsp/error/EgovNotFound.jsp | 2 +- .../WEB-INF/jsp/error/EgovServerError.jsp | 2 +- .../webapp/WEB-INF/jsp/include/header.jsp | 2 +- src/main/webapp/WEB-INF/jsp/join.jsp | 2 +- src/main/webapp/WEB-INF/jsp/layout/header.jsp | 62 + .../webapp/WEB-INF/jsp/layout/leftMenu.jsp | 6 + .../WEB-INF/jsp/layout/template_empty.jsp | 7 + .../WEB-INF/jsp/layout/template_login.jsp | 26 + .../WEB-INF/jsp/layout/template_main.jsp | 32 + src/main/webapp/WEB-INF/jsp/login.jsp | 2 +- src/main/webapp/WEB-INF/jsp/map/request.jsp | 2 +- .../webapp/WEB-INF/jsp/map/requestView.jsp | 2 +- .../webapp/WEB-INF/jsp/map/requestWrite.jsp | 2 +- src/main/webapp/WEB-INF/jsp/map/userInfo.jsp | 2 +- src/main/webapp/WEB-INF/tiles/tiles.xml | 34 + ...tstrap.min.css => bootstrap-3.3.2.min.css} | 0 src/main/webapp/css/bootstrap-5.1.3.css | 11266 ++++++++++++++++ ...ootstrap.min.js => bootstrap-3.3.2.min.js} | 0 src/main/webapp/js/bootstrap-5.1.3.min.js | 7 + 31 files changed, 11617 insertions(+), 126 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/layout/header.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/layout/template_empty.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/layout/template_login.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/layout/template_main.jsp create mode 100644 src/main/webapp/WEB-INF/tiles/tiles.xml rename src/main/webapp/css/{bootstrap.min.css => bootstrap-3.3.2.min.css} (100%) create mode 100644 src/main/webapp/css/bootstrap-5.1.3.css rename src/main/webapp/js/{bootstrap.min.js => bootstrap-3.3.2.min.js} (100%) create mode 100644 src/main/webapp/js/bootstrap-5.1.3.min.js diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java index 7504536..a02b0bd 100644 --- a/src/main/java/com/mca/cmmn/web/AdminController.java +++ b/src/main/java/com/mca/cmmn/web/AdminController.java @@ -59,8 +59,31 @@ public class AdminController { @Resource(name="fieldDataService") private FieldDataService fieldDataService; - - + + /** + * 대시보드 페이지 이동 + * + * @param useRequestSearchVO + * @param model 모델 객체 + * @return + * @throws + */ + @RequestMapping("/dashBoard") + public String dashBoard(@ModelAttribute("UseRequestSearchVO") UseRequestSearchVO useRequestSearchVO, Model model) throws Exception { + try { + // 지도사용 요청 승인대기 수 + int statusCnt = useRequestService.selectUseRequeststatusCnt(); + model.addAttribute("statusCnt", statusCnt); + + return "admin/dashBoard"; + + } catch (Exception e) { + // TODO: handle exception + e.printStackTrace(); + return "error/EgovServerError"; + } + } + /** * 지도 사용요청 목록을 반환한다. * diff --git a/src/main/java/com/mca/sec/LoginSuccessHandler.java b/src/main/java/com/mca/sec/LoginSuccessHandler.java index 7a5ce35..a1c589b 100644 --- a/src/main/java/com/mca/sec/LoginSuccessHandler.java +++ b/src/main/java/com/mca/sec/LoginSuccessHandler.java @@ -35,7 +35,7 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler{ response.sendRedirect("/map/request"); return; }else if(loginSuccessHandler.roleName.equals("ROLE_ADMIN")) { - response.sendRedirect("/admin/request"); + response.sendRedirect("/admin/dashBoard"); return; }else if(loginSuccessHandler.roleName.equals("ROLE_DISABLE")) { response.sendRedirect("/login?fail"); diff --git a/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml index b73b15b..d979d47 100644 --- a/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml +++ b/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml @@ -32,12 +32,6 @@ - - - @@ -55,9 +49,7 @@ - + @@ -86,11 +78,32 @@ - - - - - - + + + + + + + + + + + /WEB-INF/tiles/tiles.xml + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp new file mode 100644 index 0000000..6a51c46 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -0,0 +1,33 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + + + + + + + + + 모바일센터 관리시스템 + + + " rel="stylesheet"> + " rel="stylesheet"> + " rel="stylesheet"> + + + + <%@ include file="../include/header.jsp"%> +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index 37b88c4..8c2436d 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp @@ -12,7 +12,7 @@ 모바일센터 관리시스템 - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp index b860849..dbd9aba 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp @@ -13,7 +13,7 @@ 모바일센터 관리시스템 - + diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp index c93585f..731a1ca 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp @@ -14,7 +14,7 @@ 모바일센터 관리시스템 - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index a50a226..0bbb5e5 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp @@ -4,20 +4,6 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> - - - - - - - -모바일센터 관리시스템 - - -" rel="stylesheet"> -" rel="stylesheet"> -" rel="stylesheet"> - - - <%@ include file="../include/header.jsp"%> -
-
- - " /> -
-
- -
+
+
+ + " /> +
+
+ +
-
- - - -
-
+
+ + + +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
지도사용 요청
번호작업명소속담당자날짜상태
- - - - - -
요청한 목록이 없습니다.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
지도사용 요청
번호작업명소속담당자날짜상태
+ + + + + +
요청한 목록이 없습니다.
-
- -
-
+
+ +
+
-
- -
-
- - +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp index 5533da0..2381651 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp @@ -13,7 +13,7 @@ 모바일센터 관리시스템 - + " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp index f914858..39af00e 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp @@ -14,7 +14,7 @@ 모바일센터 관리시스템 - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp index 13b9985..5d74db9 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp @@ -13,7 +13,7 @@ 모바일센터 관리시스템 - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/error/EgovAccessDenied.jsp b/src/main/webapp/WEB-INF/jsp/error/EgovAccessDenied.jsp index 5ec03ef..a8a61a1 100644 --- a/src/main/webapp/WEB-INF/jsp/error/EgovAccessDenied.jsp +++ b/src/main/webapp/WEB-INF/jsp/error/EgovAccessDenied.jsp @@ -12,7 +12,7 @@ Error - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/error/EgovNotFound.jsp b/src/main/webapp/WEB-INF/jsp/error/EgovNotFound.jsp index 4a064ac..9cf9085 100644 --- a/src/main/webapp/WEB-INF/jsp/error/EgovNotFound.jsp +++ b/src/main/webapp/WEB-INF/jsp/error/EgovNotFound.jsp @@ -12,7 +12,7 @@ Error - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/error/EgovServerError.jsp b/src/main/webapp/WEB-INF/jsp/error/EgovServerError.jsp index b26ecb1..9894adf 100644 --- a/src/main/webapp/WEB-INF/jsp/error/EgovServerError.jsp +++ b/src/main/webapp/WEB-INF/jsp/error/EgovServerError.jsp @@ -12,7 +12,7 @@ Error - + " rel="stylesheet"> " rel="stylesheet"> " rel="stylesheet"> diff --git a/src/main/webapp/WEB-INF/jsp/include/header.jsp b/src/main/webapp/WEB-INF/jsp/include/header.jsp index 7206e42..039a75e 100644 --- a/src/main/webapp/WEB-INF/jsp/include/header.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/header.jsp @@ -19,7 +19,7 @@ - +