Commit @3d80a9004976ac93eef1da0877f08093d438ade3

7c411c5

3d80a90

src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java

--- src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java

+++ src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java


 
 import org.apache.commons.lang3.StringUtils;
 
+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
 import itn.let.kakao.kakaoComm.KakaoVO;
 import itn.let.mjo.msg.service.MjonMsgVO;
 

 	/**
 	 * 카카오톡 메시지 텍스트 포맷팅
 	 */
-	public static String formatKakaoText(KakaoVO kakaoVO) {
-		String smsTxt = kakaoVO.getTemplateContent();
-		String reserveYn = safeGetString(kakaoVO.getReserveYn());
-		String atDelayYn = safeGetString(kakaoVO.getAtDelayYn());
+	public static String formatKakaoText(KakaoSendAdvcVO sendVO) {
+		String smsTxt = sendVO.getTemplateContent();
+		String reserveYn = safeGetString(sendVO.getReserveYn());
+		String atDelayYn = safeGetString(sendVO.getAtDelayYn());
 		
 		// 공통 텍스트 포맷팅 로직 적용
 		return formatMessagePrefix(smsTxt, reserveYn, "Y".equals(atDelayYn));

 	/**
 	 * @카카오톡용 sandName 포맷팅 메서드
 	 */
-	public static String formatKakaoSandName(KakaoVO kakaoVO) {
-		String userId = kakaoVO.getUserId();
-		String callFrom = kakaoVO.getCallFrom();
-		String msgType = getKakaoMessageTypeLabel(kakaoVO.getMsgType());
+	public static String formatKakaoSandName(KakaoSendAdvcVO sendVO) {
+		String userId = sendVO.getUserId();
+		String callFrom = sendVO.getCallFrom();
+		String msgType = getKakaoMessageTypeLabel(sendVO.getMsgType());
 		return String.format("[%s][%s]%s", userId, callFrom, msgType);
 	}
 	

7c411c5

3d80a90

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java


 		boolean isNotified = mjonCommon.processUserAndCheckAT(kakaoVO);
 		
 		
-/** @LETTNGNRLMBER 사용자 정보 -> 스미싱의심 여부 */
-		UserManageVO userManageVO = mjonCommon.getUserManageInfo(userId);
-		kakaoVO.setAtSmishingYn(userManageVO.getAtSmishingYn());
 		
 /** @카카오톡 전송 list 셋팅 -------------------------------------------*/
 		List<KakaoSendAdvcVO> kakaoSendAdvcListVO = kakaoSendUtil.populateSendLists(kakaoVO, isNotified, statusResponse);

 /** @SLACK발송 */ 
 				/** @발송조건이되면 발송 */ 
 				if(isNotified) {
-					mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
+					mjonCommon.getAdminKakaoAtSendSlack(sendVO);
 				}else if("Y".equals(kakaoVO.getAtSmishingYn())){
 				/** @발송조건이 안되면 DB INSERT */ 
 					mjonMsgDAO.insertSpamPassMsgData(MjonMsgVO.builder()

7c411c5

3d80a90

src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java


 						
 						if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
 							
-							mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
+//							mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
 							
 						}
 						

7c411c5

3d80a90

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

--- src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

+++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java


 import itn.com.cmm.OptimalMsgResultDTO;
 import itn.com.cmm.util.MsgSendUtils;
 import itn.com.cmm.util.SlackMessageFormatUtil;
+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
 import itn.let.kakao.kakaoComm.KakaoVO;
 import itn.let.mail.service.StatusResponse;
 import itn.let.mjo.event.service.MjonEventService;

 		}
 	}
 	
-	public void getAdminKakaoAtSendSlack(KakaoVO kakaoVO) {
+	public void getAdminKakaoAtSendSlack(KakaoSendAdvcVO kakaoVO) {
 		HttpClient client = new HttpClient();
 		PostMethod post = new PostMethod(SLACK_URL);
 

 		
 		// 조건 체크
 		if ("Y".equals(adminSmsNoticeYn) || "Y".equals(atSmishingYn)) {
-			kakaoVO.setAtSmishingYn(atSmishingYn); // MjonMsgVO에 스미싱 정보 설정
+			kakaoVO.setAtSmishingYn("Y"); // MjonMsgVO에 스미싱 정보 설정
 			
 			// 스미싱 알림 처리
 			return handleSmishingAlert(); // 알림 처리 결과 반환

7c411c5

3d80a90

src/main/java/itn/let/module/base/PriceAndPoint.java

--- src/main/java/itn/let/module/base/PriceAndPoint.java

+++ src/main/java/itn/let/module/base/PriceAndPoint.java


 		MjonPayVO mjonPayVO = new MjonPayVO();
 		mjonPayVO.setCashId(idgenMjonCashId.getNextStringId());
 		mjonPayVO.setUserId(userId);
+		System.out.println(" + totPrice :: "+ totPrice);
 		mjonPayVO.setCash(totPrice);
 		mjonPayVO.setFrstRegisterId(userId);
 		mjonPayVO.setMemo(memo);

7c411c5

3d80a90

src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp


 				
 				
 
+				return false;
+				
 				var status = data.status;
 				if("OK" == status){
 					var resultSts = data.object.resultSts;

 											<div class="clearfix receipt_num receiver_wrap01">
 												<div class="receipt_num_top">
 													<label for="callTo" class="label">받는 번호입력</label>
-													<input type="text" id="callTo" name="callTo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="번호를 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='번호를 입력하세요'" style="width:340px;">
+													<input value="01083584250" type="text" id="callTo" name="callTo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="번호를 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='번호를 입력하세요'" style="width:340px;">
 													<button type="button" class="btnType btnType6 addCallToF">번호추가</button>
 													</br>
 													<span>

7c411c5

3d80a90

src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp


 									.filter(num => num !== "")
 									.filter(num => isValidPhoneNumber(num)); // 유효한 번호만 필터링;
 
-		fn_phoneAddProcess(tableL, numbers);
+		console.log('numbers : ', numbers);
+		const addrData = processPhoneNumbers(numbers);
+        
+        
+		// 기존 tableL의 데이터를 가져옵니다.
+		var existingData = tableL.getData();
+        
+		// 데이터 병합 및 중복 제거
+		const result = mergeAndValidateData(existingData, addrData);
+        
+        
+		// 테이블 데이터 업데이트
+		if (!updateTableData(tableL, result)) return false;
 		
 		// textarea 초기화
 		textarea.val(''); // jQuery 객체에서 값을 초기화할 때는 .val('') 사용

...	...	@@ -902,9 +902,6 @@
902	902	boolean isNotified = mjonCommon.processUserAndCheckAT(kakaoVO);
903	903
904	904
905		-/** @LETTNGNRLMBER 사용자 정보 -> 스미싱의심 여부 */
906		- UserManageVO userManageVO = mjonCommon.getUserManageInfo(userId);
907		- kakaoVO.setAtSmishingYn(userManageVO.getAtSmishingYn());
908	905
909	906	/** @카카오톡 전송 list 셋팅 -------------------------------------------*/
910	907	List<KakaoSendAdvcVO> kakaoSendAdvcListVO = kakaoSendUtil.populateSendLists(kakaoVO, isNotified, statusResponse);
...	...	@@ -976,7 +973,7 @@
976	973	/** @SLACK발송 */
977	974	/** @발송조건이되면 발송 */
978	975	if(isNotified) {
979		- mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
	976	+ mjonCommon.getAdminKakaoAtSendSlack(sendVO);
980	977	}else if("Y".equals(kakaoVO.getAtSmishingYn())){
981	978	/** @발송조건이 안되면 DB INSERT */
982	979	mjonMsgDAO.insertSpamPassMsgData(MjonMsgVO.builder()

...	...	@@ -1430,7 +1430,7 @@
1430	1430
1431	1431	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
1432	1432
1433		- mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
	1433	+// mjonCommon.getAdminKakaoAtSendSlack(kakaoVO);
1434	1434
1435	1435	}
1436	1436

...	...	@@ -27,6 +27,7 @@
27	27	import itn.com.cmm.OptimalMsgResultDTO;
28	28	import itn.com.cmm.util.MsgSendUtils;
29	29	import itn.com.cmm.util.SlackMessageFormatUtil;
	30	+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
30	31	import itn.let.kakao.kakaoComm.KakaoVO;
31	32	import itn.let.mail.service.StatusResponse;
32	33	import itn.let.mjo.event.service.MjonEventService;
...	...	@@ -159,7 +160,7 @@
159	160	}
160	161	}
161	162
162		- public void getAdminKakaoAtSendSlack(KakaoVO kakaoVO) {
	163	+ public void getAdminKakaoAtSendSlack(KakaoSendAdvcVO kakaoVO) {
163	164	HttpClient client = new HttpClient();
164	165	PostMethod post = new PostMethod(SLACK_URL);
165	166
...	...	@@ -537,7 +538,7 @@
537	538
538	539	// 조건 체크
539	540	if ("Y".equals(adminSmsNoticeYn) \|\| "Y".equals(atSmishingYn)) {
540		- kakaoVO.setAtSmishingYn(atSmishingYn); // MjonMsgVO에 스미싱 정보 설정
	541	+ kakaoVO.setAtSmishingYn("Y"); // MjonMsgVO에 스미싱 정보 설정
541	542
542	543	// 스미싱 알림 처리
543	544	return handleSmishingAlert(); // 알림 처리 결과 반환

...	...	@@ -117,6 +117,7 @@
117	117	MjonPayVO mjonPayVO = new MjonPayVO();
118	118	mjonPayVO.setCashId(idgenMjonCashId.getNextStringId());
119	119	mjonPayVO.setUserId(userId);
	120	+ System.out.println(" + totPrice :: "+ totPrice);
120	121	mjonPayVO.setCash(totPrice);
121	122	mjonPayVO.setFrstRegisterId(userId);
122	123	mjonPayVO.setMemo(memo);

...	...	@@ -702,6 +702,8 @@
702	702
703	703
704	704
	705	+ return false;
	706	+
705	707	var status = data.status;
706	708	if("OK" == status){
707	709	var resultSts = data.object.resultSts;
...	...	@@ -1505,7 +1507,7 @@
1505	1507	<div class="clearfix receipt_num receiver_wrap01">
1506	1508	<div class="receipt_num_top">
1507	1509	<label for="callTo" class="label">받는 번호입력</label>
1508		- <input type="text" id="callTo" name="callTo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="번호를 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='번호를 입력하세요'" style="width:340px;">
	1510	+ <input value="01083584250" type="text" id="callTo" name="callTo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="번호를 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='번호를 입력하세요'" style="width:340px;">
1509	1511	<button type="button" class="btnType btnType6 addCallToF">번호추가</button>
1510	1512	</br>
1511	1513	<span>

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import org.apache.commons.lang3.StringUtils;
4	4
	5	+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
5	6	import itn.let.kakao.kakaoComm.KakaoVO;
6	7	import itn.let.mjo.msg.service.MjonMsgVO;
7	8
...	...	@@ -36,10 +37,10 @@
36	37	/**
37	38	* 카카오톡 메시지 텍스트 포맷팅
38	39	*/
39		- public static String formatKakaoText(KakaoVO kakaoVO) {
40		- String smsTxt = kakaoVO.getTemplateContent();
41		- String reserveYn = safeGetString(kakaoVO.getReserveYn());
42		- String atDelayYn = safeGetString(kakaoVO.getAtDelayYn());
	40	+ public static String formatKakaoText(KakaoSendAdvcVO sendVO) {
	41	+ String smsTxt = sendVO.getTemplateContent();
	42	+ String reserveYn = safeGetString(sendVO.getReserveYn());
	43	+ String atDelayYn = safeGetString(sendVO.getAtDelayYn());
43	44
44	45	// 공통 텍스트 포맷팅 로직 적용
45	46	return formatMessagePrefix(smsTxt, reserveYn, "Y".equals(atDelayYn));
...	...	@@ -73,10 +74,10 @@
73	74	/**
74	75	* @카카오톡용 sandName 포맷팅 메서드
75	76	*/
76		- public static String formatKakaoSandName(KakaoVO kakaoVO) {
77		- String userId = kakaoVO.getUserId();
78		- String callFrom = kakaoVO.getCallFrom();
79		- String msgType = getKakaoMessageTypeLabel(kakaoVO.getMsgType());
	77	+ public static String formatKakaoSandName(KakaoSendAdvcVO sendVO) {
	78	+ String userId = sendVO.getUserId();
	79	+ String callFrom = sendVO.getCallFrom();
	80	+ String msgType = getKakaoMessageTypeLabel(sendVO.getMsgType());
80	81	return String.format("[%s][%s]%s", userId, callFrom, msgType);
81	82	}
82	83

...	...	@@ -1118,7 +1118,19 @@
1118	1118	.filter(num => num !== "")
1119	1119	.filter(num => isValidPhoneNumber(num)); // 유효한 번호만 필터링;
1120	1120
1121		- fn_phoneAddProcess(tableL, numbers);
	1121	+ console.log('numbers : ', numbers);
	1122	+ const addrData = processPhoneNumbers(numbers);
	1123	+
	1124	+
	1125	+ // 기존 tableL의 데이터를 가져옵니다.
	1126	+ var existingData = tableL.getData();
	1127	+
	1128	+ // 데이터 병합 및 중복 제거
	1129	+ const result = mergeAndValidateData(existingData, addrData);
	1130	+
	1131	+
	1132	+ // 테이블 데이터 업데이트
	1133	+ if (!updateTableData(tableL, result)) return false;
1122	1134
1123	1135	// textarea 초기화
1124	1136	textarea.val(''); // jQuery 객체에서 값을 초기화할 때는 .val('') 사용

Delete comment