From 5667560c1c081ff48b94c70e18776f1c06d5d454 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 3 Feb 2025 18:06:20 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?GNB=EC=97=90=EC=84=9C=20=EC=A7=80=EB=8F=84=20=EC=97=B4=EA=B8=B0?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 2 + .../drilling/home/DrillingHomeController.java | 26 + .../geoinfo/main/login/LoginController.java | 8 +- .../common/includeTopMenu-old-필요시_삭제.jsp | 64 -- .../views/drilling/common/includeTopMenu.jsp | 10 +- .../views/drilling/home/drilling_index.jsp | 2 +- .../views/drilling/input/drilling_input.jsp | 94 ++- .../drilling/inquiry/drilling_inquiry.jsp | 12 +- .../inquiry/drilling_inquiry_project.jsp | 107 +--- src/main/webapp/com/css/common.v2.0.css | 4 +- src/main/webapp/com/css/common.v2.0.css.map | 2 +- src/main/webapp/com/css/sass/common.v2.0.scss | 20 +- .../webapp/com/js/drilling/drilling-common.js | 567 ++++-------------- 13 files changed, 198 insertions(+), 720 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu-old-필요시_삭제.jsp diff --git a/list.txt b/list.txt index eb6f2aa8..606658a2 100644 --- a/list.txt +++ b/list.txt @@ -1,6 +1,7 @@ #src\main\resources\egovframework\egovProps\globals.properties src\main\webapp\com\css\common.v2.0.css src\main\webapp\com\css\common.v2.0.css.map +src\main\java\geoinfo\main\login\LoginController.java src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp src\main\webapp\js\home\index.js src\main\webapp\WEB-INF\views\drilling\home\drilling_index.jsp @@ -8,6 +9,7 @@ src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry_project.jsp src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry.jsp +src\main\webapp\com\js\drilling\drilling-common.js #src\main\webapp\com\img\drilling\banner_0308_02_1.jpg #src\main\webapp\com\img\drilling\banner_0410_01_3.jpg #src\main\webapp\com\img\drilling\banner_0818_01_1.jpg diff --git a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java index ab4519e8..4d42cae9 100644 --- a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java +++ b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java @@ -62,6 +62,9 @@ public class DrillingHomeController { @Autowired DrillingHomeService drillingHomeService; + + @Autowired + DrillingInquiryService drillingInquiryService; @RequestMapping(value = "/drilling/index.do") public String drillingInquiry(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -69,6 +72,29 @@ public class DrillingHomeController { if(request.getSession().getAttribute("USERNAME") == null){ return "isError"; } + + + String userId = MyUtil.getStringFromObject( request.getSession().getAttribute("USERID") ); + String cls = MyUtil.getStringFromObject( request.getSession().getAttribute("CLS") ); + + model.addAttribute("userId", userId); + model.addAttribute("cls", cls); + + try { + HashMap spGetProjectMbrParams = drillingInquiryService.spGetProjectMbr( request, params, userId ); + model.addAttribute("mbr", spGetProjectMbrParams); + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "params:[\n" + params.toString() + "\n]\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + } return "/drilling/home/drilling_index"; } diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index e852a79b..cda9d1ef 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -301,17 +301,17 @@ public class LoginController { phoneNo = certResult.get("phoneNo"); } catch(IndexOutOfBoundsException ex){ - rda.addFlashAttribute("msg", "잘못된 접근입니다."); + rda.addFlashAttribute("msg", "잘못된 접근입니다. code: 1"); mv.setViewName("redirect:topMenuSelect.do?url=pwsearch"); return mv; } catch(NumberFormatException ex){ - rda.addFlashAttribute("msg", "잘못된 접근입니다."); + rda.addFlashAttribute("msg", "잘못된 접근입니다. code: 2"); mv.setViewName("redirect:topMenuSelect.do?url=pwsearch"); return mv; } catch(Exception ex){ - rda.addFlashAttribute("msg", "잘못된 접근입니다."); + rda.addFlashAttribute("msg", "잘못된 접근입니다. code: 3"); mv.setViewName("redirect:topMenuSelect.do?url=pwsearch"); return mv; } @@ -596,7 +596,7 @@ public class LoginController { "userId:[" + "null" + "]\n" + "\n--------------------------------------------------------------\n" ); - mv.setViewName("/"); + mv.setViewName("redirect:/index.do?cntyn=0"); } else { users.remove(userId, request.getSession()); RequestContextHolder.getRequestAttributes().removeAttribute(userId, RequestAttributes.SCOPE_SESSION); diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu-old-필요시_삭제.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu-old-필요시_삭제.jsp deleted file mode 100644 index 28795be1..00000000 --- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu-old-필요시_삭제.jsp +++ /dev/null @@ -1,64 +0,0 @@ -<%@ 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="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - -
- - - -
- diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp index 6203aa2d..05d578c0 100644 --- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp @@ -5,11 +5,17 @@ - + + + + + + +
@@ -45,7 +51,7 @@