From 6aa562db2daa053be8f02fdee340af4b9ecee181 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 15 Apr 2025 14:43:58 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 93e975b8..d5a05e8c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -40,11 +40,6 @@

총 발송건수 건

diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp index c00dd4d1..92cd1c47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp @@ -796,7 +796,7 @@ function previewPhone(){
- +
@@ -889,14 +889,14 @@ function previewPhone(){ -
+ " /> - - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp index cc94834b..4a85e26b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp @@ -21,7 +21,7 @@ $(document).ready(function(){ //초기 전체 리스트 페이지 보여주기 var form = document.searchForm; form.listType.value = "groupList"; - linkPage(1); + linkPage(); var date = new Date() ; //이전달 첫날/마지막날 조회 @@ -246,33 +246,6 @@ $(document).on('click', '.msgGgoupList', function(){ }); -function fnReSendMsg(){ - - var msgSeq = []; - if($("input:checkbox[name='msgSentDel']").is(":checked")==false){ - alert("선택된 항목이 없습니다."); - return; - } - - $("input:checkbox[name='msgSentDel']:checked").each(function(index){ - - var disabledChk = $(this).prop('disabled'); - if(!disabledChk){ //checkbox disabled 인 것은 제외하고 아이디 저장 - - msgSeq[index] = $(this).val(); - } - - }); - - var form = document.reSendForm; - form.msgSeqList.value = msgSeq; - form.msgResendFlag.value = "Y"; - - form.action="/web/mjon/msgdata/selectMsgDataView.do"; - form.submit(); - -} - /* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */ function fnShowPrintPopup(tabType, type) { //만들려는 팝업의 크기 @@ -382,6 +355,18 @@ function fnDelete(){ } +function fn_sentDetailView(msgGroupId) { + // msgGroupId 값을 form에 설정 + $("#searchForm #msgGroupId").val(msgGroupId); + + $('#ntceBgnde').val($('#startDate').val()); + $('#ntceEndde').val($('#endDate').val()); + + // form을 해당 URL로 제출 + $("#searchForm").attr("action", "/web/kakao/sent/selectKakaoSentDetailView.do"); + $("#searchForm").submit(); +} + @@ -426,7 +411,9 @@ function fnDelete(){
- + "/> +<%-- " /> --%> + " /> " /> " /> @@ -649,10 +636,6 @@ function fnDelete(){ -
- - -
From dec127bd4f5683228b7900d98f59645a184549eb Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 15 Apr 2025 17:15:05 +0900 Subject: [PATCH 6/9] Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/hylee/mjon_git into master_tolag3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 글로벌 프로퍼티 원복 --- .../egovframework/egovProps/globals_local.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 568c0855..6a2e66bd 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -28,8 +28,8 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -#Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon -Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon +Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon +#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon Globals.UserName= mjonUr Globals.Password= mjon!@#$ #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon From 32d12f02d95007ad12ed6b04a8f188b25c9f4e3d Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 16 Apr 2025 09:52:47 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20500=20->=2030=EB=A7=8C=EA=B1=B4=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/kakao/kakaoComm/KakaoSendUtil.java | 4 ++-- .../kakaoAt/web/KakaoAlimTalkSendController.java | 16 ++++++++++++---- src/main/webapp/js/kakao/at/alimtalkExcel.js | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index 195a08cf..edf92d05 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -149,8 +149,8 @@ public class KakaoSendUtil { } /** @Step1-3: 템플릿 치환데이터 설정 */ - String templateContentTemp = ""; - String templateTitleTemp = ""; + String templateContentTemp = templateContent; + String templateTitleTemp = templateTitle; if (hasContentReplacement) { templateContentTemp = mjonCommon.ATReplaceTemplateVariables(templateContent, variables); if(hasTitleReplacement) { diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java index 3f30a8b3..cf1641b3 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java @@ -550,8 +550,8 @@ public class KakaoAlimTalkSendController { HSSFWorkbook workbook = new HSSFWorkbook(files.get(0).getInputStream()); HSSFSheet sheet = workbook.getSheetAt(0); - if(sheet.getLastRowNum() > 501) { - errMessage = "한번에 전송 가능한 최대 발송건은 500건 입니다."; + if(sheet.getLastRowNum() > 300000) { + errMessage = "한번에 전송 가능한 최대 발송건은 300,000건 입니다."; jr.setSuccess(false); jr.setMessage(errMessage); return jr; @@ -683,12 +683,20 @@ public class KakaoAlimTalkSendController { } - if(totRowDataCnt > 501) { // - errMessage = "한번에 전송 가능한 최대 발송건은 500건 입니다."; +// if(totRowDataCnt > 501) { // +// errMessage = "한번에 전송 가능한 최대 발송건은 500건 입니다."; +// jr.setSuccess(false); +// jr.setMessage(errMessage); +// return jr; +// } + + if(sheet.getLastRowNum() > 300000) { + errMessage = "한번에 전송 가능한 최대 발송건은 300,000건 입니다."; jr.setSuccess(false); jr.setMessage(errMessage); return jr; } + List> json = new ArrayList>(); diff --git a/src/main/webapp/js/kakao/at/alimtalkExcel.js b/src/main/webapp/js/kakao/at/alimtalkExcel.js index 93867c7d..78e8524e 100644 --- a/src/main/webapp/js/kakao/at/alimtalkExcel.js +++ b/src/main/webapp/js/kakao/at/alimtalkExcel.js @@ -295,7 +295,8 @@ function excelAddVarAjax(){ //변수명 추출해주기 var varListArr = []; varListArr = form.excelVarList.value.split(","); - + + var forBreakB = true $.each(data, function(i, item){ if(checkHpNum(item.phone)){ @@ -319,8 +320,11 @@ function excelAddVarAjax(){ var bodyData = varValArr[i]; // 기타변수는 50자리 까지 입력 - if(bodyData.length > 100 || bodyData.length == 0){ - alert("등록 변수[ "+varListArr[i]+" ] \n기타변수의 입력 값이 없거나 100자리를 초과하는 내용이 포함되어 해당 내용 제외되었습니다."); + if(bodyData.length > 100 || bodyData.length == 0 ){ + if(forBreakB){ + alert("등록 변수[ "+varListArr[i]+" ] \n기타변수의 입력 값이 없거나 100자리를 초과하는 내용이 포함되어 해당 내용 제외되었습니다."); + forBreakB = false; + } lengthCheck = false; break; } From 65c2fb17832ca4a63ceb451d6a77c4bb1ef2418a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 16 Apr 2025 11:36:35 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20>=20=EB=B2=88=ED=98=B8=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=2030?= =?UTF-8?q?=EB=A7=8C=EA=B1=B4=20=EC=A0=9C=ED=95=9C=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=ED=9B=84=20alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/js/kakao/at/tabulator.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/webapp/js/kakao/at/tabulator.js b/src/main/webapp/js/kakao/at/tabulator.js index 051e09bd..6a3947c1 100644 --- a/src/main/webapp/js/kakao/at/tabulator.js +++ b/src/main/webapp/js/kakao/at/tabulator.js @@ -132,6 +132,17 @@ $(document).ready(function (){ + // ⬇️ 기존 tableL 데이터 개수 확인 + var existingData = tableL.getData(); + var totalCount = existingData.length + numbers.length; + + // ⬇️ 30만건 초과 시 경고 및 중단 + if (totalCount > 300000) { + alert("안정적인 서비스 운영을 위해서 최대 300000건 이내로 분할 발송해 주시기 바랍니다."); + return; + } + + const formattedData = numbers.map(num => ({phone: num})); // 기존 tableL의 데이터를 가져옵니다. From b08aeadb762d7cb79d9a064e0d8d4c4ee279021b Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 16 Apr 2025 15:30:29 +0900 Subject: [PATCH 9/9] =?UTF-8?q?5114=20=EA=B7=B8=EB=A6=BC=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=9D=BC=EB=95=8C=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EC=97=86?= =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=EB=AC=B8=EC=9E=90=EC=97=90=20null=20?= =?UTF-8?q?=EB=93=A4=EC=96=B4=EA=B0=80=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index efade919..bde8f50c 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -3980,6 +3980,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M } String smsTxt = mjonMsgVO.getSmsTxtArea(); + smsTxt = StringUtils.isEmpty(smsTxt) ? "" : smsTxt; // 광고문자면 처리 - 광고 A if ("A".equals(mjonMsgVO.getMsgKind())) { smsTxt = "(광고)" + smsTxt + "\n" + "무료거부 0808800858"; @@ -3987,7 +3988,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mjonMsgVO.setSmsTxt(smsTxt); -// log.debug(" :: smsTxt :: [{}]", smsTxt); + log.debug(" :: smsTxt :: [{}]", smsTxt); StatusResponse statusResponse = new StatusResponse();