From 4c449d49a02f63b6f0d142a3a55130831d1be9dc Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 18 Dec 2024 20:10:22 +0900 Subject: [PATCH] =?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{