From 1566b0cbe36fdb6132d59ecab95abb9c39c923f5 Mon Sep 17 00:00:00 2001 From: name Date: Fri, 4 Aug 2023 14:39:44 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EB=A8=BC=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../human/web/MjonHumanPageController.java | 98 +++++++++ .../let/uat/uia/web/EgovLoginController.java | 17 +- .../let/uat/uia/EgovLoginUsr_SQL_Mysql.xml | 160 ++++++++------- .../let/uss/umt/EgovUserManage_SQL_Mysql.xml | 22 ++- .../WEB-INF/jsp/web/login/humanPage.jsp | 47 +++++ .../web/login/humanPageAuthenticatedPage.jsp | 186 ++++++++++++++++++ 6 files changed, 437 insertions(+), 93 deletions(-) create mode 100644 src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java create mode 100644 src/main/webapp/WEB-INF/jsp/web/login/humanPage.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/login/humanPageAuthenticatedPage.jsp diff --git a/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java new file mode 100644 index 00000000..5883e447 --- /dev/null +++ b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java @@ -0,0 +1,98 @@ +package itn.let.mjo.human.web; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import itn.let.mjo.msgdata.web.MjonMsgDataController; +import itn.let.uss.umt.service.EgovMberManageService; +import itn.let.uss.umt.service.EgovUserManageService; +import itn.let.uss.umt.service.MberManageVO; +import itn.let.uss.umt.service.UserManageVO; + +@Controller +public class MjonHumanPageController { + + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + /** mberManageService */ + @Resource(name = "mberManageService") + private EgovMberManageService mberManageService; + + private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class); + + @RequestMapping(value="/web/user/humanPage.do") + public String humanPageIndex() throws Exception { + + return "web/login/humanPage"; + } + + @RequestMapping(value="/web/user/humanPageAuthenticatedPage.do") + public String humanPageAuthenticatedUser() throws Exception { + + return "web/login/humanPageAuthenticatedPage"; + } + + @RequestMapping(value="/web/user/humanCertifiedAjax.do") + public ModelAndView humanCertifiedAjax( + HttpServletRequest request, HttpServletResponse response, ModelMap model, + @ModelAttribute("userManageVO") UserManageVO userManageVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + try { + + UserManageVO userInfoVO = new UserManageVO(); + userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름 + userInfoVO.setMblDn(userManageVO.getMblDn()); // Dn + + List usedNmList = userManageService.selectUserIdAjax(userInfoVO); + + boolean TorF = usedNmList.size() > 0 ? true : false; + + if (!TorF) { + System.out.println(TorF); + System.out.println(TorF); + + modelAndView.addObject("message", "입력하신 아이디/이름 정보에 맞는 회원이 없습니다."); + modelAndView.addObject("result", "fail-check"); + modelAndView.addObject("resultSts", "0"); + modelAndView.addObject("resultBlockSts", "0"); + + return modelAndView; + } + + MberManageVO mberManageVO = new MberManageVO(); + // 회원 휴면회원에서 일반회원으로 업데이트 + mberManageVO.setMberId(usedNmList.get(0).getEmplyrId()); //탈퇴사유 중 직접입력으로 타입 지정 + mberManageVO.setDormantYn("N"); + + int updateCount = mberManageService.updateUserDormant(mberManageVO); + + if(updateCount != 0) { + modelAndView.addObject("result", "success"); + }else { + modelAndView.addObject("result", "fail"); + } + }catch (Exception e) { + logger.error(e.getMessage(), e); + + } + + + return modelAndView; + } +} diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 62f0cf26..e0006e1e 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1635,9 +1635,10 @@ public class EgovLoginController { * 작업자 : 원영현 과장 */ - /*if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { - - }*/ + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + return "redirect:/web/user/humanPage.do"; + } @@ -2936,12 +2937,12 @@ public class EgovLoginController { * 일 시 : 2023.07.25 * 담당자 : 원영현 과장 수정 * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정 - * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경 + * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 이름과 ID를 이용하여 조건 수정 * */ - /*List usedNmList = new ArrayList<>(); + userManageVO.setMoblphonNo(""); + List usedNmList = new ArrayList<>(); usedNmList = userManageService.selectUserIdAjax2(userManageVO); - TorF = usedNmList.size() > 0 ? true : false;*/ - TorF = true; + TorF = usedNmList.size() > 0 ? true : false; } @@ -2950,7 +2951,7 @@ public class EgovLoginController { if (!TorF) { System.out.println(" In if TorF :: "+TorF); - modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호에 맞는 회원이 없습니다."); + modelAndView.addObject("message", "입력하신 아이디/이름에 맞는 회원이 없습니다."); modelAndView.addObject("result", "fail-check"); modelAndView.addObject("resultSts", "0"); modelAndView.addObject("resultBlockSts", "0"); diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml index dd911457..1f6e57e5 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml @@ -26,6 +26,7 @@ + @@ -316,29 +320,32 @@ @@ -507,32 +514,35 @@ + + + + + + + +
+ + + + + + + + +
+ + +
+ +
+ +
+
+

로그인

+
+ +
+ +
+ +
+