diff --git a/src/main/java/itn/com/cmm/LoginVO.java b/src/main/java/itn/com/cmm/LoginVO.java index 91b69f86..5394ae54 100644 --- a/src/main/java/itn/com/cmm/LoginVO.java +++ b/src/main/java/itn/com/cmm/LoginVO.java @@ -112,6 +112,14 @@ public class LoginVO implements Serializable{ //관리자 SMS 문자인증 여부( Y : 문자인증함, N : 문자인증 안함) private String outerCertYn; + private String dormantYn; // 휴먼회원여부 ( N:일반회원, Y:휴먼회원) + + public String getDormantYn() { + return dormantYn; + } + public void setDormantYn(String dormantYn) { + this.dormantYn = dormantYn; + } public String getLoginYn() { return loginYn; } diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index 8055ab0d..dc6c0df4 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -165,6 +165,14 @@ public class MjonMsgVO extends ComDefaultVO{ private String reqFullDate; private String blineCode; + private String sendKind; //문자전송 타입(H:홈페이지, A:API) + + public String getSendKind() { + return sendKind; + } + public void setSendKind(String sendKind) { + this.sendKind = sendKind; + } public String getBlineCode() { return blineCode; } diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index 16760fea..5f6da597 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -1078,18 +1078,20 @@ public class MjonMsgCampainDataController { voComCode.setCodeId("ITN031"); model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode)); - - //아이디 발신번호 리스트 불러오기. - List resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId); - List resultPhonList = new ArrayList(); - MJUtil mjUtil = new MJUtil(); - - for(String phone : resultSendPhonList) { + if(!userId.equals("")) {//로그인 했을때만 발신번호 리스트 불러오기 - resultPhonList.add(mjUtil.addDash(phone)); + //아이디 발신번호 리스트 불러오기. + List resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId); + List resultPhonList = new ArrayList(); + MJUtil mjUtil = new MJUtil(); + for(String phone : resultSendPhonList) { + + resultPhonList.add(mjUtil.addDash(phone)); + + } + model.addAttribute("resultPhonList", resultPhonList); } - model.addAttribute("resultPhonList", resultPhonList); // 문자 카테고리 리스트 불러오기 List cateConfList = letterService.selectCateConfWithList(categoryType); 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 43ee013e..139799e6 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1552,9 +1552,8 @@ public class EgovLoginController { if (!"admin".equals(loginVO.getId())) { //아이디가 존재 if(passMissVO != null) { - if (null == resultVO.getId() - && passMissVO.getPassMiss() < 5 - ) { // 로그인 실패 + // 로그인 실패 ( + if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) { loginService.updatePassMissPlus(loginVO); alertMessage = egovMessageSource.getMessage("fail.common.login"); @@ -1583,7 +1582,7 @@ public class EgovLoginController { */ loginService.updatePassMissReset(loginVO); } - } + } //아이디 미존재 else { alertMessage = egovMessageSource.getMessage("fail.common.login"); @@ -1602,7 +1601,19 @@ public class EgovLoginController { } } - + + /* 일시 : 2023.07.26 + * 내용 : 로그인시 휴먼고객 redirect 기능 추가 + * 작업자 : 원영현 과장 + */ + + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + } + + + + boolean loginPolicyYn = true; // 접속IP @@ -1615,23 +1626,19 @@ public class EgovLoginController { // 2. spring security 연동 request.getSession().setAttribute("LoginVO", resultVO); UsernamePasswordAuthenticationFilter springSecurity = null; - ApplicationContext act = WebApplicationContextUtils - .getRequiredWebApplicationContext(request.getSession().getServletContext()); - Map beans = act - .getBeansOfType(UsernamePasswordAuthenticationFilter.class); + ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); + Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); + if (beans.size() > 0) { springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0]; springSecurity.setUsernameParameter("egov_security_username"); springSecurity.setPasswordParameter("egov_security_password"); - springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher( - request.getServletContext().getContextPath() + "/egov_security_login", "POST")); - + springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST")); } else { throw new IllegalStateException("No AuthenticationProcessingFilter"); } - springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), - resultVO.getUniqId()), response, null); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); { // 관리자 로그인 log 저장 String uniqId = ""; String ip = ""; @@ -1681,7 +1688,6 @@ public class EgovLoginController { loginVO.setMessage("로그인 성공되었습니다."); loginVO.setLoginYn("Y"); loginService.insertActionLoginLog(loginVO); - } // 이벤트 결제 바로가기 로직 체크 Start @@ -2889,8 +2895,7 @@ public class EgovLoginController { boolean TorF = true; if("USR".equals(mberManageVO.getUserSe())) { - TorF = userManageService.selectAdminIdAjax(userManageVO) > 0 - ? true : false; + TorF = userManageService.selectAdminIdAjax(userManageVO) > 0 ? true : false; mberManageVO.setMberNm(""); // 관리자 로그인 본인인증은 name이 null이여야함 @@ -2898,9 +2903,17 @@ public class EgovLoginController { } else { - List usedNmList = new ArrayList<>(); + + /* + * 일 시 : 2023.07.25 + * 담당자 : 원영현 과장 수정 + * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정 + * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경 + * */ + /*List usedNmList = new ArrayList<>(); usedNmList = userManageService.selectUserIdAjax2(userManageVO); - TorF = usedNmList.size() > 0 ? true : false; + TorF = usedNmList.size() > 0 ? true : false;*/ + TorF = true; } @@ -3070,9 +3083,16 @@ public class EgovLoginController { public Boolean findIdKmcCheck(String DI, String Name, String PhoneNo) throws Exception { UserManageVO userManageVO = new UserManageVO(); - userManageVO.setEmplyrNm(Name); - userManageVO.setMoblphonNo(PhoneNo); - userManageVO.setMblDn(DI); + /* + * 일 시 : 2023.07.25 + * 담당자 : 원영현 과장 수정 + * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정 + * 쿼리 조회시 번호를 제외한 이름과 Dn으로 조회 + * */ + + userManageVO.setEmplyrNm(Name); // 이름 +// userManageVO.setMoblphonNo(PhoneNo); + userManageVO.setMblDn(DI); // Dn List usedNmList = userManageService.selectUserIdAjax(userManageVO); @@ -3101,9 +3121,18 @@ public class EgovLoginController { if (isAuthenticated) { return "redirect:/"; } - + /* + * 일 시 : 2023.07.25 + * 담당자 : 원영현 과장 수정 + * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정 + * 쿼리 조회시 번호를 제외한 이름과 Dn으로 조회 + * */ + UserManageVO userInfoVO = new UserManageVO(); + userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름 + userInfoVO.setMblDn(userManageVO.getMblDn()); // Dn + String isFullUserid = "Y"; - List usedNmList = userManageService.selectUserIdAjax(userManageVO); + List usedNmList = userManageService.selectUserIdAjax(userInfoVO); try { if (!"kmc".equals(userManageVO.getFindType())) { for (UserManageVO tmpVO : usedNmList) { diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml index 30d1a90d..5de708d5 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml @@ -533,10 +533,12 @@