tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wyh'

Browse Source
This commit is contained in:
wyh 2023-06-20 11:10:26 +09:00
commit dd47bce050
7 changed files with 136 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java
View File

@ -679,6 +679,8 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM
int FHMmsResult = 0;
int JJResult = 0;
int IVTResult = 0;
int jjBline01Result = 0;
int jjBline02Result = 0;
//아이하트 딜레이문자 삭제
ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
@ -701,9 +703,14 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM
//인비토 딜레이문자 삭제
IVTResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 예약취소 삭제
jjBline01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 예약취소 삭제
jjBline02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
//삭제 결과 합산
resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult;
resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + jjBline01Result + jjBline02Result;
System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);
@ -775,6 +782,9 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM
int FHMmsResult = 0;
int JJResult = 0;
int IVTResult = 0;
int JJB01Result = 0;
int JJB02Result = 0;
//아이하트 딜레이문자 즉시발송 처리
//ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
@ -798,8 +808,14 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM
//제이제이 딜레이문자 즉시발송 처리
IVTResult = mjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 B01 딜레이문자 즉시발송 처리
JJB01Result = mjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 B02 딜레이문자 즉시발송 처리
JJB02Result = mjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
//삭제 결과 합산
resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult;
resultSts = ihResult + FHSmsResult + FHMmsResult + imoResult +bizResult + JJResult + IVTResult + JJB01Result + JJB02Result;
System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts);

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

@ -185,11 +185,13 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
mberRepAgent = tmp.getRepAgent();
String useYn = tmp.getUseYn();
//회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함.
if(mberSendRate.equals("0") || useYn.equals("N")) {
hotlineAgentCode = mberRepAgent;
if(userInfo.getBlineCode().equals("N")) {
//회원 전용 전송사의 전송 비율이 0 이면 대표전송사로 전송되도록 셋팅함.
if(mberSendRate.equals("0") || useYn.equals("N")) {
hotlineAgentCode = mberRepAgent;
}
}
}

4
src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
View File

@ -504,6 +504,10 @@ public class MjonMsgDataController {
mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
searchVO.setUserId(userId);
model.addAttribute("blineCode", mberManageVO.getBlineCode());
}
model.addAttribute("exceptSpamYn", mberManageVO.getExceptSpamYn());

42
src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java
View File

@ -138,6 +138,27 @@ public class MjonReservMsgDAO extends EgovAbstractDAO {
return update("MjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq", mjonResvMsgVO);
}
/**
* @Method Name : deleteJJB01MsgSeqListByMsgSeq
* @작성일 : 2023. 06. 19.
* @작성자 : WYH
* @Method 설명 : 제이제이 B01라인 예약취소 삭제
*/
public int deleteJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{
return update("MjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq", mjonResvMsgVO);
}
/**
* @Method Name : deleteJJB02MsgSeqListByMsgSeq
* @작성일 : 2023. 06. 19.
* @작성자 : WYH
* @Method 설명 : 제이제이 B02라인 예약취소 삭제
*/
public int deleteJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) throws Exception{
return update("MjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq", mjonResvMsgVO);
}
public void updateResvMsgCancelDataFlag(MjonResvMsgVO mjonResvMsgVO) throws Exception{
@ -235,4 +256,25 @@ public class MjonReservMsgDAO extends EgovAbstractDAO {
return update("MjonReservMsgDAO.updateRealTimeIVTMsgSeqListByMsgSeq", mjonResvMsgVO);
}
/**
* @Method Name : updateRealTimeJJB01MsgSeqListByMsgSeq
* @작성일 : 2023. 06. 20.
* @작성자 : WYD
* @Method 설명 : 제이제이 B01라인 지연처리 문자 즉시 발송
*/
public int updateRealTimeJJB01MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) {
return update("MjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq", mjonResvMsgVO);
}
/**
* @Method Name : updateRealTimeJJB02MsgSeqListByMsgSeq
* @작성일 : 2023. 06. 20.
* @작성자 : WYD
* @Method 설명 : 제이제이 B02라인 지연처리 문자 즉시 발송
*/
public int updateRealTimeJJB02MsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) {
return update("MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq", mjonResvMsgVO);
}
}

10
src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgServiceImpl.java
View File

@ -109,6 +109,8 @@ public class MjonReservMsgServiceImpl extends EgovAbstractServiceImpl implements
int ivtResult = 0;
int FHSmsResult = 0;
int FHMmsResult = 0;
int jjB01Result = 0;
int jjB02Result = 0;
//아이하트 예약취소 삭제
ihResult = mjonReservMsgDAO.deleteIHeartMsgSeqListByMsgSeq(mjonResvMsgVO);
@ -131,8 +133,14 @@ public class MjonReservMsgServiceImpl extends EgovAbstractServiceImpl implements
//인비토 예약취소 삭제
ivtResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 B01 예약취소 삭제
jjB01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO);
//제이제이 B02 예약취소 삭제
jjB02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO);
//삭제 결과 합산
result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult;
result = ihResult + FHSmsResult + FHMmsResult + imoResult + bizResult +jjResult + ivtResult + jjB01Result + jjB02Result;
//각 전송사별 문자 발송 테이블에서 데이터 삭제 처리
/*if(agentCode.equals("01")) { //아이하트 메세지 삭제

44
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml
View File

@ -572,6 +572,26 @@
</delete>
<delete id="MjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
DELETE FROM MTMSG_B1_DATA
WHERE 1=1
<iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
#userDataList[]#
</iterate>
</delete>
<delete id="MjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
DELETE FROM MTMSG_B2_DATA
WHERE 1=1
<iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
#userDataList[]#
</iterate>
</delete>
<select id="MjonReservMsgDAO.selectFileNmToAtchFileIdInfo" parameterClass="fileVO" resultClass="fileVO">
SELECT ATCH_FILE_ID AS atchFileId,
@ -663,6 +683,30 @@
</update>
<update id="MjonReservMsgDAO.updateRealTimeJJB01MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
UPDATE MTMSG_B1_DATA
SET INPUT_DATE = NOW() ,
RES_DATE = NOW()
WHERE 1=1
<iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
#userDataList[]#
</iterate>
</update>
<update id="MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq" parameterClass="mjonMsgResvVO">
UPDATE MTMSG_B2_DATA
SET INPUT_DATE = NOW() ,
RES_DATE = NOW()
WHERE 1=1
<iterate prepend="AND USERDATA IN" open="(" close=")" conjunction="," property="userDataList">
#userDataList[]#
</iterate>
</update>
</sqlMap>

15
src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
View File

@ -451,6 +451,14 @@ function txtExport(event){
$(document).ready(function (){
// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
var blineCodeYn = $("#blineCode").val();
if(blineCodeYn != 'N' && blineCodeYn != ''){
$('input[name="send_adYn"]').val(['Y']);
$(".send_adYnN").css('display', 'none');
advMsgInsert();
}
//미리보기 이미지 영역 숨김 처리
$('.preiew_img').hide();
$('.prePhoto').hide();
@ -3496,7 +3504,8 @@ $(".btn_event_cash").off().on("click", function(){
<input type="hidden" id="evnShortMsgCnt" name="evnShortMsgCnt" value="0"/><!-- 치환 이벤트 단문 건수 -->
<input type="hidden" id="evnLongMsgCnt" name="evnLongMsgCnt" value="0"/><!-- 치환 이벤트 장문 건수 -->
<input type="hidden" id="blineCode" name="blineCode" value="<c:out value="${blineCode}"/>"/>
<!-- <div class="top_content current" id="tab1_1"> -->
<div class="heading">
<h2>문자전송</h2>
@ -3525,8 +3534,8 @@ $(".btn_event_cash").off().on("click", function(){
<tr>
<th scope="row">문자분류</th>
<td class="send_cf">
<input id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
<label for="send_adYnN">일반</label>
<input class="send_adYnN" id="send_adYnN" type="radio"name="send_adYn" value="N" checked="checked">
<label class="send_adYnN" for="send_adYnN">일반</label>
<input id="send_adYnY" type="radio" name="send_adYn" value="Y">
<label for="send_adYnY">광고</label>
</td>