From a167cee4ba4c79c26409b8ee0dc8ffa6431d050c Mon Sep 17 00:00:00 2001 From: thkim Date: Sun, 13 Oct 2024 00:27:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=A7=91=ED=95=A9=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=A2=8C=EC=B8=A1=20=EB=A9=94=EB=89=B4=20=EB=B3=B4=EC=97=AC?= =?UTF-8?q?=EC=A7=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 11 +++--- src/main/java/geoinfo/com/WebConfirm.java | 25 ++++++++++--- .../geoinfo/main/login/LoginController.java | 36 +++++++++++++++++++ .../geoinfo/main/main/MainController.java | 20 +++++------ .../egovProps/globals.properties | 9 ++--- .../clipreport4/DataConnection.properties | 8 ++--- .../WEB-INF/views/home/include/left_menu.jsp | 22 +++++++++--- .../webapp/WEB-INF/views/home/include/top.jsp | 16 ++++++++- src/main/webapp/WEB-INF/views/home/index.jsp | 2 +- src/main/webapp/WEB-INF/views/home/main.jsp | 22 +++++++++++- ...omeEducationApplicationIncludeTopMenu.jsp} | 2 +- .../input/homeEducationApplicationInput.jsp} | 4 +-- .../homeEducationApplicationInquiry.jsp} | 4 +-- ...omeEducationApplicationInquiryHistory.jsp} | 0 ...isitEducationApplicationIncludeTopMenu.jsp | 2 +- 15 files changed, 141 insertions(+), 42 deletions(-) rename src/main/webapp/WEB-INF/views/{scheduledGroupEducationApplication/common/scheduledGroupEducationApplicationIncludeTopMenu.jsp => homeEducationApplication/common/homeEducationApplicationIncludeTopMenu.jsp} (98%) rename src/main/webapp/WEB-INF/views/{scheduledGroupEducationApplication/input/scheduledGroupEducationApplicationInput.jsp => homeEducationApplication/input/homeEducationApplicationInput.jsp} (94%) rename src/main/webapp/WEB-INF/views/{scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiry.jsp => homeEducationApplication/inquiry/homeEducationApplicationInquiry.jsp} (94%) rename src/main/webapp/WEB-INF/views/{scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiryHistory.jsp => homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory.jsp} (100%) diff --git a/list.txt b/list.txt index c60f3b71..7641a02f 100644 --- a/list.txt +++ b/list.txt @@ -2,20 +2,19 @@ src\main\webapp\WEB-INF\views\home\include\top.jsp src\main\java\geoinfo\main\main\MainController.java src\main\java\geoinfo\main\login\LoginController.java src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp -src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\inquiry\scheduledGroupEducationApplicationInquiry.jsp +src\main\webapp\WEB-INF\views\visitEducationApplication\input\visitEducationApplicationInput.jsp +src\main\webapp\com\img\visitEducationApplication\visitEducationApplicationSample.svg +src\main\webapp\WEB-INF\views\homeEducationApplication\inquiry\homeEducationApplicationInquiry.jsp +src\main\webapp\WEB-INF\views\homeEducationApplication\input\homeEducationApplicationInput.jsp src\main\webapp\WEB-INF\views\home\main.jsp src\main\webapp\WEB-INF\views\home\include\left_menu.jsp -src\main\webapp\com\img\visitEducationApplication\visitEducationApplicationSample.svg src\main\webapp\com\css\common.v2.0.css src\main\webapp\WEB-INF\views\home\index.jsp src\main\webapp\com\img\common\bg\main_info_visual_20240905.png src\main\webapp\com\img\common\bg\main_info_visual_20240906.png -src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\inquiry\scheduledGroupEducationApplicationInquiry.jsp -src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\input\scheduledGroupEducationApplicationInput.jsp src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff2 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.otf src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff2 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf -src\main\resources\egovframework\egovProps\globals.properties \ No newline at end of file +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf \ No newline at end of file diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java index 3ab22374..145c0e40 100644 --- a/src/main/java/geoinfo/com/WebConfirm.java +++ b/src/main/java/geoinfo/com/WebConfirm.java @@ -1,6 +1,7 @@ package geoinfo.com; import comm.framework.dbcp.*; +import egovframework.com.cmm.service.EgovProperties; import java.sql.*; import java.util.*; @@ -27,19 +28,35 @@ public class WebConfirm WebUtil wUtil = new WebUtil(); String user = "geoinfo"; - //String pw = "geoinfo"; - String pw = "dbnt060928!rlaxogh"; + String pw = "geoinfo"; + //String pw = "dbnt060928!rlaxogh"; //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ //String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버 - //String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 - String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버 + String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 + //String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버 + + public String thkimTestOracleUrl = EgovProperties.getProperty("Oracle.Url"); + public String thkimTestOracleId = EgovProperties.getProperty("Oracle.ID"); + public String thkimTestOraclePassword = EgovProperties.getProperty("Oracle.Password"); + /* * public WebConfirm() { this.connection = null; this.connectionPool = null; * this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0; * this.resultBool = false; } */ public boolean ConfirmProject(HttpServletRequest request, final String PROJECT_CODE) { + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " ConfirmProject" + + "\n--------------------------------------------------------------\n" + + "thkimTestOracleUrl:[" + thkimTestOracleUrl + "]\n" + + "thkimTestOracleId:[" + thkimTestOracleId + "]\n" + + "thkimTestOraclePassword:[" + thkimTestOraclePassword + "]\n" + + "\n--------------------------------------------------------------\n" + ); + try { Class.forName("oracle.jdbc.driver.OracleDriver"); connection = DriverManager.getConnection(url,user,pw); diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index 642858ce..316a6b54 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -2694,5 +2694,41 @@ public class LoginController { } return mv; } + + @RequestMapping(value = "/visitEducationApplicationInput.do", method = RequestMethod.GET) + public ModelAndView visitEducationApplicationInput(@RequestParam HashMap params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception { + ModelAndView mv = new ModelAndView("visitEducationApplication/input/visitEducationApplicationInput"); + + // 로그인 세션이 없을 때 + if (request.getSession().getAttribute("USERID") == null) { + mv.setViewName("index.do?cntyn=0"); + return mv; + } + return mv; + } + + @RequestMapping(value = "/homeEducationApplicationInquiry.do", method = RequestMethod.GET) + public ModelAndView homeEducationApplicationInquiry(@RequestParam HashMap params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception { + ModelAndView mv = new ModelAndView("homeEducationApplication/inquiry/homeEducationApplicationInquiry"); + + // 로그인 세션이 없을 때 + if (request.getSession().getAttribute("USERID") == null) { + mv.setViewName("index.do?cntyn=0"); + return mv; + } + return mv; + } + + @RequestMapping(value = "/homeEducationApplicationInput.do", method = RequestMethod.GET) + public ModelAndView homeEducationApplicationInput(@RequestParam HashMap params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception { + ModelAndView mv = new ModelAndView("homeEducationApplication/input/homeEducationApplicationInput"); + + // 로그인 세션이 없을 때 + if (request.getSession().getAttribute("USERID") == null) { + mv.setViewName("index.do?cntyn=0"); + return mv; + } + return mv; + } } \ No newline at end of file diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index d0365b59..2c471cf5 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -486,18 +486,18 @@ public class MainController userId = request.getSession().getAttribute("USERID").toString(); eGovUrl = "jusandoNew.do"; mv.setViewName("home/main.jsp?url=/body/mypage/jusandoNew"); - } else if (url.equals("scheduledGroupEducationApplication")) { + } else if (url.equals("homeEducationApplication")) { userId = request.getSession().getAttribute("USERID").toString(); - eGovUrl = "scheduledGroupEducationApplicationInquiry.do"; - mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiry"); - } else if (url.equals("scheduledGroupEducationApplicationInput")) { + eGovUrl = "homeEducationApplicationInquiry.do"; + mv.setViewName("home/main.jsp?url=/homeEducationApplication/inquiry/homeEducationApplicationInquiry"); + } else if (url.equals("homeEducationApplicationInput")) { userId = request.getSession().getAttribute("USERID").toString(); - eGovUrl = "scheduledGroupEducationApplicationInput.do"; - mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/input/scheduledGroupEducationApplicationInput"); - } else if (url.equals("scheduledGroupEducationApplicationInquiryHistory")) { + eGovUrl = "homeEducationApplicationInput.do"; + mv.setViewName("home/main.jsp?url=/homeEducationApplication/input/homeEducationApplicationInput"); + } else if (url.equals("homeEducationApplicationInquiryHistory")) { userId = request.getSession().getAttribute("USERID").toString(); - eGovUrl = "scheduledGroupEducationApplicationInquiryHistory.do"; - mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiryHistory"); + eGovUrl = "homeEducationApplicationInquiryHistory.do"; + mv.setViewName("home/main.jsp?url=/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory"); } else if (url.equals("visitEducationApplication")) { userId = request.getSession().getAttribute("USERID").toString(); eGovUrl = "visitEducationApplicationInquiry.do"; @@ -508,7 +508,7 @@ public class MainController mv.setViewName("home/main.jsp?url=/visitEducationApplication/input/visitEducationApplicationInput"); } else if (url.equals("visitEducationApplicationInquiryProject")) { userId = request.getSession().getAttribute("USERID").toString(); - eGovUrl = "scheduledGroupEducationApplicationInquiryHistory.do"; + eGovUrl = "visitEducationApplicationInquiryHistory.do"; mv.setViewName("home/main.jsp?url=/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject"); } diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 25cbf1f4..6ecd6c1d 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -9,11 +9,11 @@ Oracle.Driver=oracle.jdbc.driver.OracleDriver # Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl is prod #Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl # dbnt devlop server -#Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV +Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV # develop local server #Oracle.Url=jdbc:oracle:thin:@192.168.86.2:1521:xe # thkim local test -Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV +#Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV ################################################################ #Oracle.Url=jdbc:oracle:thin:@192.168.0.29:1521:xe @@ -22,8 +22,9 @@ Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV #Oracle.Url=jdbc:oracle:thin:@localhost:1521:orcl #Oracle.Url=jdbc:oracle:thin:@218.232.234.162:1521:ORAGEO Oracle.ID=geoinfo -#Oracle.Password=geoinfo -Oracle.Password=dbnt060928!rlaxogh +Oracle.Password=geoinfo +# thkim local test +#Oracle.Password=dbnt060928!rlaxogh #Oracle.Password=!!kictgis1234 diff --git a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties index ab8f9e64..84d61518 100644 --- a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties +++ b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties @@ -18,16 +18,16 @@ dataconnection1.version= # dataconnection1.url=jdbc:oracle:thin:@192.168.0.8:3452:orcl #dataconnection1.url=jdbc:oracle:thin:@192.168.0.8:3452:orcl # \uc544\ub798\ub294 \ub514\ube44\uc5d4\ud14d \uac1c\ubc1c\uc11c\ubc84 -#dataconnection1.url=jdbc:oracle:thin:@118.219.150.34:1521:orageodev +dataconnection1.url=jdbc:oracle:thin:@118.219.150.34:1521:orageodev # \uc544\ub798\ub294 \ub514\ube44\uc5d4\ud14d \ub85c\uceec\uc11c\ubc84 #dataconnection1.url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV # thkim local test -dataconnection1.url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV +#dataconnection1.url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV ################################################################ dataconnection1.user=geoinfo -#dataconnection1.password=geoinfo -dataconnection1.password=dbnt060928!rlaxogh +dataconnection1.password=geoinfo +#dataconnection1.password=dbnt060928!rlaxogh dataconnection1.encoding= dataconnection2.conntype=jdbc diff --git a/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp b/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp index 74b84b5a..d3a58052 100644 --- a/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp +++ b/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp @@ -108,11 +108,23 @@ 시추정보 FAQ -
  • - - 방문교육 신청 - -
    • + + + +
  • + + 집합교육 신청 + +
    • +     + +
  • + + 방문교육 신청 + +
    • +     +     diff --git a/src/main/webapp/WEB-INF/views/home/index.jsp b/src/main/webapp/WEB-INF/views/home/index.jsp index dac49e3c..83244fd2 100644 --- a/src/main/webapp/WEB-INF/views/home/index.jsp +++ b/src/main/webapp/WEB-INF/views/home/index.jsp @@ -334,7 +334,7 @@
  • 건설 시추정보 DB 사용자 방문교육 신청 안내 - +
    • diff --git a/src/main/webapp/WEB-INF/views/home/main.jsp b/src/main/webapp/WEB-INF/views/home/main.jsp index 414be5f8..908e4152 100644 --- a/src/main/webapp/WEB-INF/views/home/main.jsp +++ b/src/main/webapp/WEB-INF/views/home/main.jsp @@ -308,7 +308,7 @@

    시추정보 FAQ - +
    • 게시판
    • 시추정보 FAQ
    @@ -325,6 +325,26 @@ + + +

    + 집합교육 신청 +
      +
    • 집합교육 신청
      • +
    • 집합교육 신청하기
      • +
    +

    + + +     diff --git a/src/main/webapp/WEB-INF/views/scheduledGroupEducationApplication/common/scheduledGroupEducationApplicationIncludeTopMenu.jsp b/src/main/webapp/WEB-INF/views/homeEducationApplication/common/homeEducationApplicationIncludeTopMenu.jsp similarity index 98% rename from src/main/webapp/WEB-INF/views/scheduledGroupEducationApplication/common/scheduledGroupEducationApplicationIncludeTopMenu.jsp rename to src/main/webapp/WEB-INF/views/homeEducationApplication/common/homeEducationApplicationIncludeTopMenu.jsp index 504d4f51..f35cd439 100644 --- a/src/main/webapp/WEB-INF/views/scheduledGroupEducationApplication/common/scheduledGroupEducationApplicationIncludeTopMenu.jsp +++ b/src/main/webapp/WEB-INF/views/homeEducationApplication/common/homeEducationApplicationIncludeTopMenu.jsp @@ -1,7 +1,7 @@ <%@ 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"%> - +