From 150b8922e5f6947e2d95d718048465a5fc408213 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 18 Dec 2024 18:31:24 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 111 +++++++++--------- .../jsp/web/msgdata/MsgDataSMLView.jsp | 78 ++++++++---- src/main/webapp/js/web/msgdata/msgDataView.js | 6 +- 3 files changed, 112 insertions(+), 83 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 1bac0fa5..934e3cff 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -4275,63 +4275,60 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index 716820f0..5b210680 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -19,11 +19,11 @@ $(document).ready(function(){ - console.log(' + $(#tabDision).val() : ',$('#tabDision').val()) - if($('#tabDision').val() == 'tab02'){ - $('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생 - advMsgInsert(); - } +// console.log(' + $(#tabDision).val() : ',$('#tabDision').val()) +// if($('#tabDision').val() == 'tab02'){ +// $('#send_adYnY').prop('checked', true); // 상태 변경 및 이벤트 발생 +// advMsgInsert(); +// } //받는사람 연락처 내용 처리 //Tabulator AJAX Data Loading @@ -737,7 +737,7 @@ $(document).ready(function (){ if(blineCodeYn != 'N' && blineCodeYn != ''){ $('input[name="send_adYn"]').val(['Y']); $(".send_adYnN").css('display', 'none'); - advMsgInsert(); +// advMsgInsert(); } //미리보기 이미지 영역 숨김 처리 @@ -751,7 +751,7 @@ $(document).ready(function (){ //일반문자, 광고문자 텍스트 내용 추가해주기 $('input[name=send_adYn]').change(function(){ - advMsgInsert(); +// advMsgInsert(); }); @@ -766,7 +766,7 @@ $(document).ready(function (){ var contents = $(this).val(); var adrYn = $("input[name=send_adYn]:checked").val(); - if(adrYn == 'N'){ + /* if(adrYn == 'N'){ if((contents.indexOf("(광고)") > -1 && (contents.indexOf("무료거부") > -1 || contents.indexOf("무료 거부") > -1)) || contents.indexOf("(광고)") > -1){ @@ -783,10 +783,10 @@ $(document).ready(function (){ }else{ - fnByteString(contents); - } - + } */ + + fnByteString(contents); });//문자 바이트수 계산하기 끝 @@ -2062,7 +2062,9 @@ $(document).ready(function (){ }); }); -function advMsgInsert(){ +/* + * + function advMsgInsert(){ var advStr = '

(광고)

'; var advDenyStr = '

무료거부 0808800858

'; @@ -2099,14 +2101,14 @@ function advMsgInsert(){ //문자 바이트수 계산하기 fnByteString($('#smsTxtArea').val()); -} +} */ //문자 바이트수 계산하기 함수 function fnByteString(contents){ console.log(' : fnByteString : '); var totalByte = 0; //var content = contents; - var adverYn = $("input[name='send_adYn']:checked").val(); + var adverYn = $('#adverYn').val(); var adTxtLeng = 0; var denyTxtLeng = 0; var adverTxt = $('.ad_txt').html(); @@ -3237,7 +3239,7 @@ function fnTestSend(){ var loginVO = '${LoginVO}'; var spamStatus = false; var callFrom = $("#callFromList option:selected").val(); - var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부 + var adverYn = $('#adverYn').val(); //광고 체크여부 //로그인 체크 if(loginVO == "" || loginVO == null){ @@ -3890,6 +3892,8 @@ function getMjMsgSentListAll(pageNo) { "/> + +

@@ -3917,7 +3921,7 @@ function getMjMsgSentListAll(pageNo) { - + 발신번호 @@ -3972,14 +3976,30 @@ function getMjMsgSentListAll(pageNo) {
    + +

    (광고)

    +
    + +

    무료거부 0808800858

    +
    -

    - 0 / - 90byte -

    - 단문 +

    + + + + + 27 + + + 0 + + / + + 90byte +

    + 단문

    @@ -4309,8 +4329,18 @@ function getMjMsgSentListAll(pageNo) {
    -

    내용을 입력해주세요.

    - 
    
+								
+									
+										
    (광고)
    
+										
    
+										
    
+										
    무료거부 0808800858
    
+									    
+									
+										
    내용을 입력해주세요.
    
+										
    
+									    
+								    
 								
    
 							
    
 							
diff --git a/src/main/webapp/js/web/msgdata/msgDataView.js b/src/main/webapp/js/web/msgdata/msgDataView.js
index 0398bdc9..86d19cf8 100644
--- a/src/main/webapp/js/web/msgdata/msgDataView.js
+++ b/src/main/webapp/js/web/msgdata/msgDataView.js
@@ -737,7 +737,8 @@ function fn_saveMyMsg(){ // 내 문자 보관함 저장
 	
 	var form = document.msgForm;
 	var myImgFileId = [];			//신규 이미지 추가 파일 Id 저장 변수
-	var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
+//	var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
+	var adverYn = $('#adverYn').val(); //광고 체크여부
 	
 	/*
 		이미지 에디터를 사용하여 추가한 경우 이미지 업로드 처리 - 단 에디터에서 템플릿을 선택한 경우는 업로드안함
@@ -1132,7 +1133,8 @@ function fn_sendMsgData(){
 	form.callFrom.value = removeDash($('#callFromList').val()); // 발신번호 대쉬(-) 문자 없애주기
 
 	//광고 종류 설정
-	var adverYn = $("input[name='send_adYn']:checked").val();
+	// var adverYn = $("input[name='send_adYn']:checked").val();
+	var adverYn = $('#adverYn').val();
 	if(adverYn == 'Y'){
 		form.msgKind.value = "A"; //광고문자 종류 설정
 	}else{

From 378ffc94ccada561dc8f294a61febc857e781031 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" 
Date: Wed, 18 Dec 2024 19:35:37 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EC=83=88=EB=A1=9C=EC=9A=B4=20=ED=8D=BC=EB=B8=94=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/web/msgdata/MsgDataSMLView.jsp        | 22 ++++++++++++-------
 .../WEB-INF/jsp/web/msgdata/MsgDataView.jsp   |  6 ++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 5b210680..ce355d46 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -2112,10 +2112,8 @@ function fnByteString(contents){
 	var adTxtLeng = 0;
 	var denyTxtLeng = 0;
 	var adverTxt = $('.ad_txt').html();
-	console.log('adverTxt : ', adverTxt);
 	var denyTxt = $('.deny_txt').html();
-	console.log('denyTxt : ', denyTxt);
-// 	totRows = tableL.getRows().length;
+	totRows = tableL.getRows().length;
 
 	//광고문자 상단 문구 줄바꿈 처리하기(문자길이 바이트수 계산을 위해서)
 	if(typeof adverTxt !='undefined' && adverTxt != null){
@@ -2261,6 +2259,7 @@ function fnByteString(contents){
 		fnReplCell_advc();
 		
 	}else{
+		console.log('totRows : ', totRows);
 		var totalPrice  = totalPriceSum(totRows);
 		$('#totalPrice').text(totalPrice);
 		$('#txtReplYn').val("N");
@@ -3895,12 +3894,19 @@ function getMjMsgSentListAll(pageNo) {
 		
 		
 	
-	    
    
-	        
    
-				${tabDision eq 'tab01' ? '문자전송' : (tabDision eq 'tab02' ? '대량문자/단체문자 발송' : '')}
+		
    
+			
    
+				
+					
+						일반문자  i광고성 메시지는 [대량문자] 탭을 이용해주세요
+					
+					
+						대량문자(광고문자)
+			
+					
+				
 			
    
-	        
-	        
+			
 	    
    
 	    
    
 	        
    
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
index 589255cc..489711dd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
@@ -80,15 +80,15 @@
             
             
      
                 
    • 
-                	
+                	
                 
      • 
                 
    • 
-                	
+                	
                 
      • 
             
    
 			
 			
-			
    
+			
    
 			
 			
 			

From 8d8e095a5c2abc779deae56b11619ac8fdaabc63 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" 
Date: Wed, 18 Dec 2024 19:44:25 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20000,000=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp
index da250be8..c78cfbb3 100644
--- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp
@@ -685,7 +685,7 @@ function listAddrTransHistAjax(pageNo) {
 				
 			
    
 <%-- 			
    폴더 열림전체[${addrTotalCount }/최대 1,000,000]
     --%>
-			
    폴더 열림전체[${addrTotalCount }/최대 1,000,000]
    
+			
    폴더 열림전체[/최대 1,000,000]
    
 		
    
 		
    
 			
    
@@ -704,13 +704,13 @@ function listAddrTransHistAjax(pageNo) {
 			
    
 				
 				
-				
    폴더 닫힘그룹미지정[명]
    
+				
    폴더 닫힘그룹미지정[명]
    
 			
    
 			
 			
    
 				
 				
-				
    폴더 닫힘자주보내는 번호[명]
+				
    폴더 닫힘자주보내는 번호[명]
 			
    
 			
 				
    
@@ -721,7 +721,7 @@ function listAddrTransHistAjax(pageNo) {
 					
    ');">
 						폴더 닫힘
 						
-						[명]
+						[명]
 					
    
 					
 					

From 4c449d49a02f63b6f0d142a3a55130831d1be9dc Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" 
Date: Wed, 18 Dec 2024 20:10:22 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=ED=8D=BC=EB=B8=94=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=EC=9D=B8=ED=95=B4=20=EA=B4=91=EA=B3=A0?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addr/service/impl/AddrServiceImpl.java    | 26 ++++++++++++++++---
 .../service/impl/MjonMsgDataServiceImpl.java  |  3 ++-
 .../webapp/WEB-INF/jsp/web/addr/AddrList.jsp  |  2 +-
 .../WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp  |  2 +-
 .../jsp/web/msgdata/MsgDataSMLView.jsp        |  4 +--
 src/main/webapp/js/web/msgdata/msgDataView.js |  4 +--
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java
index f98dec2f..f1437a01 100644
--- a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java
+++ b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java
@@ -70,8 +70,8 @@ public class AddrServiceImpl  extends EgovAbstractServiceImpl implements AddrSer
     private static final Charset EUC_KR = Charset.forName("EUC-KR");
 //    private static final int MAX_ADDR_CNT = 500000;
     //임시 500만개
-    private static final int MAX_SINGLE_ENTRY_CNT = 350000;
-    private static final int MAX_ADDR_CNT = 10000000;
+    private static final int MAX_SINGLE_ENTRY_CNT = 300000;
+    private static final int MAX_ADDR_CNT = 1000000;
     private static final int BATCH_SIZE = 5000;
     private static final int THREAD_COUNT = 3;
 	
@@ -413,7 +413,7 @@ public class AddrServiceImpl  extends EgovAbstractServiceImpl implements AddrSer
 		if(addrListVO.size() > MAX_SINGLE_ENTRY_CNT) {
 			return new StatusResponse(
 					HttpStatus.BAD_REQUEST
-					, "주소록은 한번에 100만개까지만 등록이 가능합니다."
+					, "주소록은 한번에 30만개까지만 등록이 가능합니다."
 					, LocalDateTime.now()
 					);
 			
@@ -421,7 +421,25 @@ public class AddrServiceImpl  extends EgovAbstractServiceImpl implements AddrSer
 		// step1 현재 주소록 갯수 조회
 
 		//회원별 주소록 전체 갯수 조회
+		// 시작 시간 기록
+		long startTime22 = System.nanoTime();
 		int addrBefCnt = addrDAO.selectAddrTotalCount(addrListVO.get(0));    		
+
+		// 종료 시간 기록
+		long endTime22 = System.nanoTime();
+		
+		// 소요 시간 계산 (나노초 단위)
+		long durationNano = endTime22 - startTime22;
+		
+		// 나노초를 초로 변환
+		double durationSeconds = durationNano / 1_000_000_000.0;
+
+		// 초를 분과 초로 변환
+		long minutes = (long) durationSeconds / 60;
+		double seconds = durationSeconds % 60;
+		
+		System.out.printf("프로세스 실행 시간: %d분 %.3f초\n", minutes, seconds);
+		
 		int addrNewCnt = addrListVO.size();	//신규 추가할 주소록 갯수
 		int sumAddrCnt = addrBefCnt + addrNewCnt;	
 
@@ -429,7 +447,7 @@ public class AddrServiceImpl  extends EgovAbstractServiceImpl implements AddrSer
 		if(sumAddrCnt > MAX_ADDR_CNT) {
 			return new StatusResponse(
 							HttpStatus.BAD_REQUEST
-							, "주소록은 총 1000만개까지만 등록이 가능합니다."
+							, "주소록은 총 100만개까지만 등록이 가능합니다."
 							, LocalDateTime.now()
 							);
 					
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 a81eda09..fc4bf98d 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
@@ -3983,7 +3983,8 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
 		}
 		mjonMsgVO.setSmsTxt(smsTxt);
 
-		log.debug(" :: smsTxt :: [{}]", smsTxt);
+		
+//		log.debug(" :: smsTxt :: [{}]", smsTxt);
 
 		StatusResponse statusResponse = new StatusResponse();
 		mjonMsgVO = setImagesSetting(mjonMsgVO, statusResponse);
diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
index 76f776b5..66f11404 100644
--- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
@@ -420,7 +420,7 @@ function setSenderList_advc(){
                             sendBatch(); // 다음 배치 전송
                         }
                     } else {
-                        alert("오류 알림 : " + data.message);
+                        alert(data.message);
                     }
                 },
                 error: function (e) {
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp
index ef463f53..5a4010f4 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp
@@ -443,7 +443,7 @@ function setSenderList_advc(){
                             sendBatch(); // 다음 배치 전송
                         }
 					} else {
-						alert("오류 알림 : " + data.message);
+						alert(data.message);
 					}
 				}
 				,error: function (e) { 
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index ce355d46..bc05f9fd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -2108,7 +2108,7 @@ function fnByteString(contents){
 	console.log(' : fnByteString : ');
 	var totalByte = 0; 
 	//var content = contents;
-	var adverYn = $('#adverYn').val();
+	var adverYn = $('#send_adYn').val();
 	var adTxtLeng = 0;
 	var denyTxtLeng = 0;
 	var adverTxt = $('.ad_txt').html();
@@ -3238,7 +3238,7 @@ function fnTestSend(){
 	var loginVO = '${LoginVO}';
 	var spamStatus = false;
 	var callFrom = $("#callFromList option:selected").val();
-	var adverYn = $('#adverYn').val(); //광고 체크여부
+	var adverYn = $('#send_adYn').val(); //광고 체크여부
 	
 	//로그인 체크
 	if(loginVO == "" || loginVO == null){
diff --git a/src/main/webapp/js/web/msgdata/msgDataView.js b/src/main/webapp/js/web/msgdata/msgDataView.js
index 86d19cf8..8a3e30a8 100644
--- a/src/main/webapp/js/web/msgdata/msgDataView.js
+++ b/src/main/webapp/js/web/msgdata/msgDataView.js
@@ -738,7 +738,7 @@ function fn_saveMyMsg(){ // 내 문자 보관함 저장
 	var form = document.msgForm;
 	var myImgFileId = [];			//신규 이미지 추가 파일 Id 저장 변수
 //	var adverYn = $("input[name='send_adYn']:checked").val(); //광고 체크여부
-	var adverYn = $('#adverYn').val(); //광고 체크여부
+	var adverYn = $('#send_adYn').val(); //광고 체크여부
 	
 	/*
 		이미지 에디터를 사용하여 추가한 경우 이미지 업로드 처리 - 단 에디터에서 템플릿을 선택한 경우는 업로드안함
@@ -1134,7 +1134,7 @@ function fn_sendMsgData(){
 
 	//광고 종류 설정
 	// var adverYn = $("input[name='send_adYn']:checked").val();
-	var adverYn = $('#adverYn').val();
+	var adverYn = $('#send_adYn').val();
 	if(adverYn == 'Y'){
 		form.msgKind.value = "A"; //광고문자 종류 설정
 	}else{