Commit @8f1f8b78a1ee8a3e01211e03afbbb2f3c174c170

이호영 2024-12-24

타이틀 테스트 커밋

@8f1f8b78a1ee8a3e01211e03afbbb2f3c174c170

0a21e4b

8f1f8b7

src/main/java/itn/com/cmm/util/MsgSendUtils.java

--- src/main/java/itn/com/cmm/util/MsgSendUtils.java

+++ src/main/java/itn/com/cmm/util/MsgSendUtils.java


 
 		boolean hasPerformedSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
 		boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
-		boolean hasSetSubject = false; // 치환 데이터가 아닐 때 제목 설정 플래그
 		
 		String msgKind = mjonMsgVO.getMsgKind();
 		String smsTxtTemp = mjonMsgVO.getSmsTxt();

 			sendVO.setMsgType(msgTypeResult);
 			
 			// 제목 셋팅
-			if (LONG_MSG_TYPE.equals(msgTypeResult) && (replaceYN || !hasSetSubject)) {
+			if (LONG_MSG_TYPE.equals(msgTypeResult)){
 				String mmsTitleTemp = "";
 				// 제목이 비어 있고 전송할 SMS 텍스트가 존재하는 경우에만 처리
 				if (StringUtils.isEmpty(mmsSubject) && StringUtils.isNotEmpty(smsTxt)) {

 					mmsTitleTemp = getMmsgSubject(smsTxt, msgKind);
 
 					// 치환 데이터가 아닌 경우 제목 설정 완료 플래그를 true로 설정
-					if (!replaceYN) {
-						hasSetSubject = true; // 제목 설정 완료
-					}
 				}
 
 				// 설정된 제목을 현재 메시지 객체에 적용

0a21e4b

8f1f8b7

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

--- src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

+++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java


 	}
 
 	// 사용자 정보 조회 및 기본값 처리
-	private UserManageVO getUserManageInfo(String userId) throws Exception {
+	public UserManageVO getUserManageInfo(String userId) throws Exception {
 //		UserManageVO userManageVO = new UserManageVO();
 //		userManageVO.setAdminSmsNoticeYn("Y"); // 기본값
 //		userManageVO.setSmishingYn("N"); // 기본값

0a21e4b

8f1f8b7

src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

--- src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

+++ src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java


 //		log.debug(" :: smsTxt :: [{}]", smsTxt);
 
 		StatusResponse statusResponse = new StatusResponse();
+		
+		// 화면에서 저장한 이미지 가져오기
 		mjonMsgVO = setImagesSetting(mjonMsgVO, statusResponse);
 
 		if (mjonMsgVO == null) {

 
 		mjonMsgVO.setAgentCode(hotlineAgentCode);
 
+		
+
+//		UserManageVO userManageVO = MjonCommon.getUserManageInfo(userId);
+		
+		
 		// 스팸관련 키워드 select
 		List<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
 

0a21e4b

8f1f8b7

src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp


 					<tbody>
 						<c:forEach var="result" items="${resultList}" varStatus="status">
 						<tr>
-							<td>
+							<td><!-- 번호 -->
 								<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
 								<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>								
 							</td>						
-							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
+							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 아이디 -->
 								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
 		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
 			                	</c:if>

 									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
 			                	</c:if>
 							</td>
-							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
+							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 법인폰 -->
 								<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
 									<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
 										<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
 									</a>
 								</div>
 							</td>
-							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>>
+							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>><!-- 발신번호 -->
 								<c:choose>
 									<c:when test="${result.adminSmsNoticeYn eq 'Y'}">
 										<input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />

 									</c:when>
 								</c:choose>								
 		                    </td>				
-							
+							<!-- 발송건수 -->
 							<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing" style="cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
 								<c:out value="${result.callFrom}"/>
 							</td>
-								
+							<!-- 스미싱의심 -->
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> style="line-height:30px;text-align:right;">
 								<c:choose>
 									<c:when test="${result.successCount > 0}">

 									</c:otherwise>
 								</c:choose>								
 							</td>
+							<!-- 요청시간 -->
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.delayYn eq 'Y'}">

 									</c:otherwise>
 								</c:choose>
 							</td>
+							<!-- 예약 -->
 							<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> title="<c:out value="${result.reqDate}"/>">
 								<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
 								<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>								

 										즉시
 									</c:otherwise>
 								</c:choose>
-							</td>							
+							</td>		
+							<!-- 내용 -->					
 							<td class="sms_detail left <c:if test="${result.smishingYn eq 'Y'}">smishing</c:if>">
 								<c:choose>
 									<c:when test="${empty result.smsTxt}">

 									</c:otherwise>
 								</c:choose>
 							</td>
+							<!-- 타입 -->
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.msgTypeTxt eq 'SMS전송'}">

 									</c:otherwise>
 								</c:choose>
 							</td>
+							<!-- 방식 -->
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:choose>
 									<c:when test="${result.sendKind eq 'A'}">

Add a comment

Open 0
Closed 0

List

...	...	@@ -244,7 +244,6 @@
244	244
245	245	boolean hasPerformedSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
246	246	boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
247		- boolean hasSetSubject = false; // 치환 데이터가 아닐 때 제목 설정 플래그
248	247
249	248	String msgKind = mjonMsgVO.getMsgKind();
250	249	String smsTxtTemp = mjonMsgVO.getSmsTxt();
...	...	@@ -331,7 +330,7 @@
331	330	sendVO.setMsgType(msgTypeResult);
332	331
333	332	// 제목 셋팅
334		- if (LONG_MSG_TYPE.equals(msgTypeResult) && (replaceYN \|\| !hasSetSubject)) {
	333	+ if (LONG_MSG_TYPE.equals(msgTypeResult)){
335	334	String mmsTitleTemp = "";
336	335	// 제목이 비어 있고 전송할 SMS 텍스트가 존재하는 경우에만 처리
337	336	if (StringUtils.isEmpty(mmsSubject) && StringUtils.isNotEmpty(smsTxt)) {
...	...	@@ -339,9 +338,6 @@
339	338	mmsTitleTemp = getMmsgSubject(smsTxt, msgKind);
340	339
341	340	// 치환 데이터가 아닌 경우 제목 설정 완료 플래그를 true로 설정
342		- if (!replaceYN) {
343		- hasSetSubject = true; // 제목 설정 완료
344		- }
345	341	}
346	342
347	343	// 설정된 제목을 현재 메시지 객체에 적용

...	...	@@ -522,7 +522,7 @@
522	522	}
523	523
524	524	// 사용자 정보 조회 및 기본값 처리
525		- private UserManageVO getUserManageInfo(String userId) throws Exception {
	525	+ public UserManageVO getUserManageInfo(String userId) throws Exception {
526	526	// UserManageVO userManageVO = new UserManageVO();
527	527	// userManageVO.setAdminSmsNoticeYn("Y"); // 기본값
528	528	// userManageVO.setSmishingYn("N"); // 기본값

...	...	@@ -3987,6 +3987,8 @@
3987	3987	// log.debug(" :: smsTxt :: [{}]", smsTxt);
3988	3988
3989	3989	StatusResponse statusResponse = new StatusResponse();
	3990	+
	3991	+ // 화면에서 저장한 이미지 가져오기
3990	3992	mjonMsgVO = setImagesSetting(mjonMsgVO, statusResponse);
3991	3993
3992	3994	if (mjonMsgVO == null) {
...	...	@@ -4040,6 +4042,11 @@
4040	4042
4041	4043	mjonMsgVO.setAgentCode(hotlineAgentCode);
4042	4044
	4045	+
	4046	+
	4047	+// UserManageVO userManageVO = MjonCommon.getUserManageInfo(userId);
	4048	+
	4049	+
4043	4050	// 스팸관련 키워드 select
4044	4051	List<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
4045	4052

...	...	@@ -711,11 +711,11 @@
711	711	<tbody>
712	712	<c:forEach var="result" items="${resultList}" varStatus="status">
713	713	<tr>
714		- <td>
	714	+ <td><!-- 번호 -->
715	715	<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
716	716	<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>
717	717	</td>
718		- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
	718	+ <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 아이디 -->
719	719	<c:if test="${searchVO.searchSortOrd eq 'desc' }">
720	720	<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
721	721	</c:if>
...	...	@@ -723,14 +723,14 @@
723	723	<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
724	724	</c:if>
725	725	</td>
726		- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
	726	+ <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 법인폰 -->
727	727	<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
728	728	<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
729	729	<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
730	730	</a>
731	731	</div>
732	732	</td>
733		- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>>
	733	+ <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>><!-- 발신번호 -->
734	734	<c:choose>
735	735	<c:when test="${result.adminSmsNoticeYn eq 'Y'}">
736	736	<input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
...	...	@@ -740,11 +740,11 @@
740	740	</c:when>
741	741	</c:choose>
742	742	</td>
743		-
	743	+ <!-- 발송건수 -->
744	744	<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing" style="cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
745	745	<c:out value="${result.callFrom}"/>
746	746	</td>
747		-
	747	+ <!-- 스미싱의심 -->
748	748	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> style="line-height:30px;text-align:right;">
749	749	<c:choose>
750	750	<c:when test="${result.successCount > 0}">
...	...	@@ -763,6 +763,7 @@
763	763	</c:otherwise>
764	764	</c:choose>
765	765	</td>
	766	+ <!-- 요청시간 -->
766	767	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
767	768	<c:choose>
768	769	<c:when test="${result.delayYn eq 'Y'}">
...	...	@@ -803,6 +804,7 @@
803	804	</c:otherwise>
804	805	</c:choose>
805	806	</td>
	807	+ <!-- 예약 -->
806	808	<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> title="<c:out value="${result.reqDate}"/>">
807	809	<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
808	810	<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
...	...	@@ -816,7 +818,8 @@
816	818	즉시
817	819	</c:otherwise>
818	820	</c:choose>
819		- </td>
	821	+ </td>
	822	+ <!-- 내용 -->
820	823	<td class="sms_detail left <c:if test="${result.smishingYn eq 'Y'}">smishing</c:if>">
821	824	<c:choose>
822	825	<c:when test="${empty result.smsTxt}">
...	...	@@ -862,6 +865,7 @@
862	865	</c:otherwise>
863	866	</c:choose>
864	867	</td>
	868	+ <!-- 타입 -->
865	869	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
866	870	<c:choose>
867	871	<c:when test="${result.msgTypeTxt eq 'SMS전송'}">
...	...	@@ -878,6 +882,7 @@
878	882	</c:otherwise>
879	883	</c:choose>
880	884	</td>
	885	+ <!-- 방식 -->
881	886	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
882	887	<c:choose>
883	888	<c:when test="${result.sendKind eq 'A'}">

Delete comment