From ade28c695d1db13e38dd075e55073612a830d63a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 16 Jan 2025 11:19:45 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EA=B8=B0=200=EA=B0=92=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp | 2 +- .../jsp/web/msgcampain/include/msgDataIncludeExcel.jsp | 2 +- .../WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp | 3 ++- src/main/webapp/js/user/fax/addr/event.js | 4 +++- src/main/webapp/js/user/fax/exelUpload.js | 4 +++- src/main/webapp/js/web/addr/event.js | 4 +++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp index d884a104..0aeadc53 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp @@ -516,7 +516,7 @@ $(document).ready(function(){ var updatedData = currentData.map(row => { var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] ?? ""; }); return newRow; }); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp index 936d538e..e7b72e9a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp @@ -501,7 +501,7 @@ function updateTableFields($objTabul) { var updatedData = currentData.map(row => { var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] ?? ""; }); return newRow; }); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp index e73d8aa2..3016456a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp @@ -554,9 +554,10 @@ function updateTableFields($objTabul) { }); var updatedData = currentData.map(row => { + console.log('row : ', row); var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] ?? ""; }); return newRow; }); diff --git a/src/main/webapp/js/user/fax/addr/event.js b/src/main/webapp/js/user/fax/addr/event.js index 2cd211f9..3b35b9c7 100644 --- a/src/main/webapp/js/user/fax/addr/event.js +++ b/src/main/webapp/js/user/fax/addr/event.js @@ -303,7 +303,9 @@ $(document).ready(function(){ var updatedData = currentData.map(row => { var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined + ? row[Object.keys(row)[index]] + : ""; }); return newRow; }); diff --git a/src/main/webapp/js/user/fax/exelUpload.js b/src/main/webapp/js/user/fax/exelUpload.js index 526f148b..9a825021 100644 --- a/src/main/webapp/js/user/fax/exelUpload.js +++ b/src/main/webapp/js/user/fax/exelUpload.js @@ -367,7 +367,9 @@ function updateTableFields(objTabul) { var updatedData = currentData.map(row => { var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined + ? row[Object.keys(row)[index]] + : ""; }); return newRow; }); diff --git a/src/main/webapp/js/web/addr/event.js b/src/main/webapp/js/web/addr/event.js index 83e39e46..b3043ec1 100644 --- a/src/main/webapp/js/web/addr/event.js +++ b/src/main/webapp/js/web/addr/event.js @@ -364,7 +364,9 @@ $(document).ready(function(){ var updatedData = currentData.map(row => { var newRow = {}; fieldMapping.forEach((field, index) => { - newRow[field] = row[Object.keys(row)[index]] || ""; + newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined + ? row[Object.keys(row)[index]] + : ""; }); return newRow; }); From e0a04b9ce5796d3e1a0967e3d3aae59b3d02ec14 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 16 Jan 2025 12:15:09 +0900 Subject: [PATCH 2/9] =?UTF-8?q?ec=EB=A1=9C=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20http://pms.iten.co.kr:9999/issues/4573?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/itn/let/uss/umt/web/EgovUserManageController.java | 3 --- .../WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index adf40c21..d865874c 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1225,9 +1225,6 @@ public class EgovUserManageController { vo.setCodeId("ITN024"); model.addAttribute("flowTypeCode", cmmUseService.selectCmmCodeDetail(vo)); - vo.setCodeId("ITN056"); - model.addAttribute("smsSandCode", cmmUseService.selectCmmCodeDetail(vo)); - //최근 발송 문자 내용 불러오기 - 최근 3개 내역만 List mjonMsgSentList = mberManageService.selectMberMsgSentLatestListNew20240320(userId); diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index c1416d90..e8aa3a6a 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -21,6 +21,7 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> <% pageContext.setAttribute("newLineChar", "\r\n"); %> <% pageContext.setAttribute("newLineChar2", "\n"); %> <% String serverName = request.getServerName(); %> @@ -6075,13 +6076,15 @@ function fnInputSmsTxt(){
    • --%> - - + --%> 0 / 90byte From 9eb105712811cd9fcd49e2578ae34ebf4b18ac12 Mon Sep 17 00:00:00 2001 From: wyh Date: Thu, 16 Jan 2025 15:03:03 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=8A=AC?= =?UTF-8?q?=EB=9E=99=20=EB=85=B8=EC=B6=9C=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 c0295a74..bb32b5d1 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 @@ -140,6 +140,9 @@ public class KakaoAlimTalkSendController { @Autowired KakaoApiJsonSave kakaoApiJsonSave; + + @Autowired + private MjonCommon mjonCommon; @RequestMapping(value= {"/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do"}) public String KakaoAlimtalkMsgDataView(ModelMap model @@ -1385,8 +1388,7 @@ public class KakaoAlimTalkSendController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - MjonCommon comm = new MjonCommon(); - comm.getAdminKakaoAtSandSlack(kakaoVO); + mjonCommon.getAdminKakaoAtSandSlack(kakaoVO); } From fc751432623a40a4376deb98ea724dfdd0d22299 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 16 Jan 2025 15:58:19 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=B2=88=ED=98=B8=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EC=8B=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=8A=AC=EB=9E=99?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=B1=84=EB=84=90=EB=A1=9C=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/phone/web/CertPhoneController.java | 6 ++- .../itn/let/mjo/mjocommon/MjonCommon.java | 51 +++++++++++++++++-- .../web/MjonMsgCampainDataController.java | 2 +- .../web/MjonMsgCampainHGDataController.java | 2 +- .../web/MjonMsgCampainTWDataController.java | 2 +- .../msgdata/service/MjonMsgDataService.java | 2 +- .../service/impl/MjonMsgDataServiceImpl.java | 22 +++++++- .../msgdata/web/MjonMsgDataController.java | 2 +- .../itn/let/mjo/test/web/TestController.java | 6 +-- .../let/uat/uia/web/EgovLoginController.java | 4 +- 10 files changed, 80 insertions(+), 19 deletions(-) diff --git a/src/main/java/itn/let/cert/phone/web/CertPhoneController.java b/src/main/java/itn/let/cert/phone/web/CertPhoneController.java index 4bef193e..ec19016e 100644 --- a/src/main/java/itn/let/cert/phone/web/CertPhoneController.java +++ b/src/main/java/itn/let/cert/phone/web/CertPhoneController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; @@ -158,7 +159,8 @@ public class CertPhoneController { @RequestMapping(value = {"/cert/phone/sendSysMsgDataAjax.do"}) - public ResponseEntity sendSysMsgDataAjax(MberCertPhoneVO mberCertPhoneVO) throws Exception { + public ResponseEntity sendSysMsgDataAjax(MberCertPhoneVO mberCertPhoneVO, + HttpServletRequest request) throws Exception { //로그인 권한정보 불러오기 @@ -178,7 +180,7 @@ public class CertPhoneController { MjonMsgVO mjonMsgVO = new MjonMsgVO(); mjonMsgVO.setCallTo(mberCertPhoneVO.getMbtlnum()); - MjonMsgReturnVO returnVO = mjonMsgDataService.sendSysMsgData(mjonMsgVO); + MjonMsgReturnVO returnVO = mjonMsgDataService.sendSysMsgData(mjonMsgVO, request); String resultSts = returnVO.getSendMsgCnt(); String resultBlockSts = returnVO.getSendMsgBlockCnt(); diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java index ddab7c8f..d3ba2d24 100644 --- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java +++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java @@ -63,16 +63,57 @@ public class MjonCommon { - - /** - * @methodName : getAdminSandSlack + * @methodName : getAdminMsgSandSlack * @author : 이호영 * @date : 2024.12.04 * @description : 기존 메소드 리펙토링 * @param mjonMsgVO */ - public void getAdminSandSlack(MjonMsgVO mjonMsgVO) { + public void getAdminSandSlack(String smsTxt, String sandName) { + + HttpClient client = new HttpClient(); + PostMethod post = new PostMethod(SLACK_URL); + + try { + // 메시지 내용 설정 + + // Slack 메시지 생성 + JSONObject json = new JSONObject(); + json.put("channel", SLACK_CHANNEL); + json.put("text", smsTxt); + json.put("username", sandName); + + // Slack 요청 + post.addParameter("payload", json.toString()); + post.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); + + // Slack 응답 처리 + int responseCode = client.executeMethod(post); + if (responseCode != HttpStatus.SC_OK) { + log.warn("Slack 메시지 전송 실패. Response: {}", post.getResponseBodyAsString()); + } + + } catch (IllegalArgumentException e) { + log.error("Slack 메시지 전송 중 IllegalArgumentException 발생", e); + } catch (IOException e) { + log.error("Slack 메시지 전송 중 IOException 발생", e); + } catch (Exception e) { + log.error("Slack 메시지 전송 중 Exception 발생", e); + } finally { + post.releaseConnection(); + } + } + + + /** + * @methodName : getAdminMsgSandSlack + * @author : 이호영 + * @date : 2024.12.04 + * @description : 기존 메소드 리펙토링 + * @param mjonMsgVO + */ + public void getAdminMsgSandSlack(MjonMsgVO mjonMsgVO) { HttpClient client = new HttpClient(); PostMethod post = new PostMethod(SLACK_URL); @@ -116,7 +157,7 @@ public class MjonCommon { * @작성자 : WYH * @Method 설명 : slack 메시지 전송 */ - /*public void getAdminSandSlack(MjonMsgVO mjonMsgVO) { + /*public void getAdminMsgSandSlack(MjonMsgVO mjonMsgVO) { HttpClient client = new HttpClient(); PostMethod post = new PostMethod(url); diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index c9e0cc03..7c754198 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -3289,7 +3289,7 @@ public class MjonMsgCampainDataController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java index 2edb53a5..1fa23672 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java @@ -1140,7 +1140,7 @@ public class MjonMsgCampainHGDataController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java index 32b3ccda..562192e3 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java @@ -2124,7 +2124,7 @@ public class MjonMsgCampainTWDataController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java index 023bb7a1..d5e4c1a5 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java @@ -188,7 +188,7 @@ public interface MjonMsgDataService { public StatusResponse sendMsgData_advc(MjonMsgVO mjonMsgVO, HttpServletRequest request) throws Exception; - public MjonMsgReturnVO sendSysMsgData(MjonMsgVO mjonMsgVO) throws Exception; + public MjonMsgReturnVO sendSysMsgData(MjonMsgVO mjonMsgVO, HttpServletRequest request) throws Exception; 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 a17c51b4..44822c0d 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 @@ -2,6 +2,7 @@ package itn.let.mjo.msgdata.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; +import java.net.URI; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -147,6 +148,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M @Autowired private MjonCommon mjonCommon; + public List selectCcmCmmCodeList() throws Exception { @@ -4172,7 +4174,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M if (isNotified) { System.out.println("스미싱 알림이 처리되었습니다."); - mjonCommon.getAdminSandSlack(mjonMsgVO); + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } else if("Y".equalsIgnoreCase(mjonMsgVO.getSpamStatus())){ System.out.println("==알림 예외 시간=="); mjonMsgDAO.insertSpamPassMsgData(mjonMsgVO); @@ -5022,7 +5024,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M } @Override - public MjonMsgReturnVO sendSysMsgData(MjonMsgVO mjonMsgVO) throws Exception { + public MjonMsgReturnVO sendSysMsgData(MjonMsgVO mjonMsgVO,HttpServletRequest request) throws Exception { @@ -5099,6 +5101,22 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mjonMsgDataService.insertSysMsgLog(sendLogVO); + + String fullUrl = request.getRequestURL().toString(); + try { + URI uri = new URI(fullUrl); + String domain = uri.getHost(); // www.munjaon.co.kr 반환 + + if(domain.indexOf("munjaon.co.kr") < 0) { + mjonCommon.getAdminSandSlack(contents, mjonMsgVO.getCallTo()); + } + + } catch (Exception e) { + } + + + + return returnVO; } diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index d24b3eaf..2a838d32 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -3449,7 +3449,7 @@ public class MjonMsgDataController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림 예외설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java index 6fa0dcc0..cbed937b 100644 --- a/src/main/java/itn/let/mjo/test/web/TestController.java +++ b/src/main/java/itn/let/mjo/test/web/TestController.java @@ -2175,14 +2175,14 @@ public class TestController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } //Slack으로 메세지 전송 처리 /*MjonCommon comm = new MjonCommon(); System.out.println("slack noti"); - comm.getAdminSandSlack(mjonMsgVO);*/ + comm.getAdminMsgSandSlack(mjonMsgVO);*/ } } /*else {//야간스미싱 알림 비활성화인 경우 - 알림일정에 포함되지 않으면 슬랙 발송 처리(알림일정에 포함되면 슬랙발송 X - 알림 비활성화이기 때문에 발송X) @@ -2211,7 +2211,7 @@ public class TestController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 MjonCommon comm = new MjonCommon(); - comm.getAdminSandSlack(mjonMsgVO); + comm.getAdminMsgSandSlack(mjonMsgVO); } diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 08566f62..87b3d301 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -3632,7 +3632,7 @@ public class EgovLoginController { */ @RequestMapping(value = { "/web/user/sendSysMsgDataAjax.do" }) public ModelAndView sendSysMsgDataAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO, - RedirectAttributes redirectAttributes, ModelMap model) throws Exception { + RedirectAttributes redirectAttributes, ModelMap model, HttpServletRequest request) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); @@ -3710,7 +3710,7 @@ public class EgovLoginController { - MjonMsgReturnVO returnVO = mjonMsgDataService.sendSysMsgData(mjonMsgVO); + MjonMsgReturnVO returnVO = mjonMsgDataService.sendSysMsgData(mjonMsgVO, request); resultSts = returnVO.getSendMsgCnt(); resultBlockSts = returnVO.getSendMsgBlockCnt(); From d2ed44a787eea50e9971f936ca22089d2c49e4ca Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 16 Jan 2025 16:20:28 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=ED=85=8D=EC=8A=A4=ED=8A=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 --- .../let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 44822c0d..44cbd0e2 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 @@ -5108,7 +5108,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M String domain = uri.getHost(); // www.munjaon.co.kr 반환 if(domain.indexOf("munjaon.co.kr") < 0) { - mjonCommon.getAdminSandSlack(contents, mjonMsgVO.getCallTo()); + mjonCommon.getAdminSandSlack(contents, "로그인 인증번호 "+mjonMsgVO.getCallTo()); } } catch (Exception e) { From 4cf5dce18ade369900e8385e04f355ff7604b128 Mon Sep 17 00:00:00 2001 From: Eunjipark Date: Fri, 17 Jan 2025 16:04:10 +0900 Subject: [PATCH 6/9] =?UTF-8?q?2025/01/17=20=EB=B0=9C=EC=86=A1=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/content.css | 12 + src/main/webapp/publish/guide_2022.html | 1 + .../webapp/publish/textingmsg_2025_list.html | 948 ++++++++++++++++++ 3 files changed, 961 insertions(+) create mode 100644 src/main/webapp/publish/textingmsg_2025_list.html diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 92c96256..5e75b14b 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -2353,6 +2353,18 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .spam_content .spam_conbox .spam_table tbody tr td{text-align: left;} .spam_content .spam_conbox .spam_table tbody tr td li .conlist8{padding: 0 0 0 18px;} +/*발송결과 수정_2025*/ +.price_wrap .table_tab_wrap .tab_btnbox .price_hover{width: 330px;} +.price_wrap .table_tab_wrap .tab_btnbox .price_hover .last{padding: 5px 0 0 0;} + +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont a{height: 16px;} +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont a:hover{text-decoration: underline;} +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont .icon_wrap{display: flex; align-items: center;} +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont .icon_wrap span{padding: 5px 8px; margin: 0 3px; border-radius: 20px; font-size: 14px;} +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont .icon_wrap .re{background-color: #e8f0ff; color: #2c5dd6;} +.price_wrap .current .tb_wrap .tType4 tbody tr .result_cont .icon_wrap .di{background-color: #e7f5ec; color: #359b59;} + + @keyframes rotate-loading { 0% {transform:rotate(0)} 100% {transform:rotate(360deg);} diff --git a/src/main/webapp/publish/guide_2022.html b/src/main/webapp/publish/guide_2022.html index 8ccf4e16..a204ee33 100644 --- a/src/main/webapp/publish/guide_2022.html +++ b/src/main/webapp/publish/guide_2022.html @@ -18,6 +18,7 @@
      +
    • textingmsg_2025_list.html[개선] 발송결과 수정
    • service3_spam_2024.html불법스팸방지정책 (2024.11.29)
    • service1_2024.html이용약관 (2024.11.29)
    • service1_2023.html이용약관 (2023.04.26~2024.11.28)
      • diff --git a/src/main/webapp/publish/textingmsg_2025_list.html b/src/main/webapp/publish/textingmsg_2025_list.html new file mode 100644 index 00000000..8dae8e3d --- /dev/null +++ b/src/main/webapp/publish/textingmsg_2025_list.html @@ -0,0 +1,948 @@ + + + + + + + 문자온_발송결과 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + +
      + 본문 바로가기 +
      + + +
      +
      +

      QUICK
      MENU

      +

      QUICK

      + + +
      +
      + + + + + + +
      +
      + +
      + +
      +
      +

      발송결과

      +
      + +
      + +
        +
      • +
        • +
        • +
      + +
      +
      + +
      +

      - 최대 3개월간의 발송내역만 확인하실 수 있습니다.

      +

      - 전송내역이 필요한 경우 기간 내에 다운로드하여 주시기 바랍니다.

      +

      - 단문문자는 최대 24시간, 장문 및 그림문자는 최대 72시간까지 결과값이 수신되지 않은 경우 실패(비과금) 처리됩니다.

      +
      + + +
      +
      +
      + 기간선택 +
      + + ~ + +
      + + + + +
      +
      + + + + +
      + + + +
      +
      +
      +
      + +
      +
      +
      +

      전체

      +

      134 건

      +
      + +
      +
      +
      대기
      +
      3건
      +
      +
      +
      성공
      +
      115건
      +
      +
      +
      실패
      +
      16건
      +
      +
      +
      +
      +
      +

      단문(SMS)

      +

      78 건

      +
      +
      +
      +
      대기
      +
      0건
      +
      +
      +
      성공
      +
      75건
      +
      +
      +
      실패
      +
      3건
      +
      +
      +
      +
      +
      +

      장문(LMS)

      +

      30 건

      +
      +
      +
      +
      대기
      +
      0건
      +
      +
      +
      성공
      +
      23건
      +
      +
      +
      실패
      +
      7건
      +
      +
      +
      +
      +
      +

      그림(MMS)

      +

      26 건

      +
      +
      +
      +
      대기
      +
      3건
      +
      +
      +
      성공
      +
      17건
      +
      +
      +
      실패
      +
      6건
      +
      +
      +
      +
      + +
      + +
        +
      • +
        • +
      • +
        • +
      • +
        • +
      • +
        • +
      + +
      + +
      + +
      + +
        +
        • +
        • +
        • +
      + + +
      + +
      +
      +
      [대기]
      +
      + 발송은 성공하였으며, 수신자측 통신사로부터 수신여부를 확인중인 상태
      + ※ 예약문자의 경우 실발송 전까지는 “대기”로 표시 +
      +
      [성공]
      +
      발송 및 수신이 완료된 상태
      +
      [실패]
      +
      결번, 일시정지, 전화번호 오류 등의 사유로 발송이 + 불가한 상태
      +
      +
      +
      + +
      + +
      +
      +

      총 171건

      +
      +

      ※ 예약문자 발송취소는 예약 발송시간 기준 5분 전까지만 가능

      + + + +
      +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      발송일시 +
      + +
      +       		형태 +
      + +
      +       		내용발송건수 +
      + +
      +       		발송결과금액(원)진행상황
      대기성공실패
      2024-01-09 17:42단문 +
      + 예약 + 분할 + 내용을 클릭하면 상세보기 화면으로 이동합니다. +
      +       		0 +

      0

      +       		+

      0

      +       		+

      0

      +       		+ 8,485,258 + +

      +
      2024-01-09 17:42단문 +
      + 예약 + 내용을 클릭하면 상세보기 화면으로 이동합니다. +
      +       		0 +

      0

      +       		+

      0

      +       		+

      0

      +       		-예약취소
      2024-01-09 17:42단문 +
      + 내용을 클릭하면 상세보기 화면으로 이동합니다. +
      +       		458,002 +

      1

      +       		+

      458,000

      +       		+

      1

      +       		12,580진행중
      2024-01-09 17:42단문 +
      + 내용을 클릭하면 상세보기 화면으로 이동합니다. +
      +       		458,002 +

      1

      +       		+

      458,000

      +       		+

      1

      +       		12,580완료
      +
      + + +
      + +
      + + +
        +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
        • +
      + +
      + + +
      +
      + + + + +
      +
      + +
      +
      + + +
      +
      +
      + +
      +
      +
      +
      +
      + +
      +

      주소 : 경기도 남양주시 다산중앙로 19번길 21 1027호, 1028호(블루웨일 지식산업센터 1차)

      +

      사업자번호 : 653-87-00858 ｜ 대표 : 유인식 ｜ 통신판매등록번호 : 제 다산-12345호 ｜ 문의전화 : 070-4786-0007

      +

      Copyright 2020 ⓒ MUNJAON co. Ltd, All rights reserved.

      +
      +
      + +
      +

      고객센터

      + 070-4786-0008 + E-mail : help@iten.co.kr +
      +
      +
      +
      +
      +
      + + + + \ No newline at end of file From 07531d995289f1377ab45d6c6c39c537da806d27 Mon Sep 17 00:00:00 2001 From: wyh Date: Fri, 17 Jan 2025 16:27:28 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EB=A7=9E=EC=B6=A4=EB=AC=B8=EC=9E=90,=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84=EC=86=A1,=20=EC=9D=B8?= =?UTF-8?q?=EA=B8=B0=EB=AC=B8=EC=9E=90(=EB=8B=A8=EB=AC=B8,=20=EC=9E=A5?= =?UTF-8?q?=EB=AC=B8,=20=EA=B7=B8=EB=A6=BC),=EC=A3=BC=EC=86=8C=EB=A1=9D=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/msgdata/MsgDataView.jsp | 34 +++++++- src/main/webapp/js/web/msgdata/msgDataView.js | 83 ++++++++++--------- 2 files changed, 78 insertions(+), 39 deletions(-) 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 e06bcf51..7f41a177 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp @@ -14,10 +14,40 @@ var msgResendAllFlag = "${msgResendAllFlag}"; var msgResendAllGroupId = "${msgResendAllGroupId}"; var msgResendAllReplaceYn = "${msgResendAllReplaceYn}"; +//맞춤제작 내보관함 이미지 선택시 처리 +var customImgFlag = '${customImgVO.customImgFlag}'; +var customAtchFileId = '${customImgVO.atchFileId1}'; +var customFileSn = '${customImgVO.fileSn}'; +var customStrImgPath = '${customImgVO.strImgPath}'; + +//메인화면 그림문자 이미지 선택시 처리 +var mainImgFlag = '${mainImgVO.mainImgFlag}'; +var mainAtchFileId = '${mainImgVO.atchFileId1}'; +var mainFileSn = '${mainImgVO.fileSn}'; +var mainStrImgPath = '${mainImgVO.strImgPath}'; + +//메인화면 인기문자 메세지 선택시 처리 +var mainLetterFlag = '${mainLetterVO.mainLetterFlag}'; +var mainSmsTxt = '${mainLetterVO.smsTxt}'; + +//공통 설정 +var cateNo = "${cateCodeVO.cateNo}"; +var mainLetterTypeFlag = '${searchVO.mainLetterTypeFlag}'; +var moreSamFlag = '${moreSampleYn}'; + +//문자 재전송 처리 +var msgResendFlag = '${reSendMsgVO.msgResendFlag}'; +var msgSeqList = []; +msgSeqList = '${reSendMsgVO.msgSeqList}'; + +//주소록에서 주소를 전송한 경우 처리 +var moveAddrFlag = '${addrVO.moveAddrFlag}'; +var addrIdList = []; +addrIdList = '${addrVO.addrIdList}'; + + $(document).ready(function(){ - console.log('loginVO : ', loginVO); - // 내보관함 리스트 로그인이 완료된 경우에만 로드되도록 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 a6a1c4fe..3e222fe8 100644 --- a/src/main/webapp/js/web/msgdata/msgDataView.js +++ b/src/main/webapp/js/web/msgdata/msgDataView.js @@ -225,20 +225,16 @@ function listMsgDataView(){ $('html').animate({scrollTop : offset.top}, 400); } - - } //메인화면 더많은 샘플보기 버튼 선택시 처리 - var moreSamFlag = '${moreSampleYn}'; - if(moreSamFlag == 'Y'){ //문자 샘플 탭 활성화 시키기 - var mainLetterTypeFlag = '${searchVO.mainLetterTypeFlag}'; + // var mainLetterTypeFlag = '${searchVO.mainLetterTypeFlag}'; var letterTab = '0'; - var cateNo = "${cateCodeVO.cateNo}"; + // var cateNo = "${cateCodeVO.cateNo}"; if(mainLetterTypeFlag == 'P'){ TabType2($('.tabType2 li').eq(1), '2'); }else{ @@ -278,10 +274,12 @@ function listMsgDataView(){ //메인화면 그림문자 이미지 선택시 처리 - var mainImgFlag = '${mainImgVO.mainImgFlag}'; + console.log('메인화면 그림문자 이미지 선택시 처리'); + console.log('mainImgFlag : ' + mainImgFlag); + // var mainImgFlag = '${mainImgVO.mainImgFlag}'; if(mainImgFlag == 'Y'){ //카테고리 처리 - var cateNo = "${cateCodeVO.cateNo}"; + // var cateNo = "${cateCodeVO.cateNo}"; $('.tDep2_cateCode').find('.on').removeClass('on'); $('.tDep2_cateCode a').each(function(index){ if($(this).attr('value') == cateNo){ @@ -289,72 +287,84 @@ function listMsgDataView(){ } }) - - var atchFileId = '${mainImgVO.atchFileId1}'; - var fileSn = '${mainImgVO.fileSn}'; - var strImgPath = '${mainImgVO.strImgPath}'; - - fnCustomImgSendMsg(atchFileId, fileSn, strImgPath); + // var atchFileId = '${mainImgVO.atchFileId1}'; + // var fileSn = '${mainImgVO.fileSn}'; + // var strImgPath = '${mainImgVO.strImgPath}'; + console.log('mainAtchFileId : ' + mainAtchFileId + + ' / mainFileSn : ' + mainFileSn + + ' / mainStrImgPath : ' + mainStrImgPath + ); + fnCustomImgSendMsg(mainAtchFileId, mainFileSn, mainStrImgPath); } //메인화면 인기문자 메세지 선택시 처리 - var mainLetterFlag = '${mainLetterVO.mainLetterFlag}'; + console.log('메인화면 인기문자 메세지 선택시 처리'); + console.log('mainLetterFlag : ' + mainLetterFlag); + // var mainLetterFlag = '${mainLetterVO.mainLetterFlag}'; if(mainLetterFlag == 'Y'){ var letterTab = '0'; //문자샘플 활성화 처리 TabType2($('.tabType2 li').eq(0), '1'); //단문,장문 탭 활성화 처리 - var mainLetterTypeFlag = '${searchVO.mainLetterTypeFlag}'; + // var mainLetterTypeFlag = '${searchVO.mainLetterTypeFlag}'; if(mainLetterTypeFlag == 'L'){ $('.tDep1_letType a').removeClass('on'); $('.tDep1_letType a').eq(1).addClass('on'); } //카테고리 활성화 처리 - var cateNo = "${cateCodeVO.cateNo}"; + // var cateNo = "${cateCodeVO.cateNo}"; $('.tDep1_cateCode').find('.on').removeClass('on'); $('.tDep1_cateCode a').each(function(index){ if($(this).attr('value') == cateNo){ $(this).addClass('on'); } }) - var smsTxt = '${mainLetterVO.smsTxt}'; - if(smsTxt != null){ + + // var smsTxt = '${mainLetterVO.smsTxt}'; + if(mainSmsTxt != null){ - smsTxt = smsTxt.replaceAll("
      ", "\n"); //줄발꿈문자 변환하기 - $("#smsTxtArea").val(smsTxt); - fnByteString(smsTxt); + mainSmsTxt = mainSmsTxt.replaceAll("
      ", "\n"); //줄발꿈문자 변환하기 + $("#smsTxtArea").val(mainSmsTxt); + fnByteString(mainSmsTxt); } } - //맞춤제작 내보관함 이미지 선택시 처리 - var customImgFlag = '${customImgVO.customImgFlag}'; + // 맞춤제작 내보관함 이미지 선택시 처리 + console.log('커스텀 문자정보'); + console.log('customImgFlag : ' + customImgFlag); + // var customImgFlag = '${customImgVO.customImgFlag}'; if(customImgFlag == 'Y'){ - var atchFileId = '${customImgVO.atchFileId1}'; - var fileSn = '${customImgVO.fileSn}'; - var strImgPath = '${customImgVO.strImgPath}'; - - fnCustomImgSendMsg(atchFileId, fileSn, strImgPath); + //var atchFileId = '${customImgVO.atchFileId1}'; + //var fileSn = '${customImgVO.fileSn}'; + //var strImgPath = '${customImgVO.strImgPath}'; + console.log(' customAtchFileId : ' + customAtchFileId + + ' / customFileSn : ' + customFileSn + + ' / customStrImgPath : ' + customStrImgPath + ); + fnCustomImgSendMsg(customAtchFileId, customFileSn, customStrImgPath); } //문자 재전송 처리 - var msgResendFlag = '${reSendMsgVO.msgResendFlag}'; - var msgSeqList = []; - msgSeqList = '${reSendMsgVO.msgSeqList}'; + console.log('문자 재전송 처리'); + // var msgResendFlag = '${reSendMsgVO.msgResendFlag}'; + // var msgSeqList = []; + // msgSeqList = '${reSendMsgVO.msgSeqList}'; if(msgSeqList.length > 0){ - + console.log('msgSeqList.length : ' + msgSeqList.length); fnMsgResend(msgResendFlag, msgSeqList); } //주소록에서 주소를 전송한 경우 처리 - var moveAddrFlag = '${addrVO.moveAddrFlag}'; - var addrIdList = []; - addrIdList = '${addrVO.addrIdList}'; + // var moveAddrFlag = '${addrVO.moveAddrFlag}'; + // var addrIdList = []; + // addrIdList = '${addrVO.addrIdList}'; + console.log('주소록에서 주소를 전송한 경우 처리'); if(addrIdList.length > 0) { fnAddrSet(moveAddrFlag, addrIdList); } @@ -377,7 +387,6 @@ function listMsgDataView(){ function fnCustomImgSendMsg(atchFileId, fileSn, filePath){ - var imgId = ""; var imgSrc = ""; From e61fe18a924521e016cc822ec94b40fe1df880e1 Mon Sep 17 00:00:00 2001 From: wyh Date: Fri, 17 Jan 2025 16:50:44 +0900 Subject: [PATCH 8/9] =?UTF-8?q?Slack=20=EC=A0=84=EC=86=A1=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/msgcampain/web/MjonMsgCampainDataController.java | 8 +++++++- .../msgcampain/web/MjonMsgCampainHGDataController.java | 9 +++++++-- .../msgcampain/web/MjonMsgCampainTWDataController.java | 9 +++++++-- .../itn/let/mjo/msgdata/web/MjonMsgDataController.java | 9 +++++++-- src/main/java/itn/let/mjo/test/web/TestController.java | 8 ++++++-- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index 7c754198..dca8cca0 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -30,6 +30,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -185,6 +186,9 @@ public class MjonMsgCampainDataController { @Resource(name = "MsgHolidayService") private MsgHolidayService msgHolidayService; + @Autowired + private MjonCommon mjonCommon; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainDataController.class); /** @@ -3288,9 +3292,11 @@ public class MjonMsgCampainDataController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 + /* MjonCommon comm = new MjonCommon(); comm.getAdminMsgSandSlack(mjonMsgVO); - + */ + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } } diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java index 1fa23672..e4dcc623 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -150,6 +151,9 @@ public class MjonMsgCampainHGDataController { @Resource(name = "MsgHolidayService") private MsgHolidayService msgHolidayService; + @Autowired + private MjonCommon mjonCommon; + /** * 선거 문자 대량 발송 화면 * @param searchVO @@ -1138,10 +1142,11 @@ public class MjonMsgCampainHGDataController { boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList); if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - + /* MjonCommon comm = new MjonCommon(); comm.getAdminMsgSandSlack(mjonMsgVO); - + */ + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } } diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java index 562192e3..2f2fe39f 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java @@ -29,6 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -174,6 +175,9 @@ public class MjonMsgCampainTWDataController { @Resource(name = "MsgHolidayService") private MsgHolidayService msgHolidayService; + @Autowired + private MjonCommon mjonCommon; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainTWDataController.class); /** @@ -2122,10 +2126,11 @@ public class MjonMsgCampainTWDataController { boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList); if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - + /* MjonCommon comm = new MjonCommon(); comm.getAdminMsgSandSlack(mjonMsgVO); - + */ + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } } diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 2a838d32..79b24d41 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -40,6 +40,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -193,6 +194,9 @@ public class MjonMsgDataController { @Resource(name = "MsgHolidayService") private MsgHolidayService msgHolidayService; + @Autowired + private MjonCommon mjonCommon; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class); /** @@ -3447,10 +3451,11 @@ public class MjonMsgDataController { boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList); if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림 예외설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - + /* MjonCommon comm = new MjonCommon(); comm.getAdminMsgSandSlack(mjonMsgVO); - + */ + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } } diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java index cbed937b..a0c0b42e 100644 --- a/src/main/java/itn/let/mjo/test/web/TestController.java +++ b/src/main/java/itn/let/mjo/test/web/TestController.java @@ -242,6 +242,9 @@ public class TestController { @Resource(name="MjonMsgDataDAO") private MjonMsgDataDAO mjonMsgDataDAO; + @Autowired + private MjonCommon mjonCommon; + private static final Logger logger = LoggerFactory.getLogger(TestController.class); ///////////////////////////////////////////////////////////////////////////////////////// @@ -2173,10 +2176,11 @@ public class TestController { boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList); if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - + /* MjonCommon comm = new MjonCommon(); comm.getAdminMsgSandSlack(mjonMsgVO); - + */ + mjonCommon.getAdminMsgSandSlack(mjonMsgVO); } //Slack으로 메세지 전송 처리 From 5d2b71c0f492ceb09c03144a171487d17ca65589 Mon Sep 17 00:00:00 2001 From: Eunjipark Date: Mon, 20 Jan 2025 11:20:59 +0900 Subject: [PATCH 9/9] =?UTF-8?q?2024/01/20=20=EC=A3=BC=EC=86=8C=EB=A1=9D=20?= =?UTF-8?q?=EB=8C=80=EB=9F=89=EB=93=B1=EB=A1=9D=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/popupLayer.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index 40fb362e..f0767c71 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -1234,6 +1234,14 @@ .adr_layer.adr_popup14 .cf_text_ul li{font-size:14px;color:#666;margin:0 0 5px 0;} .adr_layer.adr_popup14 .cf_text_ul li:last-child{margin:0;} +/* 주소록 대량등록 팝업 헤더 수정 */ +.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort=ascending] .tabulator-col-content .tabulator-col-sorter{z-index: 1;} +.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort=descending] .tabulator-col-content .tabulator-col-sorter{z-index: 1;} +.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort=none] .tabulator-col-content .tabulator-col-sorter{z-index: 1;} +.tabulator .tabulator-header .tabulator-col::after{position: absolute; content: " "; width: 100%; height: 14px; background-color: #e5e5e5; bottom: 0; left: 0; z-index: 0;} +.tabulator .tabulator-header .tabulator-col .tabulator-col-content{background-color: #ededed;} +.tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-col-title-holder .tabulator-col-title{position: relative; z-index: 1;} + /* ie */