Commit @17f7d5eb4605aa97aeb7bcb66c1445531da9b212

name 2023-07-27

Merge branch 'wyh'

@17f7d5eb4605aa97aeb7bcb66c1445531da9b212

d6ab57b

17f7d5e

src/main/java/itn/com/cmm/LoginVO.java

--- src/main/java/itn/com/cmm/LoginVO.java

+++ src/main/java/itn/com/cmm/LoginVO.java


 	//관리자 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;
 	}

d6ab57b

17f7d5e

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	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;
 	}

d6ab57b

17f7d5e

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java

--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java

+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java


 		voComCode.setCodeId("ITN031");
 		model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode));
 		
-		
-		//아이디 발신번호 리스트 불러오기.
-		List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
-		List<String> resultPhonList = new ArrayList<String>();
-		MJUtil mjUtil = new MJUtil();
-		
-		for(String phone : resultSendPhonList) {
+		if(!userId.equals("")) {//로그인 했을때만 발신번호 리스트 불러오기
 			
-			resultPhonList.add(mjUtil.addDash(phone));
+			//아이디 발신번호 리스트 불러오기.
+			List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
+			List<String> resultPhonList = new ArrayList<String>();
+			MJUtil mjUtil = new MJUtil();
 			
+			for(String phone : resultSendPhonList) {
+				
+				resultPhonList.add(mjUtil.addDash(phone));
+				
+			}
+			model.addAttribute("resultPhonList", resultPhonList);
 		}
-		model.addAttribute("resultPhonList", resultPhonList);
 		
 		// 문자 카테고리 리스트 불러오기
 		List<CateCode> cateConfList = letterService.selectCateConfWithList(categoryType);

d6ab57b

17f7d5e

src/main/java/itn/let/uat/uia/web/EgovLoginController.java

--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java

+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java


 		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");
 	

 						 */
 					loginService.updatePassMissReset(loginVO);
 				}
-			} 
+			}
 			//아이디 미존재
 			else {
 				alertMessage = egovMessageSource.getMessage("fail.common.login");

 			}
 		}
 
-
+		
+		/* 일시 : 2023.07.26
+		 * 내용 : 로그인시 휴먼고객 redirect 기능 추가
+		 * 작업자 : 원영현 과장 
+		 */
+		
+		if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") {
+		
+		}
+		
+		
+		
+		
 		boolean loginPolicyYn = true;
 
 		// 접속IP

 			// 2. spring security 연동
 			request.getSession().setAttribute("LoginVO", resultVO);
 			UsernamePasswordAuthenticationFilter springSecurity = null;
-			ApplicationContext act = WebApplicationContextUtils
-					.getRequiredWebApplicationContext(request.getSession().getServletContext());
-			Map<String, UsernamePasswordAuthenticationFilter> beans = act
-					.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
+			ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
+			Map<String, UsernamePasswordAuthenticationFilter> 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 = "";

 				loginVO.setMessage("로그인 성공되었습니다.");
 				loginVO.setLoginYn("Y");
 				loginService.insertActionLoginLog(loginVO);
-
 			}
 
 			// 이벤트 결제 바로가기 로직 체크 Start

 			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이여야함

 			}
 			else
 			{
-				List<UserManageVO> usedNmList = new ArrayList<>();
+				
+				/*
+				 * 일   시 : 2023.07.25
+				 * 담당자 : 원영현 과장 수정
+				 * 내   용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
+				 *       변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경
+				 * */
+				/*List<UserManageVO> usedNmList = new ArrayList<>();
 				usedNmList = userManageService.selectUserIdAjax2(userManageVO);
-				TorF = usedNmList.size() > 0 ? true : false;
+				TorF = usedNmList.size() > 0 ? true : false;*/ 
+				TorF = true;
 			}
 
 

 	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<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
 

 		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<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
+		List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userInfoVO);
 		try {
 			if (!"kmc".equals(userManageVO.getFindType())) {
 				for (UserManageVO tmpVO : usedNmList) {

d6ab57b

17f7d5e

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml


     </select>
 
     <select id="userManageDAO.selectUserIdAjax2" parameterClass="userVO" resultClass="userVO">
-		SELECT a.mber_Id AS emplyrId,
-			   DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d') as sbscrbDeBegin,
-			   a.CRTFC_DN_VALUE AS mblDn
-		FROM   lettngnrlmber a
+		SELECT
+			a.mber_Id								AS emplyrId
+			, DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d')	AS sbscrbDeBegin
+			, a.CRTFC_DN_VALUE						AS mblDn
+		FROM
+			lettngnrlmber a
 		WHERE 1=1
 		<isEmpty property="emplyrNm">
 			<isEmpty property="emailAdres">

 					<isEmpty property="emplyrId">
 						AND	1=2
 					</isEmpty>
-				</isEmpty>				
+				</isEmpty>
 			</isEmpty>
 		</isEmpty>
 				
 		<isNotEmpty property="emplyrNm">
-			AND    (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
-		</isNotEmpty>		
+			AND (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
+		</isNotEmpty>
 		<isNotEmpty property="emailAdres">
-			AND    a.MBER_EMAIL_ADRES 	= #emailAdres#
+			AND a.MBER_EMAIL_ADRES = #emailAdres#
 		</isNotEmpty>
 		<isNotEmpty property="moblphonNo">
-			AND    a.MBTLNUM 			= #moblphonNo#
+			AND a.MBTLNUM = #moblphonNo#
 		</isNotEmpty>
 		<isNotEmpty property="emplyrId">
-			AND    a.mber_Id 			= #emplyrId#
+			AND a.mber_Id = #emplyrId#
 		</isNotEmpty>
     </select>
     

Add a comment

Open 0
Closed 0

List

...	...	@@ -112,6 +112,14 @@
112	112	//관리자 SMS 문자인증 여부( Y : 문자인증함, N : 문자인증 안함)
113	113	private String outerCertYn;
114	114
	115	+ private String dormantYn; // 휴먼회원여부 ( N:일반회원, Y:휴먼회원)
	116	+
	117	+ public String getDormantYn() {
	118	+ return dormantYn;
	119	+ }
	120	+ public void setDormantYn(String dormantYn) {
	121	+ this.dormantYn = dormantYn;
	122	+ }
115	123	public String getLoginYn() {
116	124	return loginYn;
117	125	}

...	...	@@ -165,6 +165,14 @@
165	165	private String reqFullDate;
166	166	private String blineCode;
167	167
	168	+ private String sendKind; //문자전송 타입(H:홈페이지, A:API)
	169	+
	170	+ public String getSendKind() {
	171	+ return sendKind;
	172	+ }
	173	+ public void setSendKind(String sendKind) {
	174	+ this.sendKind = sendKind;
	175	+ }
168	176	public String getBlineCode() {
169	177	return blineCode;
170	178	}

...	...	@@ -1078,18 +1078,20 @@
1078	1078	voComCode.setCodeId("ITN031");
1079	1079	model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode));
1080	1080
1081		-
1082		- //아이디 발신번호 리스트 불러오기.
1083		- List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
1084		- List<String> resultPhonList = new ArrayList<String>();
1085		- MJUtil mjUtil = new MJUtil();
1086		-
1087		- for(String phone : resultSendPhonList) {
	1081	+ if(!userId.equals("")) {//로그인 했을때만 발신번호 리스트 불러오기
1088	1082
1089		- resultPhonList.add(mjUtil.addDash(phone));
	1083	+ //아이디 발신번호 리스트 불러오기.
	1084	+ List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
	1085	+ List<String> resultPhonList = new ArrayList<String>();
	1086	+ MJUtil mjUtil = new MJUtil();
1090	1087
	1088	+ for(String phone : resultSendPhonList) {
	1089	+
	1090	+ resultPhonList.add(mjUtil.addDash(phone));
	1091	+
	1092	+ }
	1093	+ model.addAttribute("resultPhonList", resultPhonList);
1091	1094	}
1092		- model.addAttribute("resultPhonList", resultPhonList);
1093	1095
1094	1096	// 문자 카테고리 리스트 불러오기
1095	1097	List<CateCode> cateConfList = letterService.selectCateConfWithList(categoryType);

...	...	@@ -1552,9 +1552,8 @@
1552	1552	if (!"admin".equals(loginVO.getId())) {
1553	1553	//아이디가 존재
1554	1554	if(passMissVO != null) {
1555		- if (null == resultVO.getId()
1556		- && passMissVO.getPassMiss() < 5
1557		- ) { // 로그인 실패
	1555	+ // 로그인 실패 (
	1556	+ if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) {
1558	1557	loginService.updatePassMissPlus(loginVO);
1559	1558	alertMessage = egovMessageSource.getMessage("fail.common.login");
1560	1559
...	...	@@ -1583,7 +1582,7 @@
1583	1582	*/
1584	1583	loginService.updatePassMissReset(loginVO);
1585	1584	}
1586		- }
	1585	+ }
1587	1586	//아이디 미존재
1588	1587	else {
1589	1588	alertMessage = egovMessageSource.getMessage("fail.common.login");
...	...	@@ -1602,7 +1601,19 @@
1602	1601	}
1603	1602	}
1604	1603
1605		-
	1604	+
	1605	+ /* 일시 : 2023.07.26
	1606	+ * 내용 : 로그인시 휴먼고객 redirect 기능 추가
	1607	+ * 작업자 : 원영현 과장
	1608	+ */
	1609	+
	1610	+ if(resultVO.getDormantYn().equals("Y") \|\| resultVO.getDormantYn() == "Y") {
	1611	+
	1612	+ }
	1613	+
	1614	+
	1615	+
	1616	+
1606	1617	boolean loginPolicyYn = true;
1607	1618
1608	1619	// 접속IP
...	...	@@ -1615,23 +1626,19 @@
1615	1626	// 2. spring security 연동
1616	1627	request.getSession().setAttribute("LoginVO", resultVO);
1617	1628	UsernamePasswordAuthenticationFilter springSecurity = null;
1618		- ApplicationContext act = WebApplicationContextUtils
1619		- .getRequiredWebApplicationContext(request.getSession().getServletContext());
1620		- Map<String, UsernamePasswordAuthenticationFilter> beans = act
1621		- .getBeansOfType(UsernamePasswordAuthenticationFilter.class);
	1629	+ ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
	1630	+ Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
	1631	+
1622	1632	if (beans.size() > 0) {
1623	1633	springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0];
1624	1634	springSecurity.setUsernameParameter("egov_security_username");
1625	1635	springSecurity.setPasswordParameter("egov_security_password");
1626		- springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(
1627		- request.getServletContext().getContextPath() + "/egov_security_login", "POST"));
1628		-
	1636	+ springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST"));
1629	1637	} else {
1630	1638	throw new IllegalStateException("No AuthenticationProcessingFilter");
1631	1639	}
1632	1640
1633		- springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(),
1634		- resultVO.getUniqId()), response, null);
	1641	+ springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null);
1635	1642	{ // 관리자 로그인 log 저장
1636	1643	String uniqId = "";
1637	1644	String ip = "";
...	...	@@ -1681,7 +1688,6 @@
1681	1688	loginVO.setMessage("로그인 성공되었습니다.");
1682	1689	loginVO.setLoginYn("Y");
1683	1690	loginService.insertActionLoginLog(loginVO);
1684		-
1685	1691	}
1686	1692
1687	1693	// 이벤트 결제 바로가기 로직 체크 Start
...	...	@@ -2889,8 +2895,7 @@
2889	2895	boolean TorF = true;
2890	2896	if("USR".equals(mberManageVO.getUserSe()))
2891	2897	{
2892		- TorF = userManageService.selectAdminIdAjax(userManageVO) > 0
2893		- ? true : false;
	2898	+ TorF = userManageService.selectAdminIdAjax(userManageVO) > 0 ? true : false;
2894	2899
2895	2900	mberManageVO.setMberNm("");
2896	2901	// 관리자 로그인 본인인증은 name이 null이여야함
...	...	@@ -2898,9 +2903,17 @@
2898	2903	}
2899	2904	else
2900	2905	{
2901		- List<UserManageVO> usedNmList = new ArrayList<>();
	2906	+
	2907	+ /*
	2908	+ * 일 시 : 2023.07.25
	2909	+ * 담당자 : 원영현 과장 수정
	2910	+ * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
	2911	+ * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경
	2912	+ * */
	2913	+ /*List<UserManageVO> usedNmList = new ArrayList<>();
2902	2914	usedNmList = userManageService.selectUserIdAjax2(userManageVO);
2903		- TorF = usedNmList.size() > 0 ? true : false;
	2915	+ TorF = usedNmList.size() > 0 ? true : false;*/
	2916	+ TorF = true;
2904	2917	}
2905	2918
2906	2919
...	...	@@ -3070,9 +3083,16 @@
3070	3083	public Boolean findIdKmcCheck(String DI, String Name, String PhoneNo) throws Exception {
3071	3084	UserManageVO userManageVO = new UserManageVO();
3072	3085
3073		- userManageVO.setEmplyrNm(Name);
3074		- userManageVO.setMoblphonNo(PhoneNo);
3075		- userManageVO.setMblDn(DI);
	3086	+ /*
	3087	+ * 일 시 : 2023.07.25
	3088	+ * 담당자 : 원영현 과장 수정
	3089	+ * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
	3090	+ * 쿼리 조회시 번호를 제외한 이름과 Dn으로 조회
	3091	+ * */
	3092	+
	3093	+ userManageVO.setEmplyrNm(Name); // 이름
	3094	+// userManageVO.setMoblphonNo(PhoneNo);
	3095	+ userManageVO.setMblDn(DI); // Dn
3076	3096
3077	3097	List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
3078	3098
...	...	@@ -3101,9 +3121,18 @@
3101	3121	if (isAuthenticated) {
3102	3122	return "redirect:/";
3103	3123	}
3104		-
	3124	+ /*
	3125	+ * 일 시 : 2023.07.25
	3126	+ * 담당자 : 원영현 과장 수정
	3127	+ * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
	3128	+ * 쿼리 조회시 번호를 제외한 이름과 Dn으로 조회
	3129	+ * */
	3130	+ UserManageVO userInfoVO = new UserManageVO();
	3131	+ userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름
	3132	+ userInfoVO.setMblDn(userManageVO.getMblDn()); // Dn
	3133	+
3105	3134	String isFullUserid = "Y";
3106		- List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
	3135	+ List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userInfoVO);
3107	3136	try {
3108	3137	if (!"kmc".equals(userManageVO.getFindType())) {
3109	3138	for (UserManageVO tmpVO : usedNmList) {

...	...	@@ -533,10 +533,12 @@
533	533	</select>
534	534
535	535	<select id="userManageDAO.selectUserIdAjax2" parameterClass="userVO" resultClass="userVO">
536		- SELECT a.mber_Id AS emplyrId,
537		- DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d') as sbscrbDeBegin,
538		- a.CRTFC_DN_VALUE AS mblDn
539		- FROM lettngnrlmber a
	536	+ SELECT
	537	+ a.mber_Id AS emplyrId
	538	+ , DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d') AS sbscrbDeBegin
	539	+ , a.CRTFC_DN_VALUE AS mblDn
	540	+ FROM
	541	+ lettngnrlmber a
540	542	WHERE 1=1
541	543	<isEmpty property="emplyrNm">
542	544	<isEmpty property="emailAdres">
...	...	@@ -544,21 +546,21 @@
544	546	<isEmpty property="emplyrId">
545	547	AND 1=2
546	548	</isEmpty>
547		- </isEmpty>
	549	+ </isEmpty>
548	550	</isEmpty>
549	551	</isEmpty>
550	552
551	553	<isNotEmpty property="emplyrNm">
552		- AND (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
553		- </isNotEmpty>
	554	+ AND (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
	555	+ </isNotEmpty>
554	556	<isNotEmpty property="emailAdres">
555		- AND a.MBER_EMAIL_ADRES = #emailAdres#
	557	+ AND a.MBER_EMAIL_ADRES = #emailAdres#
556	558	</isNotEmpty>
557	559	<isNotEmpty property="moblphonNo">
558		- AND a.MBTLNUM = #moblphonNo#
	560	+ AND a.MBTLNUM = #moblphonNo#
559	561	</isNotEmpty>
560	562	<isNotEmpty property="emplyrId">
561		- AND a.mber_Id = #emplyrId#
	563	+ AND a.mber_Id = #emplyrId#
562	564	</isNotEmpty>
563	565	</select>
564	566

Delete comment