From 4e2daf5e3c43daa01a064d233685344a4a61ab0a Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Mon, 9 Dec 2024 19:54:14 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1=20-=20?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=EC=B6=94=EA=B0=80=20=EC=95=88=EB=82=B4?=
 =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95=20/=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC=EC=97=90=20=EB=8B=A8=EB=AC=B8=20?=
 =?UTF-8?q?=EC=9E=A5=EB=AC=B8=20=EA=B5=AC=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

---
 .../service/impl/MjonMsgDataServiceImpl.java  | 40 ++-----------------
 .../jsp/web/msgdata/MsgDataSMLView.jsp        | 10 ++---
 2 files changed, 8 insertions(+), 42 deletions(-)

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 aa01cc8b..c4720030 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
@@ -4226,33 +4226,10 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
 //		int instCnt = mjonMsgDataDAO.insertMsgDataInfo_advc(mjonMsgSendVOList);
 //		int instCnt = mjonMsgDataDAO.insertMsgDataInfo_jdbc_advc(mjonMsgSendVOList);
 
-		// Batch 시작 시간 측정
-		// 총 발송 건수 = DB insert
-//		int instCnt = 0;
-//		int instCnt = this.insertMsgData_advc(mjonMsgSendVOList);
 
-		// 수신거부 목록
+		// 총 발송 건수
 		returnMap.put("resultSts", instTotalCnt);
 		log.debug("총 단가 합계: [{}]", mjonMsgVO.getTotPrice());
-		//TODO: group 테이블에 저장
-//		if(instCnt > 0) {
-//			
-//			// Group TB insert
-//			mjonMsgVO.setMsgGroupCnt(Integer.toString(instCnt));
-//			this.insertMsgGroupDataTb_advc(mjonMsgVO, mjonMsgSendVOList.get(0));
-//			
-//			// 금액 및 포인트 insert
-//			priceAndPoint.insertCashAndPoint(
-//							userId
-//							, -Float.parseFloat(mjonMsgVO.getTotPrice())
-//							, "SMS 문자 총 " + mjonMsgVO.getMjonMsgSendVOList().size() + "건 중 " + instCnt + "건 발송"
-//							, mjonMsgVO.getMsgGroupId()
-//							);
-//			
-//			// 스팸 데이터가 있으면 MJ_SPAM_MSG_GROUP_DATA 테이블에 insert
-//			handleSpamMsg_advc(mjonMsgVO, mjonMsgSendVOList.get(0));
-//			
-//		}
 //		
 
 		// 스팸 및 스미싱 의심이면 slack 알림
@@ -4264,18 +4241,6 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
 			System.out.println("알림 조건을 충족하지 않았습니다.");
 		}
 
-		
-		
-
-		//////////////////////////////////
-		//////////////////////////////////
-		//////////////////////////////////
-
-		//////////////////////////////////
-		//////////////////////////////////
-		//////////////////////////////////
-
-		
 		statusResponse.setStatus(HttpStatus.OK);
 		statusResponse.setObject(returnMap);
 		return statusResponse;
@@ -4303,8 +4268,9 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
 
 		mjonMsgVO.setBefCash(priceAndPoint.getBefCash(mjonMsgVO.getUserId()));
 		mjonMsgVO.setBefPoint(priceAndPoint.getBefPoint(mjonMsgVO.getUserId()));
-		
+
 		mjonMsgVO.setMsgGroupId(mjonMsgSendVO.getMsgGroupId());
+		mjonMsgVO.setMsgType(mjonMsgSendVO.getMsgType());
 		mjonMsgDAO.insertGroupMsgData(mjonMsgVO);
 		
 	}
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 a0302971..f6ca9b64 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -4072,13 +4072,13 @@ function getMjMsgSentListAll(pageNo) {
 											<span style="display:block;margin:10px 0 0 0;"><span class="vMiddle">*</span> 중복번호는 한번만 추가됩니다.</span>
 											<div class="error_hover_cont send_hover_cont">
 <!-- 												<p>휴대폰 번호 입력 시 해당 휴대폰 번호에 대한 형식이 어긋나거나 휴대폰 번호에 오류가 있는지 등을 검사하는 기능</p> -->
-												<p>줄바꿈 기준으로 핸드폰 번호 입력이 가능합니다.</p>
+												<p>줄바꿈(Enter) 기준으로 핸드폰 번호 입력이 가능합니다.</p>
 												<span>
 													(예시)<br/>
-													010-1234-0001<br/>
-													010-1235-0002<br/>
-													01012350003<br/>
-													01012350004<br/>
+													010-1234-0001↵<br/>
+													010-1235-0002↵<br/>
+													01012350003↵<br/>
+													01012350004↵<br/>
 												</span>
 											</div>
 										</div>