jbcheong/hubez-admin
1
0
Fork 0
mirror of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin.git synced 2025-12-07 06:52:01 +09:00
Code Issues Projects Releases Wiki Activity

발송내역 수정

Browse Source
This commit is contained in:
USER
2022-07-28 17:16:59 +09:00
parent d5bf4444a3
commit f3fb920b35
7 changed files with 191 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/modules/custMgt/views/MemberAdminDetail.vue
View File

@@ -7,7 +7,7 @@
</div> </div>
<div class="table table_form"> <div class="table table_form">
<form action="" target="_blank" method="post" ref="form"> <form action="" target="_blank" method="get" ref="form">
<input type="hidden" name="svcUserId" id="svcUserId" v-model="svcUserId" /> <input type="hidden" name="svcUserId" id="svcUserId" v-model="svcUserId" />
<input type="hidden" name="ezSvcUserAuthKey" id="ezSvcUserAuthKey" v-model="ezSvcUserAuthKey" /> <input type="hidden" name="ezSvcUserAuthKey" id="ezSvcUserAuthKey" v-model="ezSvcUserAuthKey" />
</form> </form>
@@ -235,7 +235,7 @@ export default {
svcUserId: '', svcUserId: '',
ezSvcUserAuthKey: '', ezSvcUserAuthKey: '',
homePageUrl: '', homePageUrl: '',
isActive: true, isActive: true
//applyTbStyle: 'cursor: default;', //applyTbStyle: 'cursor: default;',
}; };
}, },
@@ -256,10 +256,12 @@ export default {
created() { created() {
if(this.$route.params.serviceId != null){ if(this.$route.params.serviceId != null){
this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId); this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId);
this.userId = this.$route.params.serviceId;
this.memberDetail(this.$route.params.serviceId); this.memberDetail(this.$route.params.serviceId);
}else{ }else{
var userId = this.$store.getters["dataStore/getUserId"]; var userId2 = this.$store.getters["dataStore/getUserId"];
this.memberDetail(userId); this.userId = userId2;
this.memberDetail(this.userId);
} }
}, },
destroyed() { destroyed() {

10
frontend/src/modules/login/views/LoginMain.vue
View File

@@ -135,13 +135,13 @@ export default {
this.$router.push({ name: 'updatePassword',params: {userId : this.userId}}); this.$router.push({ name: 'updatePassword',params: {userId : this.userId}});
}else if(rsp.retCode == '4003') { // ID 조회 없음. }else if(rsp.retCode == '4003') { // ID 조회 없음.
this.row.title = '로그인 실패'; this.row.title = '로그인 실패';
this.row.msg1 = '등록되지 않은 아이디입니다.'; this.row.msg1 = '아이디, 비밀번호를 확인해 주세요.';
this.row.msg2 = '아이디를 다시 확인하세요';
this.$refs.commonModal.alertModalOpen(this.row); this.$refs.commonModal.alertModalOpen(this.row);
} else if(rsp.retCode == '4004') { // ID/PWD 불일치 } else if(rsp.retCode == '4004') { // ID/PWD 불일치
this.row.title = '비밀번호 오류'; //this.row.title = '비밀번호 오류';
this.row.msg1 = '비밀번호를 확인해주세요.'; //this.row.msg1 = '비밀번호를 확인해주세요.';
this.row.title = '로그인 실패';
this.row.msg1 = '아이디, 비밀번호를 확인해 주세요.';
this.$refs.commonModal.alertModalOpen(this.row); this.$refs.commonModal.alertModalOpen(this.row);
} else if(rsp.retCode == '4005') { // ID/PWD 불일치 횟수초과로 계정 잠김 4005 } else if(rsp.retCode == '4005') { // ID/PWD 불일치 횟수초과로 계정 잠김 4005
this.row.title = '로그인 실패'; this.row.title = '로그인 실패';

30
frontend/src/modules/mntrng/views/SendList.vue
View File

@@ -10,7 +10,6 @@
<div class="group"> <div class="group">
<div class="input_box cal one essential"> <div class="input_box cal one essential">
<label for="right" class="label"><span>*</span>발송일</label> <label for="right" class="label"><span>*</span>발송일</label>
<div class="term">
<span class="custom_input icon_date"> <span class="custom_input icon_date">
<vuejs-datepicker <vuejs-datepicker
:language="ko" :language="ko"
@@ -22,7 +21,6 @@
></vuejs-datepicker> ></vuejs-datepicker>
</span> </span>
</div> </div>
</div>
<div class="select_box id"> <div class="select_box id">
<label for="right" class="label">요청채널</label> <label for="right" class="label">요청채널</label>
<select name="" id="" v-model="grid.params.searchType1" @keyup.enter="search"> <select name="" id="" v-model="grid.params.searchType1" @keyup.enter="search">
@@ -50,7 +48,7 @@
<div class="input_box"> <div class="input_box">
<label for="right" class="label">고객사명</label> <label for="right" class="label">고객사명</label>
<input class="search-box" type="text" id="search" placeholder="검색어 입력" v-model.trim="grid.params.searchText3" <input class="search-box" type="text" id="search" placeholder="검색어 입력" v-model.trim="grid.params.searchText3"
@keypress="onlyName" @input="onlyName" @keyup.enter="search" ref="_searchText3" maxlength="100"> @keypress="onlyText" @input="onlyText" @keyup.enter="search" ref="_searchText3" maxlength="100">
</div> </div>
<button type="button" class="button grey" @click="search">조회</button> <button type="button" class="button grey" @click="search">조회</button>
</div> </div>
@@ -173,17 +171,17 @@ export default {
columns: [ columns: [
{name: 'no', header: 'NO', align: 'center', width: '5%'}, {name: 'no', header: 'NO', align: 'center', width: '5%'},
{name: '', header: '발송일자', align: 'left', width: '11%'}, {name: 'sentDate', header: '발송일자', align: 'center', width: '11%'},
{name: '', header: '고객사명', align: 'left', width: '9%'}, {name: 'custNm', header: '고객사명', align: 'center', width: '9%'},
{name: '', header: '발송아이디(사용자ID)', align: 'center', width: '9%'}, {name: 'userId', header: '발송아이디(사용자ID)', align: 'center', width: '9%'},
{name: '', header: '수신번호', align: 'center', width: '11%'}, {name: 'phone', header: '수신번호', align: 'center', width: '11%'},
{name: '', header: '발신번호', align: 'center', width: '11%'}, {name: 'callbackNumber', header: '발신번호', align: 'center', width: '11%'},
{name: '', header: '요청채널', align: 'center', width: '5%'}, {name: 'reqProduct', header: '요청채널', align: 'center', width: '5%'},
{name: '', header: '최종채널', align: 'center', width: '5%'}, {name: 'doneCh', header: '최종채널', align: 'center', width: '5%'},
{name: '', header: '이통사', align: 'center', width: '5%'}, {name: 'doneTelco', header: '이통사', align: 'center', width: '5%'},
{name: '', header: '결과(코드)', align: 'center', width: '9%'}, {name: 'doneCode', header: '결과(코드)', align: 'center', width: '9%'},
{name: '', header: '요청일시', align: 'center', width: '10%'}, {name: 'reqDate', header: '요청일시', align: 'center', width: '10%'},
{name: '', header: '완료일시', align: 'center', width: '10%'}, {name: 'doneDate', header: '완료일시', align: 'center', width: '10%'},
], ],
noDataStr: '검색 결과가 없습니다.', noDataStr: '검색 결과가 없습니다.',
@@ -252,8 +250,8 @@ export default {
methods: { methods: {
search: function (isKeep) { search: function (isKeep) {
if (this.initMode) { if (this.initMode) {
this.grid.params.phone = 99999999999; this.grid.params.phone = '';
this.grid.params.callbackNumber = 99999999999; this.grid.params.callbackNumber = '';
} else { } else {
if (this.doValidate()) { if (this.doValidate()) {
this.grid.params.sentDate = moment(this.startDate).format('YYYYMMDD'); this.grid.params.sentDate = moment(this.startDate).format('YYYYMMDD');

5
src/main/java/kr/co/uplus/ez/api/login/LoginService.java
View File

@@ -296,6 +296,11 @@ public class LoginService {
} }
String newPw = EncryptionUtil.getCustomSHA512(updatePasswordReqDto.getUserId(), updatePasswordReqDto.getNewPw()); String newPw = EncryptionUtil.getCustomSHA512(updatePasswordReqDto.getUserId(), updatePasswordReqDto.getNewPw());
String oldPw = user.getPwd();
if(oldPw.equals(newPw)) {
return new UpdatePasswordResDto(ApiResponseCode.CE_FAILED_TO_PW_CHANGE);
}
// 2. 비밀번호 변경 - update EZ_ADM_USER (비밀번호, 비밀번호변경일시) // 2. 비밀번호 변경 - update EZ_ADM_USER (비밀번호, 비밀번호변경일시)
AuthUser authUser = new AuthUser(); AuthUser authUser = new AuthUser();

2
src/main/resources/application-local.yml
View File

@@ -42,7 +42,7 @@ mail:
templeteCode: E0005 templeteCode: E0005
msghubez: msghubez:
hmoepage-url: https://mhez-dev.uplus.co.kr homepage-url: https://mhez-dev.uplus.co.kr
api-url: https://api-int.mhez-dev.uplus.co.kr api-url: https://api-int.mhez-dev.uplus.co.kr
applicationId: EZ_ADMIN applicationId: EZ_ADMIN
uri: uri:

116
src/main/resources/mapper/mysql/mntrng/mntrng-mapper.xml
View File

@@ -4,30 +4,28 @@
<mapper namespace="kr.co.uplus.ez.api.mntrng.MntrngMapper"> <mapper namespace="kr.co.uplus.ez.api.mntrng.MntrngMapper">
<select id="selectSendListTotalCnt" parameterType="kr.co.uplus.ez.api.mntrng.dto.SendListReqDto" resultType="int"> <select id="selectSendListTotalCnt" parameterType="kr.co.uplus.ez.api.mntrng.dto.SendListReqDto" resultType="int">
SELECT SELECT COUNT(*) AS TOTALCNT
COUNT(*) AS TOTALCNT
FROM hubez_send.EZ_MSG_LOG eml FROM hubez_send.EZ_MSG_LOG eml
WHERE 1=1 WHERE 1=1
AND eml.REQ_DATE BETWEEN STR_TO_DATE(#{sentDate}, '%Y%m%d') AND DATE_ADD(STR_TO_DATE(#{sentDate}, '%Y%m%d'), INTERVAL 1 DAY) AND eml.REQ_DATE<![CDATA[ >= ]]>STR_TO_DATE(#{sentDate}, '%Y%m%d')
AND eml.REQ_DATE<![CDATA[ < ]]>DATE_ADD(STR_TO_DATE(#{sentDate}, '%Y%m%d'), INTERVAL 1 DAY)
<if test='reqChennel != null and reqChennel != "" and reqChennel != "ALL"'> <if test='reqChennel != null and reqChennel != "" and reqChennel != "ALL"'>
AND eml.REQ_PRODUCT = #{reqChennel} AND eml.REQ_PRODUCT = #{reqChennel}
</if> </if>
<if test='phone != null and phone != ""'>
AND eml.PHONE = #{phone} AND eml.PHONE = #{phone}
</if>
<if test='callbackNumber != null and callbackNumber != ""'>
AND eml.CALLBACK_NUMBER = #{callbackNumber} AND eml.CALLBACK_NUMBER = #{callbackNumber}
</if>
<if test='custNm != null and custNm != ""'> <if test='custNm != null and custNm != ""'>
AND eml.ORDER_ID IN ( AND EXISTS (
SELECT SELECT 1
T3.ORDER_ID FROM hubez_admin.EZ_SNDDCT_REQ esr
FROM hubez_common.EZ_CUST_INFO T1 INNER JOIN hubez_common.EZ_SVC_USER esi
JOIN hubez_common.EZ_SVC_USER T2 ON esi.USER_SEQ = esr.USER_SEQ
ON T1.CUST_SEQ = T2.CUST_SEQ INNER JOIN hubez_common.EZ_CUST_INFO eci
JOIN hubez_admin.EZ_SNDDCT_REQ T3 ON eci.CUST_SEQ = esi.CUST_SEQ
ON T2.USER_SEQ = T3.SNDREQ_USER_SEQ AND eci.CUST_NM LIKE CONCAT('%',#{custNm},'%')
WHERE T1.CUST_NM LIKE CONCAT('%',#{custNm},'%')) WHERE esr.ORDER_ID = eml.ORDER_ID
AND esr.ORDER_CRET_DT BETWEEN DATE_ADD(#{sentDate}, INTERVAL -3 DAY) AND DATE_ADD(#{sentDate}, INTERVAL 4 DAY)
)
</if> </if>
</select> </select>
@@ -39,20 +37,26 @@
( (
SELECT SELECT
DATE_FORMAT(eml.REQ_DATE,'%Y-%m-%d') AS SENT_DATE DATE_FORMAT(eml.REQ_DATE,'%Y-%m-%d') AS SENT_DATE
,(SELECT , CASE WHEN ORDER_ID in ('1', '2') THEN 'System'
esc.CUST_NM ELSE (
SELECT esc.CUST_NM
FROM hubez_admin.EZ_SNDDCT_REQ esr FROM hubez_admin.EZ_SNDDCT_REQ esr
join hubez_common.EZ_SVC_USER esu JOIN hubez_common.EZ_SVC_USER esu
on esr.SNDREQ_USER_SEQ = esu.USER_SEQ ON esr.SNDREQ_USER_SEQ = esu.USER_SEQ
join hubez_common.EZ_CUST_INFO esc JOIN hubez_common.EZ_CUST_INFO esc
on esu.CUST_SEQ = esc.CUST_SEQ ON esu.CUST_SEQ = esc.CUST_SEQ
WHERE esr.ORDER_ID = eml.ORDER_ID) AS CUST_NM WHERE esr.ORDER_ID = eml.ORDER_ID
,(SELECT )
esu.USER_ID END AS CUST_NM
, CASE WHEN ORDER_ID IN ('1', '2') THEN 'System'
ELSE (
SELECT esu.USER_ID
FROM hubez_admin.EZ_SNDDCT_REQ esr FROM hubez_admin.EZ_SNDDCT_REQ esr
join hubez_common.EZ_SVC_USER esu JOIN hubez_common.EZ_SVC_USER esu
on esr.SNDREQ_USER_SEQ = esu.USER_SEQ ON esr.SNDREQ_USER_SEQ = esu.USER_SEQ
WHERE esr.ORDER_ID = eml.ORDER_ID) AS USER_ID WHERE esr.ORDER_ID = eml.ORDER_ID
)
END AS USER_ID
,eml.PHONE ,eml.PHONE
,eml.CALLBACK_NUMBER ,eml.CALLBACK_NUMBER
,eml.REQ_PRODUCT ,eml.REQ_PRODUCT
@@ -63,26 +67,25 @@
,DATE_FORMAT(eml.DONE_DATE,'%Y-%m-%d %T') AS DONE_DATE ,DATE_FORMAT(eml.DONE_DATE,'%Y-%m-%d %T') AS DONE_DATE
FROM hubez_send.EZ_MSG_LOG eml FROM hubez_send.EZ_MSG_LOG eml
WHERE 1=1 WHERE 1=1
AND eml.REQ_DATE BETWEEN STR_TO_DATE(#{sentDate}, '%Y%m%d') AND DATE_ADD(STR_TO_DATE(#{sentDate}, '%Y%m%d'), INTERVAL 1 DAY) AND eml.REQ_DATE<![CDATA[ >= ]]>STR_TO_DATE(#{sentDate}, '%Y%m%d')
AND eml.REQ_DATE<![CDATA[ < ]]>DATE_ADD(STR_TO_DATE(#{sentDate}, '%Y%m%d'), INTERVAL 1 DAY)
<if test='reqChennel != null and reqChennel != ""'> <if test='reqChennel != null and reqChennel != ""'>
AND eml.REQ_PRODUCT = #{reqChennel} AND eml.REQ_PRODUCT = #{reqChennel}
</if> </if>
<if test='phone != null and phone != ""'>
AND eml.PHONE = #{phone} AND eml.PHONE = #{phone}
</if>
<if test='callbackNumber != null and callbackNumber != ""'>
AND eml.CALLBACK_NUMBER = #{callbackNumber} AND eml.CALLBACK_NUMBER = #{callbackNumber}
</if>
<if test='custNm != null and custNm != ""'> <if test='custNm != null and custNm != ""'>
AND eml.ORDER_ID IN ( AND EXISTS (
SELECT SELECT 1
T3.ORDER_ID FROM hubez_admin.EZ_SNDDCT_REQ esr
FROM hubez_common.EZ_CUST_INFO T1 INNER JOIN hubez_common.EZ_SVC_USER esi
JOIN hubez_common.EZ_SVC_USER T2 ON esi.USER_SEQ = esr.USER_SEQ
ON T1.CUST_SEQ = T2.CUST_SEQ INNER JOIN hubez_common.EZ_CUST_INFO eci
JOIN hubez_admin.EZ_SNDDCT_REQ T3 ON eci.CUST_SEQ = esi.CUST_SEQ
ON T2.USER_SEQ = T3.SNDREQ_USER_SEQ and eci.CUST_NM LIKE CONCAT('%',#{custNm},'%')
WHERE T1.CUST_NM = LIKE CONCAT('%',#{custNm},'%')) WHERE esr.ORDER_ID = eml.ORDER_ID
AND esr.ORDER_CRET_DT BETWEEN DATE_ADD(#{sentDate}, INTERVAL -3 DAY) AND DATE_ADD(#{sentDate}, INTERVAL 4 day)
)
</if> </if>
ORDER BY eml.SENT_DATE DESC ORDER BY eml.SENT_DATE DESC
LIMIT #{page}, #{pagePerRows}) A, LIMIT #{page}, #{pagePerRows}) A,
@@ -90,10 +93,9 @@
</select> </select>
<select id="selectLiveSendSttus" parameterType="kr.co.uplus.ez.api.mntrng.dto.LiveSendSttus" resultType="kr.co.uplus.ez.api.mntrng.dto.LiveSendSttus"> <select id="selectLiveSendSttus" parameterType="kr.co.uplus.ez.api.mntrng.dto.LiveSendSttus" resultType="kr.co.uplus.ez.api.mntrng.dto.LiveSendSttus">
SELECT SELECT IFNULL(SUM(SEND_CNT + FB_SEND_CNT), 0) AS SEND_CNT
IFNULL(SUM(T1.SEND_CNT + T2.FB_SEND_CNT), 0) AS SEND_CNT , IFNULL(SUM(SUCC_CNT + FB_SUCC_CNT), 0) AS SUCC_CNT
,IFNULL(SUM(T1.SUCC_CNT+T2.FB_SUCC_CNT), 0) AS SUCC_CNT , IFNULL(ROUND((SUM(SUCC_CNT + FB_SUCC_CNT) / SUM(SEND_CNT + FB_SEND_CNT) * 100), 2), 0) AS SUCC_RT
,IFNULL(ROUND((SUM(T1.SUCC_CNT+T2.FB_SUCC_CNT) / SUM(T1.SEND_CNT+T2.FB_SEND_CNT) * 100), 2), 0) AS SUCC_RT
<if test='reqType != null and reqType != ""'> <if test='reqType != null and reqType != ""'>
<if test='reqType eq "M"'> <if test='reqType eq "M"'>
, DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -10 MINUTE), '%Y.%m.%d %H:%i') AS START_TIME , DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -10 MINUTE), '%Y.%m.%d %H:%i') AS START_TIME
@@ -106,13 +108,14 @@
</if> </if>
</if> </if>
, DATE_FORMAT(NOW(),'%Y.%m.%d %H:%i') AS END_TIME , DATE_FORMAT(NOW(),'%Y.%m.%d %H:%i') AS END_TIME
FROM FROM (
(SELECT SELECT SUM(IFNULL(SEND_CNT,0)) AS SEND_CNT
SUM(IFNULL(SEND_CNT,0)) AS SEND_CNT
, SUM(IFNULL(SUCC_CNT,0)) AS SUCC_CNT , SUM(IFNULL(SUCC_CNT,0)) AS SUCC_CNT
, 0 as FB_SEND_CNT
, 0 as FB_SUCC_CNT
FROM hubez_common.EZ_WEB_MSG FROM hubez_common.EZ_WEB_MSG
WHERE 1=1 WHERE 1=1
AND CH_STR = #{chStr} AND CH_STR = 'SMS'
<if test='reqType != null and reqType != ""'> <if test='reqType != null and reqType != ""'>
<if test='reqType eq "M"'> <if test='reqType eq "M"'>
<![CDATA[ <![CDATA[
@@ -130,13 +133,15 @@
]]> ]]>
</if> </if>
</if> </if>
GROUP BY CH_STR) T1, GROUP BY CH_STR
(SELECT union all
SUM(IFNULL(FB_SUCC_CNT,0)+IFNULL(FB_FAIL_CNT,0)) AS FB_SEND_CNT SELECT 0 AS SEND_CNT
, 0 AS SUCC_CNT
, SUM(IFNULL(FB_SUCC_CNT,0)+IFNULL(FB_FAIL_CNT,0)) AS FB_SEND_CNT
, SUM(IFNULL(FB_SUCC_CNT,0)) AS FB_SUCC_CNT , SUM(IFNULL(FB_SUCC_CNT,0)) AS FB_SUCC_CNT
FROM hubez_common.EZ_WEB_MSG FROM hubez_common.EZ_WEB_MSG
WHERE 1=1 WHERE 1=1
AND FB_CH_STR = #{chStr} AND FB_CH_STR = 'SMS'
<if test='reqType != null and reqType != ""'> <if test='reqType != null and reqType != ""'>
<if test='reqType eq "M"'> <if test='reqType eq "M"'>
<![CDATA[ <![CDATA[
@@ -154,7 +159,8 @@
]]> ]]>
</if> </if>
</if> </if>
GROUP BY FB_CH_STR) T2 GROUP BY FB_CH_STR
) T
</select> </select>
</mapper> </mapper>