Commit @e9695888519a8d8d52a9249c467db97c99684f44

1bd29db

e969588

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java


 					kakaoSandInfo.setReqDate(sdFormat.format(now));
 					
 				}
+				
+				if(kakaoVO.getAtSmishingYn().equals("Y")) {
+					String sandDate = kakaoVO.getReqDate();
+					SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+					Date date = sdFormat.parse(sandDate);
+					
+					Calendar cal1 = Calendar.getInstance();
+					cal1.setTime(date); // 시간 설정
+					cal1.add(Calendar.MINUTE, 30); // 30분 연산
+					
+					String reqDate = sdFormat.format(cal1.getTime());
+					
+					System.out.println("@@@@@@@@@@@@@@  reqDate  : "+reqDate);
+					kakaoVO.setReqDate(reqDate);
+					kakaoSandInfo.setReqDate(reqDate);
+				}
+				
 				/**전송시간 설정 (끝)------------------------------------------------*/
 	
 				/**카카오 전송 데이터 추가*/

1bd29db

e969588

src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java


 			
 			mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
 			
+			model.addAttribute("atSmishingYn", mberManageVO.getAtSmishingYn());
 		}
 		
 		//3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용

1bd29db

e969588

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	private String delayYn;			// 문자 30분 지연 처리 유무
 	private String delayCompleteYn; // 문자 30분 지연 처리 완료 유무
 	
+	private String atDelayYn;			// 알림 30분 지연 처리 유무
+	private String atDelayCompleteYn;	// 알림톡 30분 지연 처리 완료 유무
+	private String atSmishingYn;		// 알림 지연처리
+	
 	private int totalCallCnt;	//수신자 전체 갯
 	
 	private String bizLogCallStatus;	//다우기술 biz_log 테이블의 발송결과 코드 값.

 	public void setAccessKey(String accessKey) {
 		this.accessKey = accessKey;
 	}
-	
+	public String getAtDelayYn() {
+		return atDelayYn;
+	}
+	public void setAtDelayYn(String atDelayYn) {
+		this.atDelayYn = atDelayYn;
+	}
+	public String getAtDelayCompleteYn() {
+		return atDelayCompleteYn;
+	}
+	public void setAtDelayCompleteYn(String atDelayCompleteYn) {
+		this.atDelayCompleteYn = atDelayCompleteYn;
+	}
+	public String getAtSmishingYn() {
+		return atSmishingYn;
+	}
+	public void setAtSmishingYn(String atSmishingYn) {
+		this.atSmishingYn = atSmishingYn;
+	}
 }

1bd29db

e969588

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java


 			List<KakaoVO> kakaoResultList = new ArrayList<KakaoVO>();
 			kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO);
 			
-	        model.addAttribute("kakaoResultList", kakaoResultList);
+			model.addAttribute("kakaoResultList", kakaoResultList);
 			
 			/*
 			 * 알림톡/친구톡 예약발송 리스트 불러오기
 			 * */
-	        
-	        KakaoVO reserveKakaoVO = new KakaoVO();
-	        reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
-	        reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
-	        reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
+			
+			KakaoVO reserveKakaoVO = new KakaoVO();
+			reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
+			reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
+			reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
 			// 문자발송 완료건은 모두 보이도록 처리
 			//kakaoVO.setMsgType("8");
-	        reserveKakaoVO.setSearchSortCnd("reqDate");
-	        reserveKakaoVO.setSearchSortOrd("desc");
-	        reserveKakaoVO.setFirstIndex(0);
+			reserveKakaoVO.setSearchSortCnd("reqDate");
+			reserveKakaoVO.setSearchSortOrd("desc");
+			reserveKakaoVO.setFirstIndex(0);
 			List<KakaoVO> kakaoReserveList = new ArrayList<KakaoVO>();
 			kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO);
 			
-	        model.addAttribute("kakaoReserveList", kakaoReserveList);
+			model.addAttribute("kakaoReserveList", kakaoReserveList);
 			
 			/*
 			 * 팩스 발송 내역 리스트 불러오기

1bd29db

e969588

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml


 					AND MG.DEL_FLAG ='N'
 					/* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
 					/* AND MG.RESERVE_YN = 'N' */
-					<![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
+					<![CDATA[
+					AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
+					]]>
 					
 				<isNotEmpty property="reserveCYn">
 					AND MG.RESERVE_C_YN = #reserveCYn#

1bd29db

e969588

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 	<select id="mjonMsgDAO.selectMberManageInfo" parameterClass="String" resultClass="mberManageVO">
 	
 		SELECT
-			MBER_ID				AS mberId
-			, MBER_NM			AS mberNm
-			, SHORT_PRICE		AS shortPrice
-			, LONG_PRICE		AS longPrice
-			, PICTURE_PRICE		AS picturePrice
-			, PICTURE2_PRICE	AS picture2Price
-			, PICTURE3_PRICE	AS picture3Price
-			, KAKAO_AT_PRICE	AS kakaoAtPrice
-			, FAX_PRICE			AS faxPrice
-			, USER_MONEY		AS userMoney
-			, USER_POINT		AS userPoint
-			, DEPT				AS dept
-			, MBTLNUM			AS moblphonNo
-			, MANAGER_NM		AS managerNm
-			, EXCEPT_SPAM_YN	AS exceptSpamYn
-			, HOTLINE_AGENT_CODE AS hotlineAgentCode
-			, BLINE_CODE		AS blineCode
+			MBER_ID					AS mberId
+			, MBER_NM				AS mberNm
+			, SHORT_PRICE			AS shortPrice
+			, LONG_PRICE			AS longPrice
+			, PICTURE_PRICE			AS picturePrice
+			, PICTURE2_PRICE		AS picture2Price
+			, PICTURE3_PRICE		AS picture3Price
+			, KAKAO_AT_PRICE		AS kakaoAtPrice
+			, FAX_PRICE				AS faxPrice
+			, USER_MONEY			AS userMoney
+			, USER_POINT			AS userPoint
+			, DEPT					AS dept
+			, MBTLNUM				AS moblphonNo
+			, MANAGER_NM			AS managerNm
+			, EXCEPT_SPAM_YN		AS exceptSpamYn
+			, HOTLINE_AGENT_CODE	AS hotlineAgentCode
+			, BLINE_CODE			AS blineCode
+			, AT_SMISHING_YN		AS atSmishingYn
 		FROM   LETTNGNRLMBER
 		WHERE  MBER_ID = #userId#
 	

1bd29db

e969588

src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp


 		<input type="hidden" id="callToList" name="callToList" value="">				<!--완  받는사람 리스트-->
 		<input type="hidden" id="varNmList" name="varNmList" value="">					<!--완  변수 이름  리스트-->
 		<input type="hidden" id="varValList" name="varValList" value="">				<!--완  변수 리스트-->
+		
+		<input type="hidden" id="atSmishingYn" name="atSmishingYn" value="${atSmishingYn}">		<!--알림톡 스미싱 여부-->
 	</form>
 
 	<form id="excelForm" name="excelForm" action="<c:url value='/web/mjon/alimtalk/kakaoApiNotityTalkSampleExcelDownload.do'/>">

...	...	@@ -157,6 +157,23 @@
157	157	kakaoSandInfo.setReqDate(sdFormat.format(now));
158	158
159	159	}
	160	+
	161	+ if(kakaoVO.getAtSmishingYn().equals("Y")) {
	162	+ String sandDate = kakaoVO.getReqDate();
	163	+ SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
	164	+ Date date = sdFormat.parse(sandDate);
	165	+
	166	+ Calendar cal1 = Calendar.getInstance();
	167	+ cal1.setTime(date); // 시간 설정
	168	+ cal1.add(Calendar.MINUTE, 30); // 30분 연산
	169	+
	170	+ String reqDate = sdFormat.format(cal1.getTime());
	171	+
	172	+ System.out.println("@@@@@@@@@@@@@@ reqDate : "+reqDate);
	173	+ kakaoVO.setReqDate(reqDate);
	174	+ kakaoSandInfo.setReqDate(reqDate);
	175	+ }
	176	+
160	177	/*전송시간 설정 (끝)------------------------------------------------/
161	178
162	179	/*카카오 전송 데이터 추가/

...	...	@@ -154,6 +154,7 @@
154	154
155	155	mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
156	156
	157	+ model.addAttribute("atSmishingYn", mberManageVO.getAtSmishingYn());
157	158	}
158	159
159	160	//3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용

...	...	@@ -354,6 +354,10 @@
354	354	private String delayYn; // 문자 30분 지연 처리 유무
355	355	private String delayCompleteYn; // 문자 30분 지연 처리 완료 유무
356	356
	357	+ private String atDelayYn; // 알림 30분 지연 처리 유무
	358	+ private String atDelayCompleteYn; // 알림톡 30분 지연 처리 완료 유무
	359	+ private String atSmishingYn; // 알림 지연처리
	360	+
357	361	private int totalCallCnt; //수신자 전체 갯
358	362
359	363	private String bizLogCallStatus; //다우기술 biz_log 테이블의 발송결과 코드 값.
...	...	@@ -1375,5 +1379,22 @@
1375	1379	public void setAccessKey(String accessKey) {
1376	1380	this.accessKey = accessKey;
1377	1381	}
1378		-
	1382	+ public String getAtDelayYn() {
	1383	+ return atDelayYn;
	1384	+ }
	1385	+ public void setAtDelayYn(String atDelayYn) {
	1386	+ this.atDelayYn = atDelayYn;
	1387	+ }
	1388	+ public String getAtDelayCompleteYn() {
	1389	+ return atDelayCompleteYn;
	1390	+ }
	1391	+ public void setAtDelayCompleteYn(String atDelayCompleteYn) {
	1392	+ this.atDelayCompleteYn = atDelayCompleteYn;
	1393	+ }
	1394	+ public String getAtSmishingYn() {
	1395	+ return atSmishingYn;
	1396	+ }
	1397	+ public void setAtSmishingYn(String atSmishingYn) {
	1398	+ this.atSmishingYn = atSmishingYn;
	1399	+ }
1379	1400	}

...	...	@@ -1380,25 +1380,25 @@
1380	1380	List<KakaoVO> kakaoResultList = new ArrayList<KakaoVO>();
1381	1381	kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO);
1382	1382
1383		- model.addAttribute("kakaoResultList", kakaoResultList);
	1383	+ model.addAttribute("kakaoResultList", kakaoResultList);
1384	1384
1385	1385	/*
1386	1386	* 알림톡/친구톡 예약발송 리스트 불러오기
1387	1387	* */
1388		-
1389		- KakaoVO reserveKakaoVO = new KakaoVO();
1390		- reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
1391		- reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
1392		- reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
	1388	+
	1389	+ KakaoVO reserveKakaoVO = new KakaoVO();
	1390	+ reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
	1391	+ reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
	1392	+ reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
1393	1393	// 문자발송 완료건은 모두 보이도록 처리
1394	1394	//kakaoVO.setMsgType("8");
1395		- reserveKakaoVO.setSearchSortCnd("reqDate");
1396		- reserveKakaoVO.setSearchSortOrd("desc");
1397		- reserveKakaoVO.setFirstIndex(0);
	1395	+ reserveKakaoVO.setSearchSortCnd("reqDate");
	1396	+ reserveKakaoVO.setSearchSortOrd("desc");
	1397	+ reserveKakaoVO.setFirstIndex(0);
1398	1398	List<KakaoVO> kakaoReserveList = new ArrayList<KakaoVO>();
1399	1399	kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO);
1400	1400
1401		- model.addAttribute("kakaoReserveList", kakaoReserveList);
	1401	+ model.addAttribute("kakaoReserveList", kakaoReserveList);
1402	1402
1403	1403	/*
1404	1404	* 팩스 발송 내역 리스트 불러오기

...	...	@@ -375,7 +375,9 @@
375	375	AND MG.DEL_FLAG ='N'
376	376	/* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
377	377	/* AND MG.RESERVE_YN = 'N' */
378		- <![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
	378	+ <![CDATA[
	379	+ AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
	380	+ ]]>
379	381
380	382	<isNotEmpty property="reserveCYn">
381	383	AND MG.RESERVE_C_YN = #reserveCYn#

...	...	@@ -2055,23 +2055,24 @@
2055	2055	<select id="mjonMsgDAO.selectMberManageInfo" parameterClass="String" resultClass="mberManageVO">
2056	2056
2057	2057	SELECT
2058		- MBER_ID AS mberId
2059		- , MBER_NM AS mberNm
2060		- , SHORT_PRICE AS shortPrice
2061		- , LONG_PRICE AS longPrice
2062		- , PICTURE_PRICE AS picturePrice
2063		- , PICTURE2_PRICE AS picture2Price
2064		- , PICTURE3_PRICE AS picture3Price
2065		- , KAKAO_AT_PRICE AS kakaoAtPrice
2066		- , FAX_PRICE AS faxPrice
2067		- , USER_MONEY AS userMoney
2068		- , USER_POINT AS userPoint
2069		- , DEPT AS dept
2070		- , MBTLNUM AS moblphonNo
2071		- , MANAGER_NM AS managerNm
2072		- , EXCEPT_SPAM_YN AS exceptSpamYn
2073		- , HOTLINE_AGENT_CODE AS hotlineAgentCode
2074		- , BLINE_CODE AS blineCode
	2058	+ MBER_ID AS mberId
	2059	+ , MBER_NM AS mberNm
	2060	+ , SHORT_PRICE AS shortPrice
	2061	+ , LONG_PRICE AS longPrice
	2062	+ , PICTURE_PRICE AS picturePrice
	2063	+ , PICTURE2_PRICE AS picture2Price
	2064	+ , PICTURE3_PRICE AS picture3Price
	2065	+ , KAKAO_AT_PRICE AS kakaoAtPrice
	2066	+ , FAX_PRICE AS faxPrice
	2067	+ , USER_MONEY AS userMoney
	2068	+ , USER_POINT AS userPoint
	2069	+ , DEPT AS dept
	2070	+ , MBTLNUM AS moblphonNo
	2071	+ , MANAGER_NM AS managerNm
	2072	+ , EXCEPT_SPAM_YN AS exceptSpamYn
	2073	+ , HOTLINE_AGENT_CODE AS hotlineAgentCode
	2074	+ , BLINE_CODE AS blineCode
	2075	+ , AT_SMISHING_YN AS atSmishingYn
2075	2076	FROM LETTNGNRLMBER
2076	2077	WHERE MBER_ID = #userId#
2077	2078

...	...	@@ -1055,6 +1055,8 @@
1055	1055	<input type="hidden" id="callToList" name="callToList" value=""> <!--완 받는사람 리스트-->
1056	1056	<input type="hidden" id="varNmList" name="varNmList" value=""> <!--완 변수 이름 리스트-->
1057	1057	<input type="hidden" id="varValList" name="varValList" value=""> <!--완 변수 리스트-->
	1058	+
	1059	+ <input type="hidden" id="atSmishingYn" name="atSmishingYn" value="${atSmishingYn}"> <!--알림톡 스미싱 여부-->
1058	1060	</form>
1059	1061
1060	1062	<form id="excelForm" name="excelForm" action="<c:url value='/web/mjon/alimtalk/kakaoApiNotityTalkSampleExcelDownload.do'/>">

Delete comment