Commit @e61fe18a924521e016cc822ec94b40fe1df880e1

02de216

e61fe18

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java

--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java

+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java


 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;

 	
 	@Resource(name = "MsgHolidayService")
     private MsgHolidayService msgHolidayService;
+	
+	@Autowired
+	private MjonCommon mjonCommon;
 	
     private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainDataController.class);
 	

 							
 							if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
 								
+								/*
 								MjonCommon comm = new MjonCommon();
 								comm.getAdminMsgSandSlack(mjonMsgVO);
-								
+								*/
+								mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
 							}
 							
 						}

02de216

e61fe18

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java

--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java

+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainHGDataController.java


 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;

 	
 	@Resource(name = "MsgHolidayService")
     private MsgHolidayService msgHolidayService;
+	
+	@Autowired
+	private MjonCommon mjonCommon;
 	
     /**
      * 선거 문자 대량 발송 화면 

 							boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
 							
 							if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
-								
+								/*
 								MjonCommon comm = new MjonCommon();
 								comm.getAdminMsgSandSlack(mjonMsgVO);
-								
+								*/
+								mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
 							}
 							
 						}

02de216

e61fe18

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java

--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java

+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainTWDataController.java


 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;

 	
 	@Resource(name = "MsgHolidayService")
     private MsgHolidayService msgHolidayService;
+	
+	@Autowired
+	private MjonCommon mjonCommon;
 	
 	 private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainTWDataController.class);
 	

 							boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
 							
 							if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
-								
+								/*
 								MjonCommon comm = new MjonCommon();
 								comm.getAdminMsgSandSlack(mjonMsgVO);
-								
+								*/
+								mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
 							}
 							
 						}

02de216

e61fe18

src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java


 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;

 	
 	@Resource(name = "MsgHolidayService")
     private MsgHolidayService msgHolidayService;
+	
+	@Autowired
+	private MjonCommon mjonCommon;
 	
     private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
 	

 						boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
 						
 						if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림 예외설정 시간에 포함되지 않는 경우 슬랙 알림 발송
-							
+							/*
 							MjonCommon comm = new MjonCommon();
 							comm.getAdminMsgSandSlack(mjonMsgVO);
-							
+							*/
+							mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
 						}
 						
 					}

02de216

e61fe18

src/main/java/itn/let/mjo/test/web/TestController.java

--- src/main/java/itn/let/mjo/test/web/TestController.java

+++ src/main/java/itn/let/mjo/test/web/TestController.java


 	@Resource(name="MjonMsgDataDAO")
 	private MjonMsgDataDAO mjonMsgDataDAO;
 	
+	@Autowired
+	private MjonCommon mjonCommon;
+	
     private static final Logger logger = LoggerFactory.getLogger(TestController.class);
     
     /////////////////////////////////////////////////////////////////////////////////////////

 						boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
 						
 						if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
-							
+							/*
 							MjonCommon comm = new MjonCommon();
 							comm.getAdminMsgSandSlack(mjonMsgVO);
-							
+							*/
+							mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
 						}
 						
 						//Slack으로 메세지 전송 처리

...	...	@@ -30,6 +30,7 @@
30	30	import org.apache.poi.xssf.usermodel.XSSFWorkbook;
31	31	import org.slf4j.Logger;
32	32	import org.slf4j.LoggerFactory;
	33	+import org.springframework.beans.factory.annotation.Autowired;
33	34	import org.springframework.beans.factory.annotation.Value;
34	35	import org.springframework.http.HttpStatus;
35	36	import org.springframework.http.ResponseEntity;
...	...	@@ -184,6 +185,9 @@
184	185
185	186	@Resource(name = "MsgHolidayService")
186	187	private MsgHolidayService msgHolidayService;
	188	+
	189	+ @Autowired
	190	+ private MjonCommon mjonCommon;
187	191
188	192	private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainDataController.class);
189	193
...	...	@@ -3288,9 +3292,11 @@
3288	3292
3289	3293	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
3290	3294
	3295	+ /*
3291	3296	MjonCommon comm = new MjonCommon();
3292	3297	comm.getAdminMsgSandSlack(mjonMsgVO);
3293		-
	3298	+ */
	3299	+ mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
3294	3300	}
3295	3301
3296	3302	}

...	...	@@ -12,6 +12,7 @@
12	12	import javax.annotation.Resource;
13	13	import javax.servlet.http.HttpServletRequest;
14	14
	15	+import org.springframework.beans.factory.annotation.Autowired;
15	16	import org.springframework.beans.factory.annotation.Value;
16	17	import org.springframework.stereotype.Controller;
17	18	import org.springframework.ui.ModelMap;
...	...	@@ -149,6 +150,9 @@
149	150
150	151	@Resource(name = "MsgHolidayService")
151	152	private MsgHolidayService msgHolidayService;
	153	+
	154	+ @Autowired
	155	+ private MjonCommon mjonCommon;
152	156
153	157	/**
154	158	* 선거 문자 대량 발송 화면
...	...	@@ -1138,10 +1142,11 @@
1138	1142	boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
1139	1143
1140	1144	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
1141		-
	1145	+ /*
1142	1146	MjonCommon comm = new MjonCommon();
1143	1147	comm.getAdminMsgSandSlack(mjonMsgVO);
1144		-
	1148	+ */
	1149	+ mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
1145	1150	}
1146	1151
1147	1152	}

...	...	@@ -29,6 +29,7 @@
29	29	import org.apache.poi.xssf.usermodel.XSSFWorkbook;
30	30	import org.slf4j.Logger;
31	31	import org.slf4j.LoggerFactory;
	32	+import org.springframework.beans.factory.annotation.Autowired;
32	33	import org.springframework.beans.factory.annotation.Value;
33	34	import org.springframework.stereotype.Controller;
34	35	import org.springframework.ui.ModelMap;
...	...	@@ -173,6 +174,9 @@
173	174
174	175	@Resource(name = "MsgHolidayService")
175	176	private MsgHolidayService msgHolidayService;
	177	+
	178	+ @Autowired
	179	+ private MjonCommon mjonCommon;
176	180
177	181	private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainTWDataController.class);
178	182
...	...	@@ -2122,10 +2126,11 @@
2122	2126	boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
2123	2127
2124	2128	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
2125		-
	2129	+ /*
2126	2130	MjonCommon comm = new MjonCommon();
2127	2131	comm.getAdminMsgSandSlack(mjonMsgVO);
2128		-
	2132	+ */
	2133	+ mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
2129	2134	}
2130	2135
2131	2136	}

...	...	@@ -40,6 +40,7 @@
40	40	import org.apache.poi.xssf.usermodel.XSSFWorkbook;
41	41	import org.slf4j.Logger;
42	42	import org.slf4j.LoggerFactory;
	43	+import org.springframework.beans.factory.annotation.Autowired;
43	44	import org.springframework.beans.factory.annotation.Value;
44	45	import org.springframework.http.HttpStatus;
45	46	import org.springframework.http.ResponseEntity;
...	...	@@ -192,6 +193,9 @@
192	193
193	194	@Resource(name = "MsgHolidayService")
194	195	private MsgHolidayService msgHolidayService;
	196	+
	197	+ @Autowired
	198	+ private MjonCommon mjonCommon;
195	199
196	200	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
197	201
...	...	@@ -3447,10 +3451,11 @@
3447	3451	boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
3448	3452
3449	3453	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림 예외설정 시간에 포함되지 않는 경우 슬랙 알림 발송
3450		-
	3454	+ /*
3451	3455	MjonCommon comm = new MjonCommon();
3452	3456	comm.getAdminMsgSandSlack(mjonMsgVO);
3453		-
	3457	+ */
	3458	+ mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
3454	3459	}
3455	3460
3456	3461	}

...	...	@@ -242,6 +242,9 @@
242	242	@Resource(name="MjonMsgDataDAO")
243	243	private MjonMsgDataDAO mjonMsgDataDAO;
244	244
	245	+ @Autowired
	246	+ private MjonCommon mjonCommon;
	247	+
245	248	private static final Logger logger = LoggerFactory.getLogger(TestController.class);
246	249
247	250	/////////////////////////////////////////////////////////////////////////////////////////
...	...	@@ -2173,10 +2176,11 @@
2173	2176	boolean smishingAlarmPassSts = mjonHolidayApi.getHolidaySmishingPassStatus(resultAlarmList, resultHolidayList);
2174	2177
2175	2178	if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송
2176		-
	2179	+ /*
2177	2180	MjonCommon comm = new MjonCommon();
2178	2181	comm.getAdminMsgSandSlack(mjonMsgVO);
2179		-
	2182	+ */
	2183	+ mjonCommon.getAdminMsgSandSlack(mjonMsgVO);
2180	2184	}
2181	2185
2182	2186	//Slack으로 메세지 전송 처리

Delete comment