diff --git a/2_apply.bat b/2_apply.bat index 269a06f3..60c1cf8c 100644 --- a/2_apply.bat +++ b/2_apply.bat @@ -9,67 +9,72 @@ set source_file= set target_file= for /f "delims=" %%i in (list.txt) do ( - set line=%%i + + echo %%i | findstr /v "^#" > nul + if !errorlevel! == 0 ( + set "line=%%i" + rem # ʴ ó + echo !line! + + + set line=%%i - if "!line:~-5!" == ".java" ( - echo Skip - ) else if "!line:~-4!" == ".xml" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - :: "src\main\resources\" - set relative_path=!relative_path:*src\main\resources\=! - set target_file=%target_prefix%WEB-INF\classes\!relative_path! - ) else if "!line:~-4!" == ".jsp" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".css" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-3!" == ".js" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".reb" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-6!" == ".woff2" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-5!" == ".woff" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".otf" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-11!" == ".properties" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! + if "!line:~-5!" == ".java" ( + echo Skip + ) else if "!line:~-4!" == ".xml" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + :: "src\main\resources\" + set relative_path=!relative_path:*src\main\resources\=! + set target_file=%target_prefix%WEB-INF\classes\!relative_path! + ) else if "!line:~-4!" == ".jsp" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".css" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".png" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".svg" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-3!" == ".js" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".reb" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-6!" == ".woff2" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-5!" == ".woff" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".otf" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-11!" == ".properties" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) + + rem Copy the source file to the target location, overwriting if necessary + echo Copying "!source_file!" to "!target_file!" + xcopy /i /Y "!source_file!" "!target_file!" + ) else ( + echo # õ˴ϴ ) + - rem Copy the source file to the target location, overwriting if necessary - echo Copying "!source_file!" to "!target_file!" - xcopy /i /Y "!source_file!" "!target_file!" ) \ No newline at end of file diff --git a/list.txt b/list.txt index 459dff2e..2a935795 100644 --- a/list.txt +++ b/list.txt @@ -1 +1,3 @@ -src\main\resources\egovframework\egovProps\globals.properties \ No newline at end of file +#src\main\resources\egovframework\egovProps\globals.properties +src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml +src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp \ No newline at end of file diff --git a/src/main/java/geoinfo/main/join/JoinController.java b/src/main/java/geoinfo/main/join/JoinController.java index a8b91599..ebf74dfb 100644 --- a/src/main/java/geoinfo/main/join/JoinController.java +++ b/src/main/java/geoinfo/main/join/JoinController.java @@ -249,6 +249,11 @@ public class JoinController { public ModelAndView join_post(MultipartRequest multi, Map map,HttpServletRequest request, HttpServletResponse response,@RequestParam HashMap params, RedirectAttributes rda)throws Exception { ModelAndView mv = new ModelAndView("body/join/join_post"); log.info("JoinController 회원 가입 폼 전송"); + + /** + * msgCd + * 1 : 이미가입된 회원 + */ String passwdCode; @@ -315,6 +320,16 @@ public ModelAndView join_post(MultipartRequest multi, Map map,Ht if(checkWebMember != 0) { log.info("JoinController 회원 가입 폼 전송 // 이미 가입된 회원"); mv.addObject("msg","alert('이미 회원 가입되어있습니다.');history.go(-1);"); + map.put("msgCd", 1); + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " join_post" + + "\n--------------------------------------------------------------\n" + + "name:[" + name + "]\n" + + "cls:[" + cls + "]\n" + + "DI:[" + DI + "]\n" + + "\n--------------------------------------------------------------\n" + ); return mv; } diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index 3bb73613..a05faef6 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -1568,6 +1568,11 @@ public class RegiController { e.printStackTrace(); } + //기존 database의 records를 제거한다. + HashMap deleteParams = new HashMap(); + deleteParams.put("projectCode", projectCode); + masterService.deleteOldDatas(deleteParams); + return "/web/manage/createZip"; } diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageService.java b/src/main/java/geoinfo/regi/status/service/RegiPageService.java index 034c74ad..b60dae9d 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageService.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageService.java @@ -193,4 +193,8 @@ public interface RegiPageService { EgovMap selectModeifyCallReason(HashMap params) throws Exception; public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception; + + + + public int deleteOldDatas(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java index a4dab434..b5fca249 100644 --- a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java +++ b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java @@ -204,6 +204,8 @@ public class RegiPageServiceImpl implements RegiPageService { public int deleteWebData(HashMap params) throws Exception { return regiPageMapper.deleteWebData(params); } + + @Override public HashMap getProjectCd(HashMap params) throws Exception { return regiPageMapper.getProjectCd(params); @@ -480,5 +482,14 @@ public class RegiPageServiceImpl implements RegiPageService { public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception { return regiPageMapper.getHoleNamesByProjectCode(params); } + + + /** + * 기존 database에 있는 불필요한 데이터들을 지운다. 필요시 구현 요망. 20241119 thkim + */ + @Override + public int deleteOldDatas(HashMap params) throws Exception { + return 0; + } } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml index 122f1316..63bfac7a 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml @@ -15,10 +15,11 @@ , A.REPORT_TYPE , COUNT(B.HOLE_CODE) HOLE_CNT , A.USERID + , A.DATETIME FROM TEMP_PROJECT_INFO A LEFT OUTER JOIN TEMP_HEADER B ON A.PROJECT_CODE = B.PROJECT_CODE WHERE A.STATE = '4' - GROUP BY A.PROJECT_CODE, A.PROJECT_NAME, A.REPORT_TYPE,A.USERID + GROUP BY A.PROJECT_CODE, A.PROJECT_NAME, A.REPORT_TYPE,A.USERID, A.DATETIME ) OA ) F WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/views/body/account/pwsearch.jsp b/src/main/webapp/WEB-INF/views/body/account/pwsearch.jsp index 2df76a01..df5b09cd 100644 --- a/src/main/webapp/WEB-INF/views/body/account/pwsearch.jsp +++ b/src/main/webapp/WEB-INF/views/body/account/pwsearch.jsp @@ -459,15 +459,17 @@ @ @ @ diff --git a/src/main/webapp/WEB-INF/views/body/join/join_post.jsp b/src/main/webapp/WEB-INF/views/body/join/join_post.jsp index db50f2f3..1f9a0019 100644 --- a/src/main/webapp/WEB-INF/views/body/join/join_post.jsp +++ b/src/main/webapp/WEB-INF/views/body/join/join_post.jsp @@ -14,7 +14,11 @@ ${msg} - \ No newline at end of file + +${msgCd} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/body/mypage/joinEx.jsp b/src/main/webapp/WEB-INF/views/body/mypage/joinEx.jsp index 43167823..fdf306a7 100644 --- a/src/main/webapp/WEB-INF/views/body/mypage/joinEx.jsp +++ b/src/main/webapp/WEB-INF/views/body/mypage/joinEx.jsp @@ -110,15 +110,17 @@ function joinCheck() { @