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으로 메세지 전송 처리