From 2627b4a1c709c37c3ac50d583e88051748b9c2fc Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 17 Jan 2024 09:27:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=B9=9C?= =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=EB=B0=9C=EC=86=A1=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=A0=84=EB=8B=AC=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/kakao/kakaoComm/KakaoSendUtil.java | 7 +-- .../web/KakaoFriendsTalkSendController.java | 47 +++++++++++++++++-- .../ft/KakaoFriendsTalkMsgDataView.jsp | 33 +++++++++++-- 3 files changed, 75 insertions(+), 12 deletions(-) diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index c7c91967..fd701f62 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -382,8 +382,6 @@ public class KakaoSendUtil { } - System.out.println(tmpContents); - return tmpContents; } @@ -396,17 +394,14 @@ public class KakaoSendUtil { public String getKakaoFTCntRepToSpamFilter(List varValList, List resultSpamTxt, String contents) throws Exception { String spmFilterTxt = ""; for(int i=0; i < varValList.size(); i++) { - //String[] array = varValList.get(i)[0].split("¶"); + String tmpContents = getKakaoFTCntReplace(varValList.get(i)[0], contents); - System.out.println(tmpContents); //입력 문장에 대해서 우회 문장 또는 특수 기호 입력 제거 등 문장 재구성 처리, 한글 자모음 분리 및 재조함도 함께 처리함. String resultParser = ComGetSpamStringParser.getSpamTextParse(tmpContents).trim(); //List jasoList = HangulParser.disassemble(resultParser); //String assembleStr = HangulParser.assemble(jasoList); - System.out.println("++++++++++++++ spam resultParser ::: "+resultParser); - //데이터베이스에 등록된 스팸문구와 일치하는 단어/문구가 있는지 체크함. int spmCnt = 0; for(String spmTxt : resultSpamTxt) { diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java index 98cb0762..5d13a94a 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java @@ -22,6 +22,7 @@ import itn.com.cmm.EgovMessageSource; import itn.com.cmm.LoginVO; import itn.com.cmm.util.MJUtil; import itn.com.utl.fcc.service.EgovStringUtil; +import itn.let.kakao.kakaoComm.KakaoButtonVO; import itn.let.kakao.kakaoComm.KakaoSendUtil; import itn.let.kakao.kakaoComm.KakaoVO; import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService; @@ -335,20 +336,60 @@ public class KakaoFriendsTalkSendController { System.out.println("++++++++++++++++++++++ imageFileName ::: "+kakaoVO.getImageFileName()); System.out.println("++++++++++++++++++++++ adFlag ::: "+kakaoVO.getAdFlag()); System.out.println("++++++++++++++++++++++ templateContents ::: "+kakaoVO.getTemplateContent()); + System.out.println("++++++++++++++++++++++ templateImageUrl ::: "+kakaoVO.getTemplateImageUrl()); System.out.println("++++++++++++++++++++++ kakaoFtPrice ::: "+kakaoVO.getKakaoFtPrice()); System.out.println("++++++++++++++++++++++ eachPrice ::: "+kakaoVO.getEachPrice()); System.out.println("++++++++++++++++++++++ totPrice ::: "+kakaoVO.getTotalPrice()); + + for(KakaoButtonVO buttonVO : kakaoVO.getButtonVOList()) { + + System.out.println("++++++++++++++ button Name ::: "+buttonVO.getName()); + System.out.println("++++++++++++++ button type :::"+ buttonVO.getLinkType()); + System.out.println("++++++++++++++ button pc :::"+ buttonVO.getLinkPc()); + System.out.println("++++++++++++++ button mobile :::"+ buttonVO.getLinkMo()); + System.out.println("++++++++++++++ button android :::"+ buttonVO.getLinkAnd()); + System.out.println("++++++++++++++ button ios :::"+ buttonVO.getLinkIos()); + + } + List varValList = new ArrayList(); - System.out.println(kakaoVO.getTxtReplYn()); + System.out.println("+++++++++++++++ txtReplYn ::: "+kakaoVO.getTxtReplYn()); - /*for(List varValList : kakaoVO.getVarValList()) { + varValList = kakaoVO.getVarValList(); + + for(int i=0; i < varValList.size(); i++) { - } */ + String tmpVar = varValList.get(i)[0]; + System.out.println("+++++++++++++ tmpVar ::: "+tmpVar); + + } + + for(String callTo : kakaoVO.getCallToList()) { + + System.out.println("++++++++++++ callTo ::: "+callTo); + + } + + System.out.println("++++++++++++++++ spamStatus ::: "+kakaoVO.getSpamStatus()); + + System.out.println("++++++++++++++++ 대체문자 사용 여부 ::: "+kakaoVO.getSubMsgSendYn()); + + System.out.println("++++++++++++++++ 발신번호 ::: "+kakaoVO.getCallFrom()); + System.out.println("++++++++++++++++ 대체문자 내용 ::: "+kakaoVO.getSmsTxtArea()); + + System.out.println("++++++++++++++++ 대체문자 타입 ::: "+kakaoVO.getSubMsgType()); + + System.out.println("++++++++++++++++ 예약문자 여부 ::: "+kakaoVO.getReserveYn()); + + System.out.println("++++++++++++++++ 예약 시간 ::: "+kakaoVO.getReqDate()); + + modelAndView.addObject("result", "success"); + modelAndView.addObject("resultSts", kakaoVO.getCallToList().length); return modelAndView; } diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp index a86bda38..a31025cb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp @@ -806,9 +806,6 @@ function fn_sendMsgData(){ var rtnStr = strChinJpnCheck(tmpContents); - console.log(tmpContents); - console.log("+++++++++++ emojiCheck ::: "+emojiCheck(tmpContents)); - //문자내용에 이모지가 있는지 체크 if(!emojiCheck(tmpContents)) return false; @@ -1130,6 +1127,7 @@ function fn_sendMsgData(){ var adFlag = $("input[name=ad_flag]:checked").val(); $("#adFlag").val(adFlag); + //치환문자에 대한 데이터 누락 체크 if(!varValStatus){ alert("특정문구 일괄변환에 대한 일부 데이터가 누락된 부분이 있습니다. 데이터를 확인해 주세요."); @@ -1349,6 +1347,8 @@ function thisFnByteString(contents){ // $('.msg_title').addClass('active'); //document.getElementById("mmsSubject").disabled = false; + $("#subMsgType").val("LMS"); + }else{ $('#msgLeng').html(conLeng + " / "); @@ -1360,11 +1360,18 @@ function thisFnByteString(contents){ $('.msg_com').addClass("msg_short"); // 장문 클래스 삽입 // $('.put_left').addClass("short"); // 내용 입력 박스에 클래스 삽입 // $('.msg_title, .title_wrap .textbox').removeClass('active'); + $("#subMsgType").val("SMS"); } } +function msgSuccessClose(obj){ + $(obj).closest('.pop_msg_success').attr('style',''); + location.reload(true); + $('html').scrollTop(0); +} + @@ -1424,11 +1431,14 @@ function thisFnByteString(contents){ + + + @@ -2093,6 +2103,23 @@ function thisFnByteString(contents){ + +
+
+
+

알람톡 전송 결과

+ +
+
+
발송 성공 : 1 건,수신거부 : 0건의
문자가 발송 되었습니다.
+
+
+ + +
+
+
+