diff --git a/frontend/src/assets/css/layout.css b/frontend/src/assets/css/layout.css index 9227431..dad6d67 100644 --- a/frontend/src/assets/css/layout.css +++ b/frontend/src/assets/css/layout.css @@ -130,10 +130,10 @@ max-height: 90vh; overflow: auto;}/*스크린 height 100%를 벗어나는 긴 .popup .pop-cont {} .popup .pop-cont p {font-size: 16px; color: #666666; font-weight: 400; letter-spacing: -0.8px; line-height: 100%;} .popup .pop-cont p + p {margin-top: 10px;} -.popup .pop-btn1 {display: flex; justify-content: flex-start; align-items: center; margin: 35px 0 25px;} -.popup .pop-btn2 {display: flex; justify-content: space-between; align-items: center; margin: 35px 0 25px;} -.popup .pop-btn1 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} -.popup .pop-btn2 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} +.popup .popup-btn1 {display: flex; justify-content: flex-start; align-items: center; margin: 35px 0 25px;} +.popup .popup-btn2 {display: flex; justify-content: space-between; align-items: center; margin: 35px 0 25px;} +.popup .popup-btn1 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} +.popup .popup-btn2 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css index 4dc53de..0d2ff86 100644 --- a/frontend/src/assets/css/style.css +++ b/frontend/src/assets/css/style.css @@ -319,7 +319,7 @@ header .user_wrap .user_info .logout { .contents { padding: 0 4.16vw; - width: 100%; + width: calc(100% - 240px); -webkit-box-flex: 1; -ms-flex: 1 1 0px; flex: 1 1 0; @@ -427,7 +427,7 @@ header .user_wrap .user_info .logout { margin-left: 0; } -.contents .select_box { +.contents .select_box{ display: -webkit-box; display: -ms-flexbox; display: flex; @@ -474,7 +474,7 @@ header .user_wrap .user_info .logout { margin-top:-7px; } -.contents .input_box { +.contents .input_box{ display: -webkit-box; display: -ms-flexbox; display: flex; @@ -567,11 +567,7 @@ header .user_wrap .user_info .logout { background: #fff url(../images/icon-calender.png) no-repeat right 6% center; } .contents .input_box.cal input + input{ - margin-left: 4%; -} - -.contents .input_box.cal .description{ - position: absolute; margin: 10px 0 0 10px; color:#666; font-size: 13px; font-weight: 400; + margin-left: 5%; } .contents .input_box.cal.one{ @@ -586,6 +582,16 @@ header .user_wrap .user_info .logout { margin-right: 10px; } +.contents .input_box.cal .term{ + display: flex; + justify-content: space-around; + align-items: center; +} + +.contents .input_box.cal .term input:nth-child(1){ + margin-right: 4%; +} + .contents .input_box .search-box { background: #fff url(../images/icon-search.png) no-repeat 6% center/14px auto; padding-left: 43px; @@ -806,7 +812,7 @@ header .user_wrap .user_info .logout { /*pagination*/ -.contents .pagination .arrow-btn button{ +.pagination .arrow-btn button{ border:none; padding: 0 5px; } @@ -828,27 +834,37 @@ header .user_wrap .user_info .logout { .btn-prev, .btn-next{background-position: 0px -24px;} .btn-prev:hover, .btn-next:hover{background-position: 0px -72px;} -.contents .pagination { +.pagination { display:flex; justify-content: center; margin-bottom: 50px; } -.contents .pagination ul{ +.pagination ul{ display:flex; align-items:center; } -.contents .pagination ul li a{ +.pagination ul .active a{ + color:#eb008b; + text-decoration: underline; +} + +.pagination ul li a{ color:#9a9a9a; font-size: 14px; padding: 0 15px; } -.contents .pagination ul li a:hover{ + +.pagination ul li a:hover{ color:#000; text-decoration: underline; } +.popup.popup_form .pagination{ + margin-top:25px; +} + /*contents table 추가*/ .contents .table table .arrow_box { @@ -903,16 +919,18 @@ header .user_wrap .user_info .logout { } .contents .table.calculate.scroll{ - max-width: 1240px; - overflow: auto; + width: calc(100% - 80px); + overflow-x: auto; margin: 0 auto; margin-bottom: 60px; - padding: 0; + padding: 0 0 10px 0; } -.contents .table.calculate.scroll div{ - min-width: 1400px; - padding-bottom: 10px; +.contents .table.calculate.scroll table{ + min-width: 1500px; + width:100%; + table-layout: fixed; + white-space: nowrap; } .contents .table table .total{ @@ -937,6 +955,12 @@ header .user_wrap .user_info .logout { padding-left: 10px; } +.contents .table.table_form .radio .label_group label{ + display: flex; + height: 30px; + align-items: center; +} + .contents .table { color: #333333; padding: 0 40px; @@ -1183,17 +1207,17 @@ header .user_wrap .user_info .logout { margin-bottom: -1px; } -.popup.popup_form .pop-btn2 { +.popup.popup_form .popup-btn2 { -webkit-box-pack: end; -ms-flex-pack: end; justify-content: flex-end; } -.popup.popup_form .pop-btn2 button { +.popup.popup_form .popup-btn2 button { width: 30%; } -.popup.popup_form .pop-btn2 button:last-child { +.popup.popup_form .popup-btn2 button:last-child { margin-left: 10px; } @@ -1402,19 +1426,19 @@ header .user_wrap .user_info .logout { margin-top: 20px; } -.popup.popup_form .pop-btn2 .download { +.popup.popup_form .popup-btn2 .download { display: flex; justify-content: center; align-items: center; } -.popup.popup_form .pop-btn2.bulk{ +.popup.popup_form .popup-btn2.bulk{ justify-content: space-between; margin-bottom: 20px; } -.popup.popup_form .pop-btn2.bulk button{ +.popup.popup_form .popup-btn2.bulk button{ width: 49%; display: flex; -webkit-box-pack: center; @@ -1426,7 +1450,7 @@ header .user_wrap .user_info .logout { font-size: 16px; } -.popup.popup_form .pop-btn2.bulk button:nth-child(1)::before{ +.popup.popup_form .popup-btn2.bulk button:nth-child(1)::before{ content: ''; background: url(../images/icon-f-download.png) no-repeat 0 0; width: 23px; @@ -1434,7 +1458,7 @@ header .user_wrap .user_info .logout { margin: 2px 5px 0 15px; } -.popup.popup_form .pop-btn2.bulk button:nth-child(2)::before{ +.popup.popup_form .popup-btn2.bulk button:nth-child(2)::before{ content: ''; background: url(../images/icon-f-upload.png) no-repeat 0 0; width: 23px; @@ -1450,39 +1474,41 @@ header .user_wrap .user_info .logout { } .popup.popup_form .attach button{ - margin:0; - width: 35%; + margin: 0 10px 0 0; + width: 35%; +} + +.popup.popup_form .attach .list{ + width: 100%; + padding-bottom: 5px; + font-size: 16px; } .popup.popup_form .attach .file{ - margin-left:10px; - margin-bottom: 0; -} - -.popup.popup_form .attach p:not(.file){ - color: #000; - width: 100%; -} - -.popup.popup_form p + p{ - padding-top:5px; + padding:0; } .popup.popup_form .file{ color: #656565; - margin-bottom: 18px; + display: inline-flex; + align-items: center; + font-size: 14px; + padding-bottom: 5px; +} + +.popup-btn2.bulk + .file{ + margin-bottom: 18px; + padding-bottom: 0; } .popup.popup_form .file button{ - background: #e4e4e4 url(../images/icon-delete.png) no-repeat center center; - width: 24px; - height: 24px; - display: inline-block; + background: #e4e4e4; + width: 15px; + height: 15px; border-radius: 50%; - position: relative; - top: 6px; - left: 5px; border: none; + font-size: 10px; + margin: 0 0 0 5px; } .popup.popup_form.register{ @@ -1504,6 +1530,7 @@ header .user_wrap .user_info .logout { .popup.popup_form.register .input_add div{ display: flex; justify-content: space-between; + width:100%; } .popup.popup_form.register .input_add div input:nth-child(1){ @@ -1650,7 +1677,21 @@ header .user_wrap .user_info .logout { .popup.popup_form table .input_add{ display: flex; justify-content: space-between; - padding: 5px 0px 5px 0px; + padding: 5px 0px 5px 10px; + flex-wrap: wrap; +} + +.popup.popup_form table .input_add input{ + width: 85%; +} +.essential{ + display: flex; + align-items: flex-start; +} + +.essential span{ + color:#eb008b; + padding-right: 3px; } textarea{ @@ -1668,5 +1709,32 @@ textarea:focus{ outline: 1px solid #000; } +/*toggle*/ +.contents .table table input[type="checkbox"] + label.toggle_switch { width: 72px; height: 28px; border-radius: 14px; border: 1px solid #b7b9be; background: #cecece; transition: all 0.3s; } +.contents .table table input[type="checkbox"] + label.toggle_switch:before { content:"미사용";position: absolute; display: block; width: 100%; height:100%; font-size: 14px; color:#fff; line-height: 28px; padding: 0 0 0 15px; font-family: 'SpoqaHanSansNeo', sans-serif; box-sizing: border-box; transition: all 0.3s; } +.contents .table table input[type="checkbox"] + label.toggle_switch:after { content:""; position: absolute; display: block; width:14px; height: 14px; top:50%; left: 7px; transform: translateY(-50%); background: #fff; border-radius: 100%; transition: all 0.5s; } +.contents .table table input[type="checkbox"]:checked + label.toggle_switch { border-color:#eb008b; background:#fff; } +.contents .table table input[type="checkbox"]:checked + label.toggle_switch:before { content:"사용"; color:#eb008b; padding: 0 15px 0 0; } +.contents .table table input[type="checkbox"]:checked + label.toggle_switch:after { background: #eb008b; left: 45px;} + +/*datepicker*/ + +.datepicker{position: absolute; top: 336px; left: 381px; z-index: 1; display: block; padding: 24px 0; border: 1px solid #eceff1; background: #fff;box-shadow: 0 2px 4px 0 rgb(0 0 0 / 16%);border-radius: 5px;} +.datepicker .datepicker-head{margin-bottom: 28px;} +.datepicker .datepicker-title{text-align: center; font-size: 20px;} +.datepicker .datepicker-calender{margin: 0 30px; font-size: 12px;} +.datepicker .datepicker-calender td{padding: 7.5px; line-height: 15px;} +.datepicker .datepicker-calender td a{text-align: center; width: 15px; height: 15px; display: inline-block; color:#000;} +.datepicker .datepicker-calender tr td:last-child a{color:#5d7aff;} +.datepicker .datepicker-calender tr td:first-child a{color:#ff2e76;} +.datepicker .datepicker-head .datepicker-btn span{position: relative;} +.datepicker .datepicker-head .datepicker-prev span::after{position: absolute; left: 70px; top: 10px; content: ''; width: 10px; height: 10px; border-top: 2px solid #5f5f5f; border-right: 2px solid #5f5f5f; transform: rotate(225deg);} +.datepicker .datepicker-head .datepicker-next span::after{position: absolute; left: 185px; top: 10px; content: ''; width: 10px; height: 10px; border-top: 2px solid #5f5f5f; border-right: 2px solid #5f5f5f; transform: rotate(45deg);} +.datepicker .datepicker-calender td:hover:not(.disabled){background-color: #efefef; border-radius: 50%;} +.datepicker .datepicker-calender td:hover a{color:#000;} +.datepicker .datepicker-calender .today{background-color: #7c7c7c; border-radius: 50%;} +.datepicker .datepicker-calender .click{background-color: #eb008b; border-radius: 50%;} +.datepicker .datepicker-calender .click a, .datepicker .datepicker-calender .today a{color: #fff;} +.datepicker .datepicker-calender .disabled a{color:#c9c9c9 !important;} /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/frontend/src/components/ButtonBranch.vue b/frontend/src/components/ButtonBranch.vue deleted file mode 100644 index 24de4a1..0000000 --- a/frontend/src/components/ButtonBranch.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/components/CreateBrandViewer.vue b/frontend/src/components/CreateBrandViewer.vue deleted file mode 100644 index 67cab3c..0000000 --- a/frontend/src/components/CreateBrandViewer.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - diff --git a/frontend/src/components/address/AddressCustomPopup.vue b/frontend/src/components/address/AddressCustomPopup.vue deleted file mode 100644 index 959fae9..0000000 --- a/frontend/src/components/address/AddressCustomPopup.vue +++ /dev/null @@ -1,235 +0,0 @@ - - - - - diff --git a/frontend/src/components/address/index.vue b/frontend/src/components/address/index.vue deleted file mode 100644 index d1183b2..0000000 --- a/frontend/src/components/address/index.vue +++ /dev/null @@ -1,332 +0,0 @@ - - - - - diff --git a/frontend/src/modules/attractMgt/router/index.js b/frontend/src/modules/attractMgt/router/index.js index 32552e5..48a845e 100644 --- a/frontend/src/modules/attractMgt/router/index.js +++ b/frontend/src/modules/attractMgt/router/index.js @@ -1,11 +1,11 @@ -import ChannelList from '../views/ChannelList' - -export default [ - { - path: '/attractMgt/channelList', - component: ChannelList, - name: 'channelList', - meta: { public: true } - } -] - +import ChannelList from '../views/ChannelList' + +export default [ + { + path: '/attractMgt/channelList', + component: ChannelList, + name: 'channelList', + meta: { public: true } + } +] + diff --git a/frontend/src/modules/attractMgt/views/ChannelList.vue b/frontend/src/modules/attractMgt/views/ChannelList.vue index 2f6b242..99f4c30 100644 --- a/frontend/src/modules/attractMgt/views/ChannelList.vue +++ b/frontend/src/modules/attractMgt/views/ChannelList.vue @@ -1,107 +1,107 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/calculate/router/index.js b/frontend/src/modules/calculate/router/index.js index 1a91466..8f1ed21 100644 --- a/frontend/src/modules/calculate/router/index.js +++ b/frontend/src/modules/calculate/router/index.js @@ -1,12 +1,12 @@ -import CalcList from '../views/CalcList' - -export default [ - { - path: '/calculate/calcList', - component: CalcList, - name: 'calcList', - meta: { public: true } - }, - -] - +import CalcList from '../views/CalcList' + +export default [ + { + path: '/calculate/calcList', + component: CalcList, + name: 'calcList', + meta: { public: true } + }, + +] + diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue index 0cbc905..714e6fe 100644 --- a/frontend/src/modules/calculate/views/CalcList.vue +++ b/frontend/src/modules/calculate/views/CalcList.vue @@ -1,165 +1,165 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/AdminNmPop.vue b/frontend/src/modules/custMgt/components/AdminNmPop.vue index 7dc0562..5d13f6d 100644 --- a/frontend/src/modules/custMgt/components/AdminNmPop.vue +++ b/frontend/src/modules/custMgt/components/AdminNmPop.vue @@ -1,14 +1,14 @@ - - diff --git a/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json b/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json index d72b01c..49226af 100644 --- a/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json +++ b/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json @@ -7,7 +7,7 @@ }, { "key": "serviceId", - "name": "서비스 ID (관리자 ID)" + "name": "서비스 ID" }, { "key": "custNm", diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue index 1d09033..4d0b01c 100644 --- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue +++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue @@ -5,7 +5,7 @@

청약고객관리

- +
@@ -92,7 +92,7 @@
- +
@@ -227,9 +227,10 @@ export default { }, set(value) { const selected = []; - if (value) { this.list.forEach((com) => { + //var chkList = {userId :com.userId}; + //console.log(chkList) selected.push(com.userId); }); } @@ -322,18 +323,18 @@ export default { this.$refs.memoTatalListPop.memoTotalModalOpen(this.row); }, async memberDelete(){ - // console.log(this.selected) + if(window.confirm('삭제 하시겠습니까?')){ - this.row.list = this.selected; + var serviceId = this.adminId; + this.row.list = this.selected.map((row)=>({userId:row})); + this.row.adminId = this.adminId; console.log(this.row); try { - const response = await custMgtApi.deleteUser(this.row); + let response = await custMgtApi.deleteUser(this.row); const result = response.data; - if (result != null && result.retCode == "0000") { - - //alert("저장 완료하였습니다."); - + alert("저장 완료하였습니다."); + this.memberDetail(serviceId); } } catch (error) { console.log(error); diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue index 6209277..a150a44 100644 --- a/frontend/src/modules/custMgt/views/SubsDetail.vue +++ b/frontend/src/modules/custMgt/views/SubsDetail.vue @@ -9,7 +9,7 @@
기본정보
- +
@@ -59,13 +59,13 @@
-
+
사용정보
-
+ @@ -110,7 +110,7 @@
-
+
사용자 데이터
@@ -151,7 +151,7 @@
- +
@@ -169,11 +169,11 @@ - -
+ + - + + + \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/components/InsertMsgPop.vue b/frontend/src/modules/riskMgt/components/InsertMsgPop.vue new file mode 100644 index 0000000..f88c901 --- /dev/null +++ b/frontend/src/modules/riskMgt/components/InsertMsgPop.vue @@ -0,0 +1,77 @@ + + + diff --git a/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue new file mode 100644 index 0000000..729c0e2 --- /dev/null +++ b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue @@ -0,0 +1,193 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/router/index.js b/frontend/src/modules/riskMgt/router/index.js index 7829f9d..641f368 100644 --- a/frontend/src/modules/riskMgt/router/index.js +++ b/frontend/src/modules/riskMgt/router/index.js @@ -1,33 +1,33 @@ -import IntrcpList from '../views/IntrcpList' -import ZezNum from '../views/ZezNum' -import Msg from '../views/Msg' -import All from '../views/All' - -export default [ - { - path: '/riskMgt/sendNum/intrcpList', - component: IntrcpList, - name: 'intrcpList', - meta: { public: true } - }, - { - path: '/riskMgt/sendNum/zezNum', - component: ZezNum, - name: 'zezNum', - meta: { public: true } - }, - { - path: '/riskMgt/sendNum/msg', - component: Msg, - name: 'msg', - meta: { public: true } - }, - { - path: '/riskMgt/sendNum/all', - component: All, - name: 'all', - meta: { public: true } - }, - -] - +import IntrcpList from '../views/IntrcpList' +import ZezNum from '../views/ZezNum' +import Msg from '../views/Msg' +import All from '../views/All' + +export default [ + { + path: '/riskMgt/sendNum/intrcpList', + component: IntrcpList, + name: 'intrcpList', + meta: { public: true } + }, + { + path: '/riskMgt/sendNum/zezNum', + component: ZezNum, + name: 'zezNum', + meta: { public: true } + }, + { + path: '/riskMgt/sendNum/msg', + component: Msg, + name: 'msg', + meta: { public: true } + }, + { + path: '/riskMgt/sendNum/all', + component: All, + name: 'all', + meta: { public: true } + }, + +] + diff --git a/frontend/src/modules/riskMgt/service/riskMgtApi.js b/frontend/src/modules/riskMgt/service/riskMgtApi.js new file mode 100644 index 0000000..a05b000 --- /dev/null +++ b/frontend/src/modules/riskMgt/service/riskMgtApi.js @@ -0,0 +1,27 @@ +import httpClient from '@/common/http-client' + +// HUBEZ_BO_API_11004 발신번호 차단 수정 +const updateIntrcp = (params) => { + return httpClient.post('/api/v1/bo/riskMgt/sendNum/updateIntrcp', params, { withCredentials: false }); +} + +// HUBEZ_BO_API_11004 발신번호 차단 상세 정보 조회 +const intrcpDetail = (params) => { + return httpClient.post('/api/v1/bo/riskMgt/sendNum/intrcpDetail', params, { withCredentials: false }); +} +// HUBEZ_BO_API_11003 발신번호 차단 신규 등록 +const insertIntrcp = (params) => { + return httpClient.post('/api/v1/bo/riskMgt/sendNum/insertIntrcp', params, { withCredentials: false }); +} + +const deleteIntrcp = (params) => { + return httpClient.post('/api/v1/bo/riskMgt/sendNum/deleteIntrcp', params, { withCredentials: false }); +} + + +export default { + updateIntrcp, + intrcpDetail, + insertIntrcp, + deleteIntrcp +} \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/views/All.vue b/frontend/src/modules/riskMgt/views/All.vue index c8337f1..b6391af 100644 --- a/frontend/src/modules/riskMgt/views/All.vue +++ b/frontend/src/modules/riskMgt/views/All.vue @@ -1,165 +1,245 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/views/IntrcpList.vue b/frontend/src/modules/riskMgt/views/IntrcpList.vue index 6c8b681..b771985 100644 --- a/frontend/src/modules/riskMgt/views/IntrcpList.vue +++ b/frontend/src/modules/riskMgt/views/IntrcpList.vue @@ -1,165 +1,251 @@ - - - \ No newline at end of file + + + diff --git a/frontend/src/modules/riskMgt/views/Msg.vue b/frontend/src/modules/riskMgt/views/Msg.vue index 50551c4..32abdc5 100644 --- a/frontend/src/modules/riskMgt/views/Msg.vue +++ b/frontend/src/modules/riskMgt/views/Msg.vue @@ -1,165 +1,183 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/views/ZezNum.vue b/frontend/src/modules/riskMgt/views/ZezNum.vue index fda4d78..3a6b7d6 100644 --- a/frontend/src/modules/riskMgt/views/ZezNum.vue +++ b/frontend/src/modules/riskMgt/views/ZezNum.vue @@ -1,165 +1,191 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/sendNumMgt/router/index.js b/frontend/src/modules/sendNumMgt/router/index.js index 793cfa5..246dfb2 100644 --- a/frontend/src/modules/sendNumMgt/router/index.js +++ b/frontend/src/modules/sendNumMgt/router/index.js @@ -1,26 +1,26 @@ -import ProfileList from '../views/ProfileList' -import NumberList from '../views/NumberList' -import ApprList from '../views/ApprList' - -export default [ - { - path: '/sendNumMgt/profileList', - component: ProfileList, - name: 'profileList', - meta: { public: true } - }, - { - path: '/sendNumMgt/numberList', - component: NumberList, - name: 'numberList', - meta: { public: true } - }, - { - path: '/sendNumMgt/apprList', - component: ApprList, - name: 'apprList', - meta: { public: true } - }, - -] - +import ProfileList from '../views/ProfileList' +import NumberList from '../views/NumberList' +import ApprList from '../views/ApprList' + +export default [ + { + path: '/sendNumMgt/profileList', + component: ProfileList, + name: 'profileList', + meta: { public: true } + }, + { + path: '/sendNumMgt/numberList', + component: NumberList, + name: 'numberList', + meta: { public: true } + }, + { + path: '/sendNumMgt/apprList', + component: ApprList, + name: 'apprList', + meta: { public: true } + }, + +] + diff --git a/frontend/src/modules/sendNumMgt/views/ApprList.vue b/frontend/src/modules/sendNumMgt/views/ApprList.vue index 1313c59..4414a0c 100644 --- a/frontend/src/modules/sendNumMgt/views/ApprList.vue +++ b/frontend/src/modules/sendNumMgt/views/ApprList.vue @@ -1,165 +1,165 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/sendNumMgt/views/NumberList.vue b/frontend/src/modules/sendNumMgt/views/NumberList.vue index 9975266..bd7c98e 100644 --- a/frontend/src/modules/sendNumMgt/views/NumberList.vue +++ b/frontend/src/modules/sendNumMgt/views/NumberList.vue @@ -1,165 +1,229 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/sendNumMgt/views/ProfileList.vue b/frontend/src/modules/sendNumMgt/views/ProfileList.vue index 494098e..dc6dba8 100644 --- a/frontend/src/modules/sendNumMgt/views/ProfileList.vue +++ b/frontend/src/modules/sendNumMgt/views/ProfileList.vue @@ -1,165 +1,208 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/statics/components/CampaignStaticsList.vue b/frontend/src/modules/statics/components/CampaignStaticsList.vue index 4ee14d3..8fff4b7 100644 --- a/frontend/src/modules/statics/components/CampaignStaticsList.vue +++ b/frontend/src/modules/statics/components/CampaignStaticsList.vue @@ -1,563 +1,563 @@ - - - + + + diff --git a/frontend/src/modules/statics/components/StaticsList.vue b/frontend/src/modules/statics/components/StaticsList.vue index 4e83299..0c9c29d 100644 --- a/frontend/src/modules/statics/components/StaticsList.vue +++ b/frontend/src/modules/statics/components/StaticsList.vue @@ -1,433 +1,433 @@ - - - - + + + + diff --git a/frontend/src/modules/statics/components/TmpltStaticsList.vue b/frontend/src/modules/statics/components/TmpltStaticsList.vue index c5eb95a..e552910 100644 --- a/frontend/src/modules/statics/components/TmpltStaticsList.vue +++ b/frontend/src/modules/statics/components/TmpltStaticsList.vue @@ -1,551 +1,551 @@ - - - + + + diff --git a/frontend/src/modules/statics/components/UserStaticsList.vue b/frontend/src/modules/statics/components/UserStaticsList.vue index e3cf91d..f47507d 100644 --- a/frontend/src/modules/statics/components/UserStaticsList.vue +++ b/frontend/src/modules/statics/components/UserStaticsList.vue @@ -1,609 +1,609 @@ - - - + + + diff --git a/frontend/src/modules/statics/router/index.js b/frontend/src/modules/statics/router/index.js index 67e450b..9cc0cfe 100644 --- a/frontend/src/modules/statics/router/index.js +++ b/frontend/src/modules/statics/router/index.js @@ -1,33 +1,33 @@ -import StaticsList from "../components/StaticsList"; -import TmpltStatics from "../components/TmpltStaticsList"; -import UserStatics from "../components/UserStaticsList"; -import CampaignStaticsList from "../components/CampaignStaticsList"; - -export default [ - { - // - path: '/view/stat/prod', - name: 'staticsList', - component: StaticsList, - }, - { - // - path: '/view/stat/tmplt', - name: 'tmpltStatics', - component: TmpltStatics, - }, - { - // - path: '/view/stat/usr', - name: 'userStatics', - component: UserStatics, - }, - { - // - path: '/view/stat/camp', - name: 'campaignStatics', - component: CampaignStaticsList, - }, -] - +import StaticsList from "../components/StaticsList"; +import TmpltStatics from "../components/TmpltStaticsList"; +import UserStatics from "../components/UserStaticsList"; +import CampaignStaticsList from "../components/CampaignStaticsList"; + +export default [ + { + // + path: '/view/stat/prod', + name: 'staticsList', + component: StaticsList, + }, + { + // + path: '/view/stat/tmplt', + name: 'tmpltStatics', + component: TmpltStatics, + }, + { + // + path: '/view/stat/usr', + name: 'userStatics', + component: UserStatics, + }, + { + // + path: '/view/stat/camp', + name: 'campaignStatics', + component: CampaignStaticsList, + }, +] + \ No newline at end of file diff --git a/frontend/src/modules/statics/service/api.js b/frontend/src/modules/statics/service/api.js index bae17fe..e7866dc 100644 --- a/frontend/src/modules/statics/service/api.js +++ b/frontend/src/modules/statics/service/api.js @@ -1,147 +1,147 @@ -import httpClient from '@/common/http-client'; -import prodExcelHeader from './mock/prodExcelHeader'; -import tmplExcelHeader from './mock/tmplExcelHeader'; -import userExcelHeader from './mock/userExcelHeader'; -import campExcelHeader from './mock/campExcelHeader'; -//import lodash from "lodash"; - -const selectStatics = params => { - return httpClient.get('/api/statics/list'); -}; - -const selectStaticsSummary = params => { - return httpClient.get('/api/statics/list/summary', { - params: { dateDiv: params.dateDiv, sDate: params.sDate, eDate: params.eDate } - }); -}; - -const selectStaticsXls = params => { - return httpClient.post('/api/statics/xls/list', params); -}; - -const selectTmpltlist = params => { - return httpClient.get('/api/statics/tmpltList'); -}; - -const selectTmpltXlslist = params => { - return httpClient.post('/api/statics/tmpltList/xls/list', params); -}; - -const selectTmpltSummary = params => { - return httpClient.get('/api/statics/tmpltList/summary', { - params: { - dateDiv: params.dateDiv, - sDate: params.sDate, - eDate: params.eDate, - searchProdCd: params.searchProdCd, - searchMsgbaseId: params.searchMsgbaseId - // searchProdCd: params.searchProdCd != undefined ? params.searchProdCd : null, - // searchMsgbaseId: params.searchMsgbaseId != undefined ? params.searchMsgbaseId : null - } - }); -}; - -const selectUserlist = params => { - return httpClient.get('/api/statics/userList'); -}; - -const selectUserXlslist = params => { - return httpClient.post('/api/statics/userList/xls/list', params); -}; - -const selectUserSummary = params => { - return httpClient.get('/api/statics/userList/summary', { - params: { - dateDiv: params.dateDiv, - sDate: params.sDate, - eDate: params.eDate, - searchDeptNm: params.searchDeptNm, - searchUserId: params.searchUserId - } - }); -}; - -const selectCampXlslist = params => { - return httpClient.post('/api/statics/campList/xls/list', params); -}; - -const selectCampSummary = params => { - return httpClient.get('/api/statics/campList/summary', { - params: { - dateDiv: params.dateDiv, - sDate: params.sDate, - eDate: params.eDate, - searchCampId: params.searchCampId - } - }); -}; - -const selectCodeProdList = codeGrp => { - // ES6에서는 key와 value가 같을경우. get은 아래와 같이 가능. - return httpClient.get('/api/statics/code/list', { params: { codeGrp } }); -}; - -const selectMsgbaseIdList = searchProdCd => { - //console.log("api selectMsgbaseIdList productcode : " + searchProdCd); - return httpClient.get('/api/statics/msgbaseid/list', { params: { searchProdCd } }); -}; - -const selectDeptNmList = () => { - return httpClient.get('/api/statics/deptNm/list'); -}; - -const selectUserRoleInfo = () => { - return httpClient.get('/api/statics/userId/roleId'); -}; - -const selectUserIdList = searchDeptNm => { - //console.log("api selectUserIdList searchDeptNm : " + searchDeptNm); - return httpClient.get('/api/statics/userId/list', { params: { searchDeptNm } }); -}; - -const getExcelHeader = category => { - // 엑셀에 출력할 Header 정보를 Mockup 데이터로 관리한다. - return new Promise(function(resolve, reject) { - let header = []; - switch (category) { - case 'TMPL': - header = tmplExcelHeader.header; - break; - case 'USER': - header = userExcelHeader.header; - break; - case 'CAMPAIGN': - header = campExcelHeader.header; - break; - default: - header = prodExcelHeader.header; - break; - } - resolve(header); - }); -}; - -export default { - selectStatics, - selectStaticsXls, - selectStaticsSummary, - - selectTmpltlist, - selectTmpltXlslist, - selectTmpltSummary, - - selectUserlist, - selectUserXlslist, - selectUserSummary, - - selectCampXlslist, - selectCampSummary, - - selectCodeProdList, - selectMsgbaseIdList, - selectDeptNmList, - selectUserIdList, - - selectUserRoleInfo, - getExcelHeader -}; +import httpClient from '@/common/http-client'; +import prodExcelHeader from './mock/prodExcelHeader'; +import tmplExcelHeader from './mock/tmplExcelHeader'; +import userExcelHeader from './mock/userExcelHeader'; +import campExcelHeader from './mock/campExcelHeader'; +//import lodash from "lodash"; + +const selectStatics = params => { + return httpClient.get('/api/statics/list'); +}; + +const selectStaticsSummary = params => { + return httpClient.get('/api/statics/list/summary', { + params: { dateDiv: params.dateDiv, sDate: params.sDate, eDate: params.eDate } + }); +}; + +const selectStaticsXls = params => { + return httpClient.post('/api/statics/xls/list', params); +}; + +const selectTmpltlist = params => { + return httpClient.get('/api/statics/tmpltList'); +}; + +const selectTmpltXlslist = params => { + return httpClient.post('/api/statics/tmpltList/xls/list', params); +}; + +const selectTmpltSummary = params => { + return httpClient.get('/api/statics/tmpltList/summary', { + params: { + dateDiv: params.dateDiv, + sDate: params.sDate, + eDate: params.eDate, + searchProdCd: params.searchProdCd, + searchMsgbaseId: params.searchMsgbaseId + // searchProdCd: params.searchProdCd != undefined ? params.searchProdCd : null, + // searchMsgbaseId: params.searchMsgbaseId != undefined ? params.searchMsgbaseId : null + } + }); +}; + +const selectUserlist = params => { + return httpClient.get('/api/statics/userList'); +}; + +const selectUserXlslist = params => { + return httpClient.post('/api/statics/userList/xls/list', params); +}; + +const selectUserSummary = params => { + return httpClient.get('/api/statics/userList/summary', { + params: { + dateDiv: params.dateDiv, + sDate: params.sDate, + eDate: params.eDate, + searchDeptNm: params.searchDeptNm, + searchUserId: params.searchUserId + } + }); +}; + +const selectCampXlslist = params => { + return httpClient.post('/api/statics/campList/xls/list', params); +}; + +const selectCampSummary = params => { + return httpClient.get('/api/statics/campList/summary', { + params: { + dateDiv: params.dateDiv, + sDate: params.sDate, + eDate: params.eDate, + searchCampId: params.searchCampId + } + }); +}; + +const selectCodeProdList = codeGrp => { + // ES6에서는 key와 value가 같을경우. get은 아래와 같이 가능. + return httpClient.get('/api/statics/code/list', { params: { codeGrp } }); +}; + +const selectMsgbaseIdList = searchProdCd => { + //console.log("api selectMsgbaseIdList productcode : " + searchProdCd); + return httpClient.get('/api/statics/msgbaseid/list', { params: { searchProdCd } }); +}; + +const selectDeptNmList = () => { + return httpClient.get('/api/statics/deptNm/list'); +}; + +const selectUserRoleInfo = () => { + return httpClient.get('/api/statics/userId/roleId'); +}; + +const selectUserIdList = searchDeptNm => { + //console.log("api selectUserIdList searchDeptNm : " + searchDeptNm); + return httpClient.get('/api/statics/userId/list', { params: { searchDeptNm } }); +}; + +const getExcelHeader = category => { + // 엑셀에 출력할 Header 정보를 Mockup 데이터로 관리한다. + return new Promise(function(resolve, reject) { + let header = []; + switch (category) { + case 'TMPL': + header = tmplExcelHeader.header; + break; + case 'USER': + header = userExcelHeader.header; + break; + case 'CAMPAIGN': + header = campExcelHeader.header; + break; + default: + header = prodExcelHeader.header; + break; + } + resolve(header); + }); +}; + +export default { + selectStatics, + selectStaticsXls, + selectStaticsSummary, + + selectTmpltlist, + selectTmpltXlslist, + selectTmpltSummary, + + selectUserlist, + selectUserXlslist, + selectUserSummary, + + selectCampXlslist, + selectCampSummary, + + selectCodeProdList, + selectMsgbaseIdList, + selectDeptNmList, + selectUserIdList, + + selectUserRoleInfo, + getExcelHeader +}; diff --git a/frontend/src/modules/statics/service/mock/campExcelHeader.json b/frontend/src/modules/statics/service/mock/campExcelHeader.json index e471dc1..8b5bb3b 100644 --- a/frontend/src/modules/statics/service/mock/campExcelHeader.json +++ b/frontend/src/modules/statics/service/mock/campExcelHeader.json @@ -1,203 +1,203 @@ -{ - "header": [ - [ - { - "key": "seq", - "name": "NO", - "rowspan": "2" - }, - { - "key": "campaignId", - "name": "캠페인ID", - "rowspan": "2" - }, - { - "key": "msgbaseName", - "name": "템플릿명", - "rowspan": "2" - }, - { - "key": "msgbaseId", - "name": "템플릿아이디", - "rowspan": "2" - }, - { - "key": "ymd", - "name": "날짜", - "rowspan": "2" - }, - { - "key": "", - "name": "스타일 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "서술 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "기본 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "템플릿 소계", - "colspan": "3" - }, - { - "key": "", - "name": "RCS SMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS LMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS MMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS 소계", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback SMS", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback LMS", - "colspan": "3" - } - ], - [ - { - "key": "cellTmpltTot", - "name": "발송" - }, - { - "key": "cellTmpltSucc", - "name": "성공" - }, - { - "key": "cellTmpltRate", - "name": "성공률(%)" - }, - { - "key": "descTmpltTot", - "name": "발송" - }, - { - "key": "descTmpltSucc", - "name": "성공" - }, - { - "key": "descTmpltRate", - "name": "성공률(%)" - }, - { - "key": "freeTmpltTot", - "name": "발송" - }, - { - "key": "freeTmpltSucc", - "name": "성공" - }, - { - "key": "freeTmpltRate", - "name": "성공률(%)" - }, - { - "key": "subSumTmpltTot", - "name": "발송" - }, - { - "key": "subSumTmpltSucc", - "name": "성공" - }, - { - "key": "subSumTmpltRate", - "name": "성공률(%)" - }, - { - "key": "smsTot", - "name": "발송" - }, - { - "key": "smsSucc", - "name": "성공" - }, - { - "key": "smsRate", - "name": "성공률(%)" - }, - { - "key": "lmsTot", - "name": "발송" - }, - { - "key": "lmsSucc", - "name": "성공" - }, - { - "key": "lmsRate", - "name": "성공률(%)" - }, - { - "key": "mmsTot", - "name": "발송" - }, - { - "key": "mmsSucc", - "name": "성공" - }, - { - "key": "mmsRate", - "name": "성공률(%)" - }, - { - "key": "formatTot", - "name": "발송" - }, - { - "key": "formatSucc", - "name": "성공" - }, - { - "key": "formatRate", - "name": "성공률(%)" - }, - { - "key": "fbSmsTot", - "name": "발송" - }, - { - "key": "fbSmsSucc", - "name": "성공" - }, - { - "key": "fbSmsRate", - "name": "성공률(%)" - }, - { - "key": "fbLmsTot", - "name": "발송" - }, - { - "key": "fbLmsSucc", - "name": "성공" - }, - { - "key": "fbLmsRate", - "name": "성공률(%)" - } - ] - ] -} +{ + "header": [ + [ + { + "key": "seq", + "name": "NO", + "rowspan": "2" + }, + { + "key": "campaignId", + "name": "캠페인ID", + "rowspan": "2" + }, + { + "key": "msgbaseName", + "name": "템플릿명", + "rowspan": "2" + }, + { + "key": "msgbaseId", + "name": "템플릿아이디", + "rowspan": "2" + }, + { + "key": "ymd", + "name": "날짜", + "rowspan": "2" + }, + { + "key": "", + "name": "스타일 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "서술 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "기본 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "템플릿 소계", + "colspan": "3" + }, + { + "key": "", + "name": "RCS SMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS LMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS MMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS 소계", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback SMS", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback LMS", + "colspan": "3" + } + ], + [ + { + "key": "cellTmpltTot", + "name": "발송" + }, + { + "key": "cellTmpltSucc", + "name": "성공" + }, + { + "key": "cellTmpltRate", + "name": "성공률(%)" + }, + { + "key": "descTmpltTot", + "name": "발송" + }, + { + "key": "descTmpltSucc", + "name": "성공" + }, + { + "key": "descTmpltRate", + "name": "성공률(%)" + }, + { + "key": "freeTmpltTot", + "name": "발송" + }, + { + "key": "freeTmpltSucc", + "name": "성공" + }, + { + "key": "freeTmpltRate", + "name": "성공률(%)" + }, + { + "key": "subSumTmpltTot", + "name": "발송" + }, + { + "key": "subSumTmpltSucc", + "name": "성공" + }, + { + "key": "subSumTmpltRate", + "name": "성공률(%)" + }, + { + "key": "smsTot", + "name": "발송" + }, + { + "key": "smsSucc", + "name": "성공" + }, + { + "key": "smsRate", + "name": "성공률(%)" + }, + { + "key": "lmsTot", + "name": "발송" + }, + { + "key": "lmsSucc", + "name": "성공" + }, + { + "key": "lmsRate", + "name": "성공률(%)" + }, + { + "key": "mmsTot", + "name": "발송" + }, + { + "key": "mmsSucc", + "name": "성공" + }, + { + "key": "mmsRate", + "name": "성공률(%)" + }, + { + "key": "formatTot", + "name": "발송" + }, + { + "key": "formatSucc", + "name": "성공" + }, + { + "key": "formatRate", + "name": "성공률(%)" + }, + { + "key": "fbSmsTot", + "name": "발송" + }, + { + "key": "fbSmsSucc", + "name": "성공" + }, + { + "key": "fbSmsRate", + "name": "성공률(%)" + }, + { + "key": "fbLmsTot", + "name": "발송" + }, + { + "key": "fbLmsSucc", + "name": "성공" + }, + { + "key": "fbLmsRate", + "name": "성공률(%)" + } + ] + ] +} diff --git a/frontend/src/modules/statics/service/mock/prodExcelHeader.json b/frontend/src/modules/statics/service/mock/prodExcelHeader.json index bf26291..62f412a 100644 --- a/frontend/src/modules/statics/service/mock/prodExcelHeader.json +++ b/frontend/src/modules/statics/service/mock/prodExcelHeader.json @@ -1,188 +1,188 @@ -{ - "header": [ - [ - { - "key": "seq", - "name": "NO", - "rowspan": "2" - }, - { - "key": "ymd", - "name": "날짜", - "rowspan": "2" - }, - { - "key": "", - "name": "스타일 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "서술 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "기본 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "템플릿 소계", - "colspan": "3" - }, - { - "key": "", - "name": "RCS SMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS LMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS MMS", - "colspan": "3" - }, - { - "key": "", - "name": "포맷 소계", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback SMS", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback LMS", - "colspan": "3" - } - ], - [ - { - "key": "cellTmpltTot", - "name": "발송" - }, - { - "key": "cellTmpltSucc", - "name": "성공" - }, - { - "key": "cellTmpltRate", - "name": "성공률(%)" - }, - { - "key": "descTmpltTot", - "name": "발송" - }, - { - "key": "descTmpltSucc", - "name": "성공" - }, - { - "key": "descTmpltRate", - "name": "성공률(%)" - }, - { - "key": "freeTmpltTot", - "name": "발송" - }, - { - "key": "freeTmpltSucc", - "name": "성공" - }, - { - "key": "freeTmpltRate", - "name": "성공률(%)" - }, - { - "key": "subSumTmpltTot", - "name": "발송" - }, - { - "key": "subSumTmpltSucc", - "name": "성공" - }, - { - "key": "subSumTmpltRate", - "name": "성공률(%)" - }, - { - "key": "smsTot", - "name": "발송" - }, - { - "key": "smsSucc", - "name": "성공" - }, - { - "key": "smsRate", - "name": "성공률(%)" - }, - { - "key": "lmsTot", - "name": "발송" - }, - { - "key": "lmsSucc", - "name": "성공" - }, - { - "key": "lmsRate", - "name": "성공률(%)" - }, - { - "key": "mmsTot", - "name": "발송" - }, - { - "key": "mmsSucc", - "name": "성공" - }, - { - "key": "mmsRate", - "name": "성공률(%)" - }, - { - "key": "formatTot", - "name": "발송" - }, - { - "key": "formatSucc", - "name": "성공" - }, - { - "key": "formatRate", - "name": "성공률(%)" - }, - { - "key": "fbSmsTot", - "name": "발송" - }, - { - "key": "fbSmsSucc", - "name": "성공" - }, - { - "key": "fbSmsRate", - "name": "성공률(%)" - }, - { - "key": "fbLmsTot", - "name": "발송" - }, - { - "key": "fbLmsSucc", - "name": "성공" - }, - { - "key": "fbLmsRate", - "name": "성공률(%)" - } - ] - ] -} +{ + "header": [ + [ + { + "key": "seq", + "name": "NO", + "rowspan": "2" + }, + { + "key": "ymd", + "name": "날짜", + "rowspan": "2" + }, + { + "key": "", + "name": "스타일 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "서술 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "기본 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "템플릿 소계", + "colspan": "3" + }, + { + "key": "", + "name": "RCS SMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS LMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS MMS", + "colspan": "3" + }, + { + "key": "", + "name": "포맷 소계", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback SMS", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback LMS", + "colspan": "3" + } + ], + [ + { + "key": "cellTmpltTot", + "name": "발송" + }, + { + "key": "cellTmpltSucc", + "name": "성공" + }, + { + "key": "cellTmpltRate", + "name": "성공률(%)" + }, + { + "key": "descTmpltTot", + "name": "발송" + }, + { + "key": "descTmpltSucc", + "name": "성공" + }, + { + "key": "descTmpltRate", + "name": "성공률(%)" + }, + { + "key": "freeTmpltTot", + "name": "발송" + }, + { + "key": "freeTmpltSucc", + "name": "성공" + }, + { + "key": "freeTmpltRate", + "name": "성공률(%)" + }, + { + "key": "subSumTmpltTot", + "name": "발송" + }, + { + "key": "subSumTmpltSucc", + "name": "성공" + }, + { + "key": "subSumTmpltRate", + "name": "성공률(%)" + }, + { + "key": "smsTot", + "name": "발송" + }, + { + "key": "smsSucc", + "name": "성공" + }, + { + "key": "smsRate", + "name": "성공률(%)" + }, + { + "key": "lmsTot", + "name": "발송" + }, + { + "key": "lmsSucc", + "name": "성공" + }, + { + "key": "lmsRate", + "name": "성공률(%)" + }, + { + "key": "mmsTot", + "name": "발송" + }, + { + "key": "mmsSucc", + "name": "성공" + }, + { + "key": "mmsRate", + "name": "성공률(%)" + }, + { + "key": "formatTot", + "name": "발송" + }, + { + "key": "formatSucc", + "name": "성공" + }, + { + "key": "formatRate", + "name": "성공률(%)" + }, + { + "key": "fbSmsTot", + "name": "발송" + }, + { + "key": "fbSmsSucc", + "name": "성공" + }, + { + "key": "fbSmsRate", + "name": "성공률(%)" + }, + { + "key": "fbLmsTot", + "name": "발송" + }, + { + "key": "fbLmsSucc", + "name": "성공" + }, + { + "key": "fbLmsRate", + "name": "성공률(%)" + } + ] + ] +} diff --git a/frontend/src/modules/statics/service/mock/tmplExcelHeader.json b/frontend/src/modules/statics/service/mock/tmplExcelHeader.json index b956b35..95014e7 100644 --- a/frontend/src/modules/statics/service/mock/tmplExcelHeader.json +++ b/frontend/src/modules/statics/service/mock/tmplExcelHeader.json @@ -1,84 +1,84 @@ -{ - "header": [ - [ - { - "key": "seq", - "name": "NO", - "rowspan": "2" - }, - { - "key": "msgbaseName", - "name": "템플릿명", - "rowspan": "2" - }, - { - "key": "msgbaseId", - "name": "포맷ID", - "rowspan": "2" - }, - { - "key": "ymd", - "name": "날짜", - "rowspan": "2" - }, - { - "key": "productName", - "name": "상품명", - "rowspan": "2" - }, - { - "key": "", - "name": "RCS", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback SMS", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback LMS", - "colspan": "3" - } - ], - [ - { - "key": "rcsCnt", - "name": "발송" - }, - { - "key": "rcsSucc", - "name": "성공" - }, - { - "key": "rcsRate", - "name": "성공률(%)" - }, - { - "key": "fbSmsTot", - "name": "발송" - }, - { - "key": "fbSmsSucc", - "name": "성공" - }, - { - "key": "fbSmsRate", - "name": "성공률(%)" - }, - { - "key": "fbLmsTot", - "name": "발송" - }, - { - "key": "fbLmsSucc", - "name": "성공" - }, - { - "key": "fbLmsRate", - "name": "성공률(%)" - } - ] - ] -} +{ + "header": [ + [ + { + "key": "seq", + "name": "NO", + "rowspan": "2" + }, + { + "key": "msgbaseName", + "name": "템플릿명", + "rowspan": "2" + }, + { + "key": "msgbaseId", + "name": "포맷ID", + "rowspan": "2" + }, + { + "key": "ymd", + "name": "날짜", + "rowspan": "2" + }, + { + "key": "productName", + "name": "상품명", + "rowspan": "2" + }, + { + "key": "", + "name": "RCS", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback SMS", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback LMS", + "colspan": "3" + } + ], + [ + { + "key": "rcsCnt", + "name": "발송" + }, + { + "key": "rcsSucc", + "name": "성공" + }, + { + "key": "rcsRate", + "name": "성공률(%)" + }, + { + "key": "fbSmsTot", + "name": "발송" + }, + { + "key": "fbSmsSucc", + "name": "성공" + }, + { + "key": "fbSmsRate", + "name": "성공률(%)" + }, + { + "key": "fbLmsTot", + "name": "발송" + }, + { + "key": "fbLmsSucc", + "name": "성공" + }, + { + "key": "fbLmsRate", + "name": "성공률(%)" + } + ] + ] +} diff --git a/frontend/src/modules/statics/service/mock/userExcelHeader.json b/frontend/src/modules/statics/service/mock/userExcelHeader.json index f32489f..b0cb993 100644 --- a/frontend/src/modules/statics/service/mock/userExcelHeader.json +++ b/frontend/src/modules/statics/service/mock/userExcelHeader.json @@ -1,198 +1,198 @@ -{ - "header": [ - [ - { - "key": "seq", - "name": "NO", - "rowspan": "2" - }, - { - "key": "userId", - "name": "아이디", - "rowspan": "2" - }, - { - "key": "deptNm", - "name": "부서명", - "rowspan": "2" - }, - { - "key": "ymd", - "name": "날짜", - "rowspan": "2" - }, - { - "key": "", - "name": "스타일 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "서술 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "기본 템플릿", - "colspan": "3" - }, - { - "key": "", - "name": "템플릿 소계", - "colspan": "3" - }, - { - "key": "", - "name": "RCS SMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS LMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS MMS", - "colspan": "3" - }, - { - "key": "", - "name": "RCS 소계", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback SMS", - "colspan": "3" - }, - { - "key": "", - "name": "Fallback LMS", - "colspan": "3" - } - ], - [ - { - "key": "cellTmpltTot", - "name": "발송" - }, - { - "key": "cellTmpltSucc", - "name": "성공" - }, - { - "key": "cellTmpltRate", - "name": "성공률(%)" - }, - { - "key": "descTmpltTot", - "name": "발송" - }, - { - "key": "descTmpltSucc", - "name": "성공" - }, - { - "key": "descTmpltRate", - "name": "성공률(%)" - }, - { - "key": "freeTmpltTot", - "name": "발송" - }, - { - "key": "freeTmpltSucc", - "name": "성공" - }, - { - "key": "freeTmpltRate", - "name": "성공률(%)" - }, - { - "key": "subSumTmpltTot", - "name": "발송" - }, - { - "key": "subSumTmpltSucc", - "name": "성공" - }, - { - "key": "subSumTmpltRate", - "name": "성공률(%)" - }, - { - "key": "smsTot", - "name": "발송" - }, - { - "key": "smsSucc", - "name": "성공" - }, - { - "key": "smsRate", - "name": "성공률(%)" - }, - { - "key": "lmsTot", - "name": "발송" - }, - { - "key": "lmsSucc", - "name": "성공" - }, - { - "key": "lmsRate", - "name": "성공률(%)" - }, - { - "key": "mmsTot", - "name": "발송" - }, - { - "key": "mmsSucc", - "name": "성공" - }, - { - "key": "mmsRate", - "name": "성공률(%)" - }, - { - "key": "formatTot", - "name": "발송" - }, - { - "key": "formatSucc", - "name": "성공" - }, - { - "key": "formatRate", - "name": "성공률(%)" - }, - { - "key": "fbSmsTot", - "name": "발송" - }, - { - "key": "fbSmsSucc", - "name": "성공" - }, - { - "key": "fbSmsRate", - "name": "성공률(%)" - }, - { - "key": "fbLmsTot", - "name": "발송" - }, - { - "key": "fbLmsSucc", - "name": "성공" - }, - { - "key": "fbLmsRate", - "name": "성공률(%)" - } - ] - ] -} +{ + "header": [ + [ + { + "key": "seq", + "name": "NO", + "rowspan": "2" + }, + { + "key": "userId", + "name": "아이디", + "rowspan": "2" + }, + { + "key": "deptNm", + "name": "부서명", + "rowspan": "2" + }, + { + "key": "ymd", + "name": "날짜", + "rowspan": "2" + }, + { + "key": "", + "name": "스타일 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "서술 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "기본 템플릿", + "colspan": "3" + }, + { + "key": "", + "name": "템플릿 소계", + "colspan": "3" + }, + { + "key": "", + "name": "RCS SMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS LMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS MMS", + "colspan": "3" + }, + { + "key": "", + "name": "RCS 소계", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback SMS", + "colspan": "3" + }, + { + "key": "", + "name": "Fallback LMS", + "colspan": "3" + } + ], + [ + { + "key": "cellTmpltTot", + "name": "발송" + }, + { + "key": "cellTmpltSucc", + "name": "성공" + }, + { + "key": "cellTmpltRate", + "name": "성공률(%)" + }, + { + "key": "descTmpltTot", + "name": "발송" + }, + { + "key": "descTmpltSucc", + "name": "성공" + }, + { + "key": "descTmpltRate", + "name": "성공률(%)" + }, + { + "key": "freeTmpltTot", + "name": "발송" + }, + { + "key": "freeTmpltSucc", + "name": "성공" + }, + { + "key": "freeTmpltRate", + "name": "성공률(%)" + }, + { + "key": "subSumTmpltTot", + "name": "발송" + }, + { + "key": "subSumTmpltSucc", + "name": "성공" + }, + { + "key": "subSumTmpltRate", + "name": "성공률(%)" + }, + { + "key": "smsTot", + "name": "발송" + }, + { + "key": "smsSucc", + "name": "성공" + }, + { + "key": "smsRate", + "name": "성공률(%)" + }, + { + "key": "lmsTot", + "name": "발송" + }, + { + "key": "lmsSucc", + "name": "성공" + }, + { + "key": "lmsRate", + "name": "성공률(%)" + }, + { + "key": "mmsTot", + "name": "발송" + }, + { + "key": "mmsSucc", + "name": "성공" + }, + { + "key": "mmsRate", + "name": "성공률(%)" + }, + { + "key": "formatTot", + "name": "발송" + }, + { + "key": "formatSucc", + "name": "성공" + }, + { + "key": "formatRate", + "name": "성공률(%)" + }, + { + "key": "fbSmsTot", + "name": "발송" + }, + { + "key": "fbSmsSucc", + "name": "성공" + }, + { + "key": "fbSmsRate", + "name": "성공률(%)" + }, + { + "key": "fbLmsTot", + "name": "발송" + }, + { + "key": "fbLmsSucc", + "name": "성공" + }, + { + "key": "fbLmsRate", + "name": "성공률(%)" + } + ] + ] +} diff --git a/frontend/src/modules/stats/router/index.js b/frontend/src/modules/stats/router/index.js index 4de9f2a..8242544 100644 --- a/frontend/src/modules/stats/router/index.js +++ b/frontend/src/modules/stats/router/index.js @@ -1,19 +1,19 @@ -import MonthList from '../views/MonthList' -import BsnmMonthList from '../views/BsnmMonthList' - -export default [ - { - path: '/stats/monthList', - component: MonthList, - name: 'monthList', - meta: { public: true } - }, - { - path: '/stats/bsnmMonthList', - component: BsnmMonthList, - name: 'bsnmMonthList', - meta: { public: true } - }, - -] - +import MonthList from '../views/MonthList' +import BsnmMonthList from '../views/BsnmMonthList' + +export default [ + { + path: '/stats/monthList', + component: MonthList, + name: 'monthList', + meta: { public: true } + }, + { + path: '/stats/bsnmMonthList', + component: BsnmMonthList, + name: 'bsnmMonthList', + meta: { public: true } + }, + +] + diff --git a/frontend/src/modules/stats/views/BsnmMonthList.vue b/frontend/src/modules/stats/views/BsnmMonthList.vue index 59eb706..9a18b1f 100644 --- a/frontend/src/modules/stats/views/BsnmMonthList.vue +++ b/frontend/src/modules/stats/views/BsnmMonthList.vue @@ -1,164 +1,164 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/stats/views/MonthList.vue b/frontend/src/modules/stats/views/MonthList.vue index 99efab2..e22d795 100644 --- a/frontend/src/modules/stats/views/MonthList.vue +++ b/frontend/src/modules/stats/views/MonthList.vue @@ -1,165 +1,165 @@ - - - \ No newline at end of file diff --git a/frontend/src/modules/sysMgt/views/AdminList.vue b/frontend/src/modules/sysMgt/views/AdminList.vue index 5342767..5c76eb8 100644 --- a/frontend/src/modules/sysMgt/views/AdminList.vue +++ b/frontend/src/modules/sysMgt/views/AdminList.vue @@ -212,6 +212,7 @@ export default { // alert(chkList[i].adminId); // } const param = chkList.map((row)=>({adminId:row.adminId})); + console.log(param) this.row.list = param; console.log(this.row); return true; diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtController.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtController.java index 1e3e5a5..ccbc935 100644 --- a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtController.java @@ -5,16 +5,23 @@ */ package kr.co.uplus.ez.api.attractMgt; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListExcelReqDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListExcelResDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListReqDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListResDto; +import kr.co.uplus.ez.common.components.ValidComponents; +import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.ApiResponseMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Map; @RestController @RequestMapping(value = "api/v1/bo/attractMgt") @@ -23,32 +30,45 @@ public class AttractMgtController { @Autowired AttractMgtService attractService; + @Autowired + ValidComponents validComponents; + /** * date : 2022. 4. 26. * auth : ckr * desc : 유치채널 목록조회 - * @param paramMap + * @param channelListReqDto * @return - * @throws Exception + * @ */ + @ApiOperation(value = "channelList", notes = "유치채널 목록조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/channelList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage channelList(@RequestBody Map paramMap) throws Exception{ - return attractService.channelList(paramMap); + public ChannelListResDto channelList(@RequestBody @Valid ChannelListReqDto channelListReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new ChannelListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return attractService.channelList(channelListReqDto); } /** * date : 2022. 4. 26. * auth : ckr * desc : 유치채널 목록 엑셀 다운로드 - * @param paramMap + * @param channelListExcelReqDto * @return - * @throws Exception + * @ */ + @ApiOperation(value = "channelListExcel", notes = "유치채널 목록 엑셀 다운로드") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/channelListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage channelListExcel(@RequestBody Map paramMap) throws Exception{ - return attractService.channelListExcel(paramMap); + public ChannelListExcelResDto channelListExcel(@RequestBody @Valid ChannelListExcelReqDto channelListExcelReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new ChannelListExcelResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return attractService.channelListExcel(channelListExcelReqDto); } /** @@ -57,11 +77,13 @@ public class AttractMgtController { * desc : 유치 채널 상세 조회 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "channelDetail", notes = "유치 채널 상세 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/channelDetail" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage channelDetail(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage channelDetail(@RequestBody Map paramMap) { return attractService.channelDetail(paramMap); } @@ -71,11 +93,11 @@ public class AttractMgtController { * desc : 발송건수 엑셀 다운로드 * @param paramMap * @return - * @throws Exception + * @ */ @RequestMapping(value = "/sendNumberListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumberListExcel(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage sendNumberListExcel(@RequestBody Map paramMap) { return attractService.sendNumberListExcel(paramMap); } } diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtMapper.java index 1e79500..04d9268 100644 --- a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtMapper.java +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtMapper.java @@ -1,8 +1,10 @@ package kr.co.uplus.ez.api.attractMgt; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListReqDto; import org.apache.ibatis.annotations.Mapper; @Mapper -public class AttractMgtMapper { +public interface AttractMgtMapper { + int selectAttractListTotalCnt(ChannelListReqDto channelListReqDto); } diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtService.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtService.java index e4ff42c..57a6d73 100644 --- a/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/AttractMgtService.java @@ -1,15 +1,18 @@ package kr.co.uplus.ez.api.attractMgt; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListExcelReqDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListExcelResDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListReqDto; +import kr.co.uplus.ez.api.attractMgt.dto.ChannelListResDto; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ApiResponseMessage; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -import kr.co.uplus.ez.common.data.ApiResponseCode; -import kr.co.uplus.ez.common.data.ApiResponseMessage; - @Service public class AttractMgtService { @@ -17,74 +20,24 @@ public class AttractMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 유치채널 목록조회 - * @param paramMap + * @param channelListReqDto * @return */ - public ApiResponseMessage channelList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - data.put("totalCnt", "999"); - data.put("currentPage", "1"); - dataObj.put("paging", data); - - for(int i=1; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+i); - data.put("regDt", "2022-03-10"); - data.put("channelNm", "업체명"); - data.put("adminId", "uplus01"); - data.put("custNm", "유플러스"); - data.put("bRegNo", "221-81-39938"); - data.put("userNm", "유플러스스"); - data.put("stat", "사용"); - data.put("custType", "법인사용자"); - data.put("totalSendingCnt", "1440000"); - data.put("serviceId", "serviceId"); - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - return result; + public ChannelListResDto channelList(ChannelListReqDto channelListReqDto) { + + return new ChannelListResDto(ApiResponseCode.SUCCESS); } /** * date : 2022. 4. 25. * auth : ckr * desc : 유치채널 목록 엑셀 다운로드 - * @param paramMap + * @param channelListExcelReqDto * @return */ - public ApiResponseMessage channelListExcel(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - data.put("totalCnt", "999"); - data.put("currentPage", "1"); - dataObj.put("paging", data); - - for(int i=1; i<50; i++) { - data = new HashMap<>(); - data.put("no", ""+i); - data.put("regDt", "2022-03-10"); - data.put("channelNm", "업체명"); - data.put("adminId", "uplus01"); - data.put("custNm", "유플러스"); - data.put("bRegNo", "221-81-39938"); - data.put("userNm", "유플러스스"); - data.put("stat", "사용"); - data.put("custType", "법인사용자"); - data.put("totalSendingCnt", "1440000"); - data.put("serviceId", "serviceId"); - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - return result; + public ChannelListExcelResDto channelListExcel(ChannelListExcelReqDto channelListExcelReqDto) { + + return new ChannelListExcelResDto(ApiResponseCode.SUCCESS); } /** diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelInfo.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelInfo.java new file mode 100644 index 0000000..7209c96 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelInfo.java @@ -0,0 +1,32 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ChannelInfo implements Serializable { + + @ApiModelProperty(example = "리스트번호", name = "리스트번호", dataType = "String") + private String no; + @ApiModelProperty(example = "고객사명(이름)", name = "고객사명(이름)", dataType = "String") + private String custNm; + @ApiModelProperty(example = "사업자번호(생년월일)", name = "사업자번호(생년월일)", dataType = "String") + private String bRegNo; + @ApiModelProperty(example = "템플릿 코드", name = "템플릿 코드", dataType = "String") + private String tmpltCd; + @ApiModelProperty(example = "템플릿명", name = "템플릿명", dataType = "String") + private String tmpltNm; + @ApiModelProperty(example = "템플릿 유형", name = "템플릿 유형", notes = "항목 : (01: 기본형(Default), 02:부가정보형, 03:광고추가형, 04:복합형)", dataType = "String") + private String tmpltType; + @ApiModelProperty(example = "상태", name = "상태" , notes = "항목 : (T:신청완료, R:검수요청완료, Q:카카오 검수중, A:템플릿승인, S:반려)" , dataType = "String") + private String stat; + @ApiModelProperty(example = "반려사유", name = "반려사유", dataType = "String") + private String returnReason; + @ApiModelProperty(example = "발신프로필", name = "발신프로필", dataType = "String") + private String sendProfile; + @ApiModelProperty(example = "최종수정일자", name = "최종수정일자", dataType = "String") + private String lastChgDt; +} diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelReqDto.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelReqDto.java new file mode 100644 index 0000000..9a8781c --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelReqDto.java @@ -0,0 +1,19 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ChannelListExcelReqDto implements Serializable { + + @ApiModelProperty(example = "사용상태", name = "사용상태", notes = "항목 : 전체(Default)/사용 : Y/중지 : N", dataType = "String") + private String searchType1; + @ApiModelProperty(example = "검색조건", name = "검색조건", notes = "항목 : 고객사명 : custNm / 사업자번호 : bizNo / 인증코드 : authCd", dataType = "String") + private String searchType2; + @ApiModelProperty(example = "검색어(입력)", name = "검색어(입력)", dataType = "String") + private String searchText1; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelResDto.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelResDto.java new file mode 100644 index 0000000..424d286 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListExcelResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ChannelListExcelResDto extends ResponseMessage implements Serializable { + + // 데이터. + private ChannelListRes data; + + public ChannelListExcelResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public ChannelListExcelResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public ChannelListExcelResDto(ApiResponseCode returnStr, ChannelListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListReqDto.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListReqDto.java new file mode 100644 index 0000000..9732633 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListReqDto.java @@ -0,0 +1,19 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ChannelListReqDto implements Serializable { + + @ApiModelProperty(example = "사용상태", name = "사용상태", notes = "항목 : 전체(Default)/사용 : Y/중지 : N", dataType = "String") + private String searchType1; + @ApiModelProperty(example = "검색조건", name = "검색조건", notes = "항목 : 고객사명 : custNm / 사업자번호 : bizNo / 인증코드 : authCd", dataType = "String") + private String searchType2; + @ApiModelProperty(example = "검색어(입력)", name = "검색어(입력)", dataType = "String") + private String searchText1; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListRes.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListRes.java new file mode 100644 index 0000000..ca10b1d --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class ChannelListRes implements Serializable { + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListResDto.java b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListResDto.java new file mode 100644 index 0000000..08ecfc3 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/attractMgt/dto/ChannelListResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.attractMgt.dto; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ChannelListResDto extends ResponseMessage implements Serializable { + + // 데이터. + private ChannelListRes data; + + public ChannelListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public ChannelListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public ChannelListResDto(ApiResponseCode returnStr, ChannelListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtController.java b/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtController.java index 147cb61..af9428b 100644 --- a/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtController.java @@ -5,17 +5,6 @@ */ package kr.co.uplus.ez.api.channelMgt; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; @@ -25,6 +14,12 @@ import kr.co.uplus.ez.api.channelMgt.dto.TmpltListReqDto; import kr.co.uplus.ez.api.channelMgt.dto.TmpltListResDto; import kr.co.uplus.ez.common.components.ValidComponents; import kr.co.uplus.ez.common.data.ApiResponseCode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; @RestController @RequestMapping(value = "api/v1/bo/channelMgt") @@ -40,15 +35,15 @@ public class ChannelMgtController { * date : 2022. 4. 25. * auth : ckr * desc : 알림톡 템플릿 목록 조회 - * @param paramMap + * @param tmpltListReqDto * @return - * @throws Exception + * @ */ @ApiOperation(value = "tmpltList", notes = "알림톡 템플릿 목록 조회") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "tmpltList", method = { RequestMethod.POST }) @ResponseBody - public TmpltListResDto tmpltList(@RequestBody @Valid TmpltListReqDto tmpltListReqDto, BindingResult bindingResult) throws Exception{ + public TmpltListResDto tmpltList(@RequestBody @Valid TmpltListReqDto tmpltListReqDto, BindingResult bindingResult) { if (validComponents.validParameter(bindingResult)) { return new TmpltListResDto(ApiResponseCode.CM_PARAMETER_ERROR); @@ -61,15 +56,15 @@ public class ChannelMgtController { * date : 2022. 4. 25. * auth : ckr * desc : 알림톡 템플릿 엑셀 다운로드 목록 조회 - * @param paramMap + * @param tmpltListExcelReqDto * @return - * @throws Exception + * @ */ @ApiOperation(value = "tmpltListExcel", notes = "알림톡 템플릿 엑셀 다운로드 목록 조회") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "tmpltListExcel", method = { RequestMethod.POST }) @ResponseBody - public TmpltListExcelResDto tmpltListExcel(@RequestBody @Valid TmpltListExcelReqDto tmpltListExcelReqDto, BindingResult bindingResult) throws Exception{ + public TmpltListExcelResDto tmpltListExcel(@RequestBody @Valid TmpltListExcelReqDto tmpltListExcelReqDto, BindingResult bindingResult) { if (validComponents.validParameter(bindingResult)) { return new TmpltListExcelResDto(ApiResponseCode.CM_PARAMETER_ERROR); diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java index b570891..5bf6935 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java @@ -1,13 +1,8 @@ package kr.co.uplus.ez.api.custMgt; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.validation.Valid; - +import kr.co.uplus.ez.api.custMgt.dto.*; +import kr.co.uplus.ez.common.data.*; +import kr.co.uplus.ez.common.utils.EncryptionUtil; import org.apache.commons.lang3.RandomStringUtils; import org.mybatis.spring.SqlSessionTemplate; import org.slf4j.Logger; @@ -17,64 +12,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import kr.co.uplus.ez.api.custMgt.dto.AdminInfo; -import kr.co.uplus.ez.api.custMgt.dto.AdminInfoReqDto; -import kr.co.uplus.ez.api.custMgt.dto.AdminInfoResDto; -import kr.co.uplus.ez.api.custMgt.dto.AllMemoList; -import kr.co.uplus.ez.api.custMgt.dto.AllMemoListReqDto; -import kr.co.uplus.ez.api.custMgt.dto.AllMemoListRes; -import kr.co.uplus.ez.api.custMgt.dto.AllMemoListResDto; -import kr.co.uplus.ez.api.custMgt.dto.CarryOver; -import kr.co.uplus.ez.api.custMgt.dto.CarryOverListReqDto; -import kr.co.uplus.ez.api.custMgt.dto.CarryOverListRes; -import kr.co.uplus.ez.api.custMgt.dto.CarryOverListResDto; -import kr.co.uplus.ez.api.custMgt.dto.CustInfo; -import kr.co.uplus.ez.api.custMgt.dto.DeleteMemoReqDto; -import kr.co.uplus.ez.api.custMgt.dto.DeleteMemoResDto; -import kr.co.uplus.ez.api.custMgt.dto.DeleteUserReqDto; -import kr.co.uplus.ez.api.custMgt.dto.DeleteUserResDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertMassUser; -import kr.co.uplus.ez.api.custMgt.dto.InsertMassUserReqDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertMassUserRes; -import kr.co.uplus.ez.api.custMgt.dto.InsertMassUserResDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertTestIdReqDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertTestIdResDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertUserReqDto; -import kr.co.uplus.ez.api.custMgt.dto.InsertUserResDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberAdminDetailReqDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberAdminDetailRes; -import kr.co.uplus.ez.api.custMgt.dto.MemberAdminDetailResDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberDetail; -import kr.co.uplus.ez.api.custMgt.dto.MemberDetailReqDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberDetailRes; -import kr.co.uplus.ez.api.custMgt.dto.MemberDetailResDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberList; -import kr.co.uplus.ez.api.custMgt.dto.MemberListReqDto; -import kr.co.uplus.ez.api.custMgt.dto.MemberListRes; -import kr.co.uplus.ez.api.custMgt.dto.MemberListResDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsDetail; -import kr.co.uplus.ez.api.custMgt.dto.SubsDetailReqDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsDetailResDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsInfo; -import kr.co.uplus.ez.api.custMgt.dto.SubsList; -import kr.co.uplus.ez.api.custMgt.dto.SubsListExcelReqDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsListExcelResDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsListReqDto; -import kr.co.uplus.ez.api.custMgt.dto.SubsListRes; -import kr.co.uplus.ez.api.custMgt.dto.SubsListResDto; -import kr.co.uplus.ez.api.custMgt.dto.SvcUserInfo; -import kr.co.uplus.ez.api.custMgt.dto.UpdateAdminInfoReqDto; -import kr.co.uplus.ez.api.custMgt.dto.UpdateAdminInfoResDto; -import kr.co.uplus.ez.api.custMgt.dto.UpdateAdminInfoTotalReqDto; -import kr.co.uplus.ez.api.custMgt.dto.UpdateAdminInfoTotalResDto; -import kr.co.uplus.ez.api.custMgt.dto.UpdateUserReqDto; -import kr.co.uplus.ez.api.custMgt.dto.UpdateUserResDto; -import kr.co.uplus.ez.common.data.ApiResponseCode; -import kr.co.uplus.ez.common.data.ApiResponseMessage; -import kr.co.uplus.ez.common.data.Const; -import kr.co.uplus.ez.common.data.ImUser; -import kr.co.uplus.ez.common.data.Paging; -import kr.co.uplus.ez.common.utils.EncryptionUtil; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class CustMgtService { @@ -244,7 +186,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 관리자ID,관리자명 수정 * - * @param updateAdminInfoReqDto + * @param adminInfoReqDto * @return updateAdminInfoResDto */ public UpdateAdminInfoResDto updateAdminInfo(UpdateAdminInfoReqDto adminInfoReqDto) { @@ -357,7 +299,7 @@ public class CustMgtService { /** * 사용자 상세 리스트 조회. * - * @param memberDetailListReqDto + * @param memberAdminDetailReqDto * @return MemberDetailListResDto */ public MemberAdminDetailResDto memberAdminDetail(MemberAdminDetailReqDto memberAdminDetailReqDto) { @@ -404,7 +346,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 테스트ID 등록 * - * @param paramMap + * @param insertTestIdReqDto * @return */ public InsertTestIdResDto insertTestId(InsertTestIdReqDto insertTestIdReqDto) { @@ -507,7 +449,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 메모 삭제 * - * @param paramMap + * @param deleteMemoReqDto * @return */ public DeleteMemoResDto deleteMemo(DeleteMemoReqDto deleteMemoReqDto) { @@ -546,7 +488,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 사용자 정보 등록 * - * @param paramMap + * @param insertUserReqDto * @return */ public InsertUserResDto insertUser(InsertUserReqDto insertUserReqDto) { @@ -585,7 +527,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 사용자 정보 수정 * - * @param paramMap + * @param updateUserReqDto * @return */ public UpdateUserResDto updateUser(UpdateUserReqDto updateUserReqDto) { @@ -616,8 +558,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 사용자ID 대량등록 * - * @param paramMap - * @return + * @param insertMassUserReqDto */ public InsertMassUserResDto insertMassUser(InsertMassUserReqDto insertMassUserReqDto) { @@ -700,7 +641,7 @@ public class CustMgtService { /** * date : 2022. 4. 25. auth : ckr desc : 사용자 정보 삭제 * - * @param paramMap + * @param deleteUserReqDto * @return */ public DeleteUserResDto deleteUser(DeleteUserReqDto deleteUserReqDto) { @@ -746,7 +687,7 @@ public class CustMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 관리자 정보(종합) 수정 - * @param UpdateAdminInfoTotalReqDto + * @param updateAdminInfoTotalReqDto * @return UpdateAdminInfoTotalResDto * @ */ diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtMapper.java index d8a97f4..9b3946a 100644 --- a/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtMapper.java +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtMapper.java @@ -1,8 +1,49 @@ package kr.co.uplus.ez.api.riskMgt; +import kr.co.uplus.ez.api.riskMgt.dto.*; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper -public class RiskMgtMapper { +public interface RiskMgtMapper { + + int selectSndrnoBlckTotalCnt(SendNumIntrcpListReqDto sendNumIntrcpListReqDto); + + List selectSndrnoBlckList(SendNumIntrcpListReqDto sendNumIntrcpListReqDto); + + SendNumIntrcpDetail selectSndrnoBlckDetail(String blckSndrno); + + void insertSndrnoBlck(SendNumInsertIntrcpReqDto sendNumInsertIntrcpReqDto); + + int updateSndrnoBlck(SendNumUpdateIntrcplReqDto sendNumUpdateIntrcplReqDto); + + int deleteSndrnoBlck(SendNumDeleteIntrcpReqDto sendNumDeleteIntrcpReqDto); + + int selectRcvblck080ListTotalCnt(ZezNumIntrcpListReqDto zezNumIntrcpListReqDto); + + List selectRcvblck080List(ZezNumIntrcpListReqDto zezNumIntrcpListReqDto); + + int selectMsgBlckwordListTotalCnt(MsgIntrcpListReqDto msgIntrcpListReqDto); + + List selectMsgBlckwordList(MsgIntrcpListReqDto msgIntrcpListReqDto); + + MsgIntrcpDetail selectMsgBlckwordDetail(MsgIntrcpDetailReqDto msgIntrcpDetailReqDto); + + List selectBlckwordDtlList(MsgIntrcpDetailReqDto msgIntrcpDetailReqDto); + + void insertMsgBlckword(MsgInsertIntrcpReqDto msgInsertIntrcpReqDto); + + void insertBlckwordDtl(List msgBlckwordLists); + + int updateMsgBlckword(MsgUpdateIntrcplReqDto msgUpdateIntrcplReqDto); + + int deleteMsgBlckword(MsgDeleteIntrcpReqDto msgDeleteIntrcpReqDto); + + int deleteBlckwordDtl(String seqNo); + + int selectWebsndBlckListTotalCnt(WebInsertIntrcpReqDto webInsertIntrcpReqDto); + + List selectWebsndBlckList(WebInsertIntrcpReqDto webInsertIntrcpReqDto); } diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java index 8cd5b57..8b67fdf 100644 --- a/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java @@ -1,205 +1,283 @@ package kr.co.uplus.ez.api.riskMgt; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import kr.co.uplus.ez.api.riskMgt.dto.*; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.Const; +import kr.co.uplus.ez.common.data.Paging; +import org.mybatis.spring.SqlSessionTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; -import kr.co.uplus.ez.common.data.ApiResponseCode; -import kr.co.uplus.ez.common.data.ApiResponseMessage; +import java.util.ArrayList; +import java.util.List; @Service public class RiskMgtService { + private static final Logger logger = LoggerFactory.getLogger(RiskMgtService.class); + + @Autowired + @Qualifier("sqlSessionTemplateDb1") + private SqlSessionTemplate sqlSessionMaster; + + @Autowired + @Qualifier("sqlSessionTemplateDb2") + private SqlSessionTemplate sqlSessionSlave; /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 목록 조회 - * @param paramMap - * @return + * @param sendNumIntrcpListReqDto + * @return SendNumIntrcpListResDto */ - public ApiResponseMessage sendNumIntrcpList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("sendNum", "0212345678"); - data.put("intrcpYn", "미차단"); - data.put("sendType", "문자"); - data.put("lastUpdateDt", "2022-03-10"); - data.put("intrcpReason", "도박"); - data.put("register", "kkkkkkf"); - - dataList.add(data); + public SendNumIntrcpListResDto sendNumIntrcpList(SendNumIntrcpListReqDto sendNumIntrcpListReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + // 현재 페이지. + String nowPage = String.valueOf(sendNumIntrcpListReqDto.getPage()); + int totalCnt = riskMgtMapper.selectSndrnoBlckTotalCnt(sendNumIntrcpListReqDto); + + if (totalCnt == 0) { + + SendNumIntrcpListRes sendNumIntrcpListRes = new SendNumIntrcpListRes(); + sendNumIntrcpListRes.setList(new ArrayList<>()); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + paging.setTotalCnt(String.valueOf(totalCnt)); + sendNumIntrcpListRes.setPaging(paging); + + return new SendNumIntrcpListResDto(ApiResponseCode.CM_NOT_FOUND, sendNumIntrcpListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = sendNumIntrcpListReqDto.getPage(); + int pagePerRows = sendNumIntrcpListReqDto.getPagePerRows(); + page = (page - 1) * pagePerRows; + sendNumIntrcpListReqDto.setPage(page); + + List sendNumIntrcpListList = riskMgtMapper.selectSndrnoBlckList(sendNumIntrcpListReqDto); + + SendNumIntrcpListRes sendNumIntrcpListRes = new SendNumIntrcpListRes(); + sendNumIntrcpListRes.setList(sendNumIntrcpListList); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + sendNumIntrcpListRes.setPaging(paging); + + return new SendNumIntrcpListResDto(ApiResponseCode.SUCCESS, sendNumIntrcpListRes); } /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 상세 정보 조회 - * @param paramMap + * @param sendNumIntrcpDetailReqDto * @return */ - public ApiResponseMessage sendNumIntrcpDetail(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - dataObj.put("sendNum", "0212345678"); - dataObj.put("sendType", "공용"); - dataObj.put("intrcpReason", "도박"); - dataObj.put("memo", "고객사 요청"); - dataObj.put("intrcpYn", "차단"); - - result.setData(dataObj); - - return result; + public SendNumIntrcpDetailResDto sendNumIntrcpDetail(SendNumIntrcpDetailReqDto sendNumIntrcpDetailReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + SendNumIntrcpDetail sendNumIntrcpDetail = riskMgtMapper.selectSndrnoBlckDetail(sendNumIntrcpDetailReqDto.getBlckSndrno()); + + if(sendNumIntrcpDetail == null){ + return new SendNumIntrcpDetailResDto(ApiResponseCode.CM_NOT_FOUND); + } + + return new SendNumIntrcpDetailResDto(ApiResponseCode.SUCCESS, sendNumIntrcpDetail); } /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 신규 등록 - * @param paramMap + * @param insertIntrcpReqDto * @return */ - public ApiResponseMessage sendNumInsertIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public SendNumInsertIntrcpResDto sendNumInsertIntrcp(SendNumInsertIntrcpReqDto insertIntrcpReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + + try{ + insertIntrcpReqDto.setBlckYn(Const.COMM_YES); + //regId 들고오기 + Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + UserDetails userDetails = (UserDetails) principal; + String regId = userDetails.getUsername(); + + insertIntrcpReqDto.setRegId(regId); + + riskMgtMapper.insertSndrnoBlck(insertIntrcpReqDto); + }catch (Exception e){ + return new SendNumInsertIntrcpResDto(ApiResponseCode.CM_DB_QUERY_ERR); + } + + return new SendNumInsertIntrcpResDto(ApiResponseCode.SUCCESS); } /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 수정 - * @param paramMap + * @param sendNumUpdateIntrcplReqDto * @return */ - public ApiResponseMessage sendNumUpdateIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public SendNumUpdateIntrcpResDto sendNumUpdateIntrcp(SendNumUpdateIntrcplReqDto sendNumUpdateIntrcplReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + sendNumUpdateIntrcplReqDto.setChgId("test");; + + int result = riskMgtMapper.updateSndrnoBlck(sendNumUpdateIntrcplReqDto); + + if(result > 0){ + return new SendNumUpdateIntrcpResDto(ApiResponseCode.SUCCESS); + }else{ + return new SendNumUpdateIntrcpResDto(ApiResponseCode.CM_NOT_FOUND); + } } /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 삭제 - * @param paramMap + * @param sendNumDeleteIntrcpReqDto * @return */ - public ApiResponseMessage sendNumDeleteIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public SendNumDeleteIntrcpResDto sendNumDeleteIntrcp(SendNumDeleteIntrcpReqDto sendNumDeleteIntrcpReqDto) { + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + + int result = riskMgtMapper.deleteSndrnoBlck(sendNumDeleteIntrcpReqDto); + + if(result > 0){ + return new SendNumDeleteIntrcpResDto(ApiResponseCode.SUCCESS); + }else{ + return new SendNumDeleteIntrcpResDto(ApiResponseCode.CM_NOT_FOUND); + } } /** * date : 2022. 4. 25. * auth : ckr * desc : 080수신번호 차단 목록 조회 - * @param paramMap + * @param zezNumIntrcpListReqDto * @return */ - public ApiResponseMessage zezNumIntrcpList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("custNm", "가나다"); - data.put("bRegNo", "123-11-12345"); - data.put("authCd", "12345"); - data.put("recvNum", "01012345678"); - data.put("regDt", "2022-03-10"); - data.put("regType", "자동등록"); - - dataList.add(data); + public ZezNumIntrcpListResDto zezNumIntrcpList(ZezNumIntrcpListReqDto zezNumIntrcpListReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + // 현재 페이지. + String nowPage = String.valueOf(zezNumIntrcpListReqDto.getPage()); + int totalCnt = riskMgtMapper.selectRcvblck080ListTotalCnt(zezNumIntrcpListReqDto); + + if (totalCnt == 0) { + + ZezNumIntrcpListRes zezNumIntrcpListRes = new ZezNumIntrcpListRes(); + zezNumIntrcpListRes.setList(new ArrayList<>()); + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + paging.setTotalCnt(String.valueOf(totalCnt)); + zezNumIntrcpListRes.setPaging(paging); + + return new ZezNumIntrcpListResDto(ApiResponseCode.CM_NOT_FOUND, zezNumIntrcpListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = zezNumIntrcpListReqDto.getPage(); + int pagePerRows = zezNumIntrcpListReqDto.getPagePerRows(); + page = (page - 1) * pagePerRows; + zezNumIntrcpListReqDto.setPage(page); + + List zezNumIntrcpLists = riskMgtMapper.selectRcvblck080List(zezNumIntrcpListReqDto); + + ZezNumIntrcpListRes zezNumIntrcpListRes = new ZezNumIntrcpListRes(); + zezNumIntrcpListRes.setList(zezNumIntrcpLists); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + zezNumIntrcpListRes.setPaging(paging); + + return new ZezNumIntrcpListResDto(ApiResponseCode.SUCCESS, zezNumIntrcpListRes); } /** * date : 2022. 4. 25. * auth : ckr * desc : 메시지 차단 목록 조회 - * @param paramMap + * @param msgNumIntrcpListReqDto * @return */ - public ApiResponseMessage msgIntrcpList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("intrcpMsg", "도박"); - data.put("intrcpYn", "차단"); - data.put("lastUpdateDt", "2022-03-10"); - data.put("intrcpReason", "도박"); - data.put("register", "Abcefu"); - dataList.add(data); + public MsgIntrcpListResDto msgIntrcpList(MsgIntrcpListReqDto msgNumIntrcpListReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + // 현재 페이지. + String nowPage = String.valueOf(msgNumIntrcpListReqDto.getPage()); + int totalCnt = riskMgtMapper.selectMsgBlckwordListTotalCnt(msgNumIntrcpListReqDto); + + if (totalCnt == 0) { + + MsgIntrcpListRes msgIntrcpListRes = new MsgIntrcpListRes(); + msgIntrcpListRes.setList(new ArrayList<>()); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + paging.setTotalCnt(String.valueOf(totalCnt)); + msgIntrcpListRes.setPaging(paging); + + return new MsgIntrcpListResDto(ApiResponseCode.CM_NOT_FOUND, msgIntrcpListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = msgNumIntrcpListReqDto.getPage(); + int pagePerRows = msgNumIntrcpListReqDto.getPagePerRows(); + page = (page - 1) * pagePerRows; + msgNumIntrcpListReqDto.setPage(page); + + List msgIntrcpLists = riskMgtMapper.selectMsgBlckwordList(msgNumIntrcpListReqDto); + + MsgIntrcpListRes msgIntrcpListRes = new MsgIntrcpListRes(); + msgIntrcpListRes.setList(msgIntrcpLists); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + msgIntrcpListRes.setPaging(paging); + + return new MsgIntrcpListResDto(ApiResponseCode.SUCCESS, msgIntrcpListRes); } /** * date : 2022. 4. 25. * auth : ckr * desc : 메시지 차단 상세 정보 조회 - * @param paramMap + * @param msgIntrcpDetailReqDto * @return */ - public ApiResponseMessage msgIntrcpDetail(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - - dataObj.put("intrcpMsgId", "testMsgId"); - dataObj.put("intrcpString1", "도박"); - dataObj.put("intrcpString2", "광고"); - dataObj.put("intrcpString3", "술"); - dataObj.put("intrcpString4", ""); - dataObj.put("intrcpString5", ""); - dataObj.put("intrcpString6", ""); - dataObj.put("intrcpString7", ""); - dataObj.put("intrcpString8", ""); - dataObj.put("intrcpString9", ""); - dataObj.put("intrcpString10", ""); - dataObj.put("condition", "OR"); - dataObj.put("intrcpReason", "도박"); - dataObj.put("memo", "가나다라"); - dataObj.put("intrcpYn", "차단"); - - result.setData(dataObj); - - return result; + public MsgIntrcpDetailResDto msgIntrcpDetail(MsgIntrcpDetailReqDto msgIntrcpDetailReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + MsgIntrcpDetail msgIntrcpDetail = riskMgtMapper.selectMsgBlckwordDetail(msgIntrcpDetailReqDto); + + if(msgIntrcpDetail == null){ + return new MsgIntrcpDetailResDto(ApiResponseCode.CM_NOT_FOUND); + } + + List msgBlckwordLists = riskMgtMapper.selectBlckwordDtlList(msgIntrcpDetailReqDto); + + msgIntrcpDetail.setList(msgBlckwordLists); + + return new MsgIntrcpDetailResDto(ApiResponseCode.SUCCESS, msgIntrcpDetail); } /** @@ -209,70 +287,111 @@ public class RiskMgtService { * @param paramMap * @return */ - public ApiResponseMessage msgInsertIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public MsgInsertIntrcpResDto msgInsertIntrcp(MsgInsertIntrcpReqDto msgInsertIntrcpReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + + try{ + riskMgtMapper.insertMsgBlckword(msgInsertIntrcpReqDto); + //TODO 차단문구 등록 + riskMgtMapper.insertBlckwordDtl(msgInsertIntrcpReqDto.getList()); + }catch (Exception e){ + return new MsgInsertIntrcpResDto(ApiResponseCode.CM_DB_QUERY_ERR); + } + + return new MsgInsertIntrcpResDto(ApiResponseCode.SUCCESS); } /** * date : 2022. 4. 25. * auth : ckr * desc : 메시지 차단 수정 - * @param paramMap + * @param msgUpdateIntrcplReqDto * @return */ - public ApiResponseMessage msgUpdateIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public MsgUpdateIntrcpResDto msgUpdateIntrcp(MsgUpdateIntrcplReqDto msgUpdateIntrcplReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + + int result = riskMgtMapper.updateMsgBlckword(msgUpdateIntrcplReqDto); + + if(result > 0){ + + int subResult = riskMgtMapper.deleteBlckwordDtl(msgUpdateIntrcplReqDto.getSeqNo()); + + if(subResult > 0){ + riskMgtMapper.insertBlckwordDtl(msgUpdateIntrcplReqDto.getList()); + } + + return new MsgUpdateIntrcpResDto(ApiResponseCode.SUCCESS); + }else{ + return new MsgUpdateIntrcpResDto(ApiResponseCode.CM_NOT_FOUND); + } + } /** * date : 2022. 4. 25. * auth : ckr * desc : 메시지 차단 삭제 - * @param paramMap + * @param msgDeleteIntrcpReqDto * @return */ - public ApiResponseMessage msgDeleteIntrcp(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public MsgDeleteIntrcpResDto msgDeleteIntrcp(MsgDeleteIntrcpReqDto msgDeleteIntrcpReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class); + + int result = riskMgtMapper.deleteMsgBlckword(msgDeleteIntrcpReqDto); + riskMgtMapper.deleteBlckwordDtl(msgDeleteIntrcpReqDto.getSeqNo()); + + return new MsgDeleteIntrcpResDto(ApiResponseCode.SUCCESS); } /** * date : 2022. 4. 25. * auth : ckr * desc : 차단 내역 목록 조회 - * @param paramMap + * @param webInsertIntrcpReqDto * @return */ - public ApiResponseMessage allIntrcpList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("intrcpType", "발신번호차단"); - data.put("sendId", "Abcd"); - data.put("sendNum", "021540000"); - data.put("custNm", "가나다"); - data.put("custId", "Uplus01"); - data.put("bRegNo", "123-11-12345"); - data.put("recvNum", "01022223333"); - data.put("intrcpReason", "도착"); - data.put("sendDt", "2-03-22"); - - dataList.add(data); + public WebIntrcpListResDto webIntrcpList(WebInsertIntrcpReqDto webInsertIntrcpReqDto) { + + RiskMgtMapper riskMgtMapper = sqlSessionSlave.getMapper(RiskMgtMapper.class); + + // 현재 페이지. + String nowPage = String.valueOf(webInsertIntrcpReqDto.getPage()); + int totalCnt = riskMgtMapper.selectWebsndBlckListTotalCnt(webInsertIntrcpReqDto); + + if (totalCnt == 0) { + + WebIntrcpListRes webIntrcpListRes = new WebIntrcpListRes(); + webIntrcpListRes.setList(new ArrayList<>()); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + paging.setTotalCnt(String.valueOf(totalCnt)); + webIntrcpListRes.setPaging(paging); + + return new WebIntrcpListResDto(ApiResponseCode.CM_NOT_FOUND, webIntrcpListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = webInsertIntrcpReqDto.getPage(); + int pagePerRows = webInsertIntrcpReqDto.getPagePerRows(); + page = (page - 1) * pagePerRows; + webInsertIntrcpReqDto.setPage(page); + + List webIntrcpLists = riskMgtMapper.selectWebsndBlckList(webInsertIntrcpReqDto); + + WebIntrcpListRes webIntrcpListRes = new WebIntrcpListRes(); + webIntrcpListRes.setList(webIntrcpLists); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + webIntrcpListRes.setPaging(paging); + + return new WebIntrcpListResDto(ApiResponseCode.SUCCESS, webIntrcpListRes); } } diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/RistMgtController.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/RistMgtController.java index 9dcc1e5..356c845 100644 --- a/src/main/java/kr/co/uplus/ez/api/riskMgt/RistMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/RistMgtController.java @@ -5,16 +5,18 @@ */ package kr.co.uplus.ez.api.riskMgt; -import java.util.Map; - +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import kr.co.uplus.ez.api.riskMgt.dto.*; +import kr.co.uplus.ez.common.components.ValidComponents; +import kr.co.uplus.ez.common.data.ApiResponseCode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; -import kr.co.uplus.ez.common.data.ApiResponseMessage; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; @RestController @RequestMapping(value = "api/v1/bo/riskMgt") @@ -22,19 +24,30 @@ public class RistMgtController { @Autowired RiskMgtService riskService; - + + @Autowired + ValidComponents validComponents; + /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 차단 목록 조회 + * * @param paramMap * @return - * @throws Exception + * @ */ - @RequestMapping(value = "/sendNum/intrcpList" , method = {RequestMethod.POST}) + @ApiOperation(value = "/sendNum/intrcpList", notes = "발신번호 차단 목록 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) + @RequestMapping(value = "/sendNum/intrcpList", method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumIntrcpList(@RequestBody Map paramMap) throws Exception{ - return riskService.sendNumIntrcpList(paramMap); + public SendNumIntrcpListResDto sendNumIntrcpList(@RequestBody @Valid SendNumIntrcpListReqDto sendNumIntrcpListReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new SendNumIntrcpListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.sendNumIntrcpList(sendNumIntrcpListReqDto); } /** @@ -43,12 +56,19 @@ public class RistMgtController { * desc : 발신번호 차단 상세 정보 조회 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/sendNum/intrcpDetail", notes = "발신번호 차단 상세 정보 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/sendNum/intrcpDetail" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumIntrcpDetail(@RequestBody Map paramMap) throws Exception{ - return riskService.sendNumIntrcpDetail(paramMap); + public SendNumIntrcpDetailResDto sendNumIntrcpDetail(@RequestBody @Valid SendNumIntrcpDetailReqDto sendNumIntrcpDetailReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new SendNumIntrcpDetailResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.sendNumIntrcpDetail(sendNumIntrcpDetailReqDto); } /** @@ -57,12 +77,19 @@ public class RistMgtController { * desc : 발신번호 차단 신규 등록 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/sendNum/insertIntrcp", notes = "발신번호 차단 신규 등록") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/sendNum/insertIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumInsertIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.sendNumInsertIntrcp(paramMap); + public SendNumInsertIntrcpResDto sendNumInsertIntrcp(@RequestBody @Valid SendNumInsertIntrcpReqDto insertIntrcpReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new SendNumInsertIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.sendNumInsertIntrcp(insertIntrcpReqDto); } /** @@ -71,12 +98,19 @@ public class RistMgtController { * desc : 발신번호 차단 수정 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/sendNum/updateIntrcp", notes = "발신번호 차단 수정 ") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/sendNum/updateIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumUpdateIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.sendNumUpdateIntrcp(paramMap); + public SendNumUpdateIntrcpResDto sendNumUpdateIntrcp(@RequestBody @Valid SendNumUpdateIntrcplReqDto sendNumUpdateIntrcplReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new SendNumUpdateIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.sendNumUpdateIntrcp(sendNumUpdateIntrcplReqDto); } /** @@ -85,12 +119,19 @@ public class RistMgtController { * desc : 발신번호 차단 삭제 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/sendNum/deleteIntrcp", notes = "발신번호 차단 삭제 ") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/sendNum/deleteIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage sendNumDeleteIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.sendNumDeleteIntrcp(paramMap); + public SendNumDeleteIntrcpResDto sendNumDeleteIntrcp(@RequestBody @Valid SendNumDeleteIntrcpReqDto sendNumDeleteIntrcpReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new SendNumDeleteIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.sendNumDeleteIntrcp(sendNumDeleteIntrcpReqDto); } /** @@ -99,12 +140,19 @@ public class RistMgtController { * desc : 080수신번호 차단 목록 조회 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/zezNum/intrcpList", notes = "080수신번호 차단 목록 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/zezNum/intrcpList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage zezNumIntrcpList(@RequestBody Map paramMap) throws Exception{ - return riskService.zezNumIntrcpList(paramMap); + public ZezNumIntrcpListResDto zezNumIntrcpList(@RequestBody @Valid ZezNumIntrcpListReqDto zezNumIntrcpListReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new ZezNumIntrcpListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.zezNumIntrcpList(zezNumIntrcpListReqDto); } /** @@ -113,12 +161,19 @@ public class RistMgtController { * desc : 메시지 차단 목록 조회 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/msg/intrcpList", notes = "메시지 차단 목록 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/msg/intrcpList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage msgIntrcpList(@RequestBody Map paramMap) throws Exception{ - return riskService.msgIntrcpList(paramMap); + public MsgIntrcpListResDto msgIntrcpList(@RequestBody @Valid MsgIntrcpListReqDto msgNumIntrcpListReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new MsgIntrcpListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.msgIntrcpList(msgNumIntrcpListReqDto); } /** @@ -127,12 +182,19 @@ public class RistMgtController { * desc : 메시지 차단 상세 정보 조회 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/msg/intrcpDetail", notes = "메시지 차단 상세 정보 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/msg/intrcpDetail" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage msgIntrcpDetail(@RequestBody Map paramMap) throws Exception{ - return riskService.msgIntrcpDetail(paramMap); + public MsgIntrcpDetailResDto msgIntrcpDetail(@RequestBody @Valid MsgIntrcpDetailReqDto msgIntrcpDetailReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new MsgIntrcpDetailResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.msgIntrcpDetail(msgIntrcpDetailReqDto); } /** @@ -141,12 +203,19 @@ public class RistMgtController { * desc : 메시지 차단 신규 등록 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/msg/insertIntrcp", notes = "메시지 차단 신규 등록") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/msg/insertIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage msgInsertIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.msgInsertIntrcp(paramMap); + public MsgInsertIntrcpResDto msgInsertIntrcp(@RequestBody @Valid MsgInsertIntrcpReqDto msgInsertIntrcpReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new MsgInsertIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.msgInsertIntrcp(msgInsertIntrcpReqDto); } /** @@ -155,12 +224,19 @@ public class RistMgtController { * desc : 메시지 차단 수정 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/msg/updateIntrcp", notes = "메시지 차단 수정") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/msg/updateIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage msgUpdateIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.msgUpdateIntrcp(paramMap); + public MsgUpdateIntrcpResDto msgUpdateIntrcp(@RequestBody @Valid MsgUpdateIntrcplReqDto msgUpdateIntrcplReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new MsgUpdateIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.msgUpdateIntrcp(msgUpdateIntrcplReqDto); } /** @@ -169,25 +245,39 @@ public class RistMgtController { * desc : 메시지 차단 삭제 * @param paramMap * @return - * @throws Exception + * @ */ + @ApiOperation(value = "/msg/deleteIntrcp", notes = "메시지 차단 삭제") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) @RequestMapping(value = "/msg/deleteIntrcp" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage msgDeleteIntrcp(@RequestBody Map paramMap) throws Exception{ - return riskService.msgDeleteIntrcp(paramMap); + public MsgDeleteIntrcpResDto msgDeleteIntrcp(@RequestBody @Valid MsgDeleteIntrcpReqDto msgDeleteIntrcpReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new MsgDeleteIntrcpResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.msgDeleteIntrcp(msgDeleteIntrcpReqDto); } /** * date : 2022. 4. 25. * auth : ckr - * desc : 차단 내역 목록 조회 + * desc : 웹발송 차단 내역 목록 조회 * @param paramMap * @return - * @throws Exception + * @ */ - @RequestMapping(value = "/all/intrcpList" , method = {RequestMethod.POST}) + @ApiOperation(value = "/web/intrcpList", notes = "웹발송 차단 내역 목록 조회") + @ApiResponses({ + @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") + }) + @RequestMapping(value = "/web/intrcpList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage allIntrcpList(@RequestBody Map paramMap) throws Exception{ - return riskService.allIntrcpList(paramMap); + public WebIntrcpListResDto webIntrcpList(@RequestBody @Valid WebInsertIntrcpReqDto webInsertIntrcpReqDto, BindingResult bindingResult) { + if(validComponents.validParameter(bindingResult)) { + return new WebIntrcpListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return riskService.webIntrcpList(webInsertIntrcpReqDto); } } diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgBlckwordList.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgBlckwordList.java new file mode 100644 index 0000000..aa9e2ea --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgBlckwordList.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgBlckwordList implements Serializable { + + @ApiModelProperty(example = "일련번호", name = "일련번호", dataType = "String") + private String seqNo; + @ApiModelProperty(example = "차단문구", name = "차단문구", dataType = "String") + private String word; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpReqDto.java new file mode 100644 index 0000000..bd901df --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpReqDto.java @@ -0,0 +1,19 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class MsgDeleteIntrcpReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "일련번호", name = "일련번호", dataType = "String") + private String seqNo; + + private List list; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpResDto.java new file mode 100644 index 0000000..b263ea7 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgDeleteIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgDeleteIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public MsgDeleteIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MsgDeleteIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MsgDeleteIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpReqDto.java new file mode 100644 index 0000000..6d6e110 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpReqDto.java @@ -0,0 +1,21 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class MsgInsertIntrcpReqDto implements Serializable { + + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단조건", name = "차단조건", dataType = "String") + private String blckContCd; + @ApiModelProperty(example = "메모", name = "메모", dataType = "String") + private String memo; + + private List list; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpResDto.java new file mode 100644 index 0000000..9fe4765 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgInsertIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgInsertIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public MsgInsertIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MsgInsertIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MsgInsertIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetail.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetail.java new file mode 100644 index 0000000..c5f6828 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetail.java @@ -0,0 +1,27 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpDetail implements Serializable { + + @ApiModelProperty(example = "일련번호", name = "일련번호", dataType = "String") + private String seqNo; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단조건", name = "차단조건", dataType = "String") + private String blckContCd; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String chgDt; + @ApiModelProperty(example = "메모", name = "메모", dataType = "String") + private String memo; + + private java.util.List list; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailReqDto.java new file mode 100644 index 0000000..2086c8f --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailReqDto.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpDetailReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "일련번호", name = "일련번호", dataType = "String") + private String seqNo; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailResDto.java new file mode 100644 index 0000000..2df7c31 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpDetailResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpDetailResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private MsgIntrcpDetail data; + + public MsgIntrcpDetailResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MsgIntrcpDetailResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MsgIntrcpDetailResDto(ApiResponseCode returnStr, MsgIntrcpDetail data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpList.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpList.java new file mode 100644 index 0000000..e16a935 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpList.java @@ -0,0 +1,24 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpList implements Serializable { + + @ApiModelProperty(example = "리스트 번호", name = "리스트 번호", dataType = "String") + private String no; + @ApiModelProperty(example = "차단메시지", name = "차단메시지", dataType = "String") + private String word; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String lastChgDt; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListReqDto.java new file mode 100644 index 0000000..85374d8 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListReqDto.java @@ -0,0 +1,28 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpListReqDto implements Serializable { + + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; + @ApiModelProperty(example = "차단사유", name = "차단사유",dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단메시지", name = "차단메시지",dataType = "String") + private String word; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListRes.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListRes.java new file mode 100644 index 0000000..d329cf4 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpListRes implements Serializable{ + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListResDto.java new file mode 100644 index 0000000..8220675 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgIntrcpListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgIntrcpListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private MsgIntrcpListRes data; + + public MsgIntrcpListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MsgIntrcpListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MsgIntrcpListResDto(ApiResponseCode returnStr, MsgIntrcpListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcpResDto.java new file mode 100644 index 0000000..e823499 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MsgUpdateIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public MsgUpdateIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MsgUpdateIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MsgUpdateIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcplReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcplReqDto.java new file mode 100644 index 0000000..b6ed3e8 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/MsgUpdateIntrcplReqDto.java @@ -0,0 +1,25 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class MsgUpdateIntrcplReqDto implements Serializable { + + @ApiModelProperty(example = "일련번호", name = "일련번호", dataType = "String") + private String seqNo; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단조건", name = "차단조건", dataType = "String") + private String blckContCd; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "메모", name = "메모", dataType = "String") + private String memo; + + private List list; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpReqDto.java new file mode 100644 index 0000000..5dc5706 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpReqDto.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumDeleteIntrcpReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String blckSndrno; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpResDto.java new file mode 100644 index 0000000..8011158 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumDeleteIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumDeleteIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public SendNumDeleteIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumDeleteIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumDeleteIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpReqDto.java new file mode 100644 index 0000000..3c53fdb --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpReqDto.java @@ -0,0 +1,30 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumInsertIntrcpReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "검색어 (발신번호)", name = "검색어 (발신번호)", dataType = "String") + private String blckSndrno; + @NotNull + @ApiModelProperty(example = "발송타입", name = "발송타입",dataType = "String") + private String sndblckTpCd; + @NotNull + @ApiModelProperty(example = "차단사유", name = "차단사유",dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "메모", name = "메모",dataType = "String") + private String meno; + + /** 차단 여부*/ + @ApiModelProperty(example = "차단여부", name = "차단여부",dataType = "String") + private String blckYn; + @ApiModelProperty(example = "등록자", name = "등록자",dataType = "String") + private String regId; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpResDto.java new file mode 100644 index 0000000..e862806 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumInsertIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumInsertIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public SendNumInsertIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumInsertIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumInsertIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetail.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetail.java new file mode 100644 index 0000000..a673eba --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetail.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpDetail implements Serializable { + + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String blcksndrno; + @ApiModelProperty(example = "발송타입", name = "발송타입", dataType = "String") + private String sndblckTpCd; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String chgDt; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; + @ApiModelProperty(example = "메모", name = "메모", dataType = "String") + private String meno; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailReqDto.java new file mode 100644 index 0000000..da23f6f --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailReqDto.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpDetailReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "검색어 (발신번호)", name = "검색어 (발신번호)", dataType = "String") + private String blckSndrno; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailResDto.java new file mode 100644 index 0000000..3f3c5a1 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpDetailResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpDetailResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private SendNumIntrcpDetail data; + + public SendNumIntrcpDetailResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumIntrcpDetailResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumIntrcpDetailResDto(ApiResponseCode returnStr, SendNumIntrcpDetail data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpList.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpList.java new file mode 100644 index 0000000..71f5935 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpList.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpList implements Serializable { + + @ApiModelProperty(example = "리스트 번호", name = "리스트 번호", dataType = "String") + private String no; + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String blcksndrno; + @ApiModelProperty(example = "발송타입", name = "발송타입", dataType = "String") + private String sndblckTpCd; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String lastChgDt; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListReqDto.java new file mode 100644 index 0000000..7855246 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListReqDto.java @@ -0,0 +1,32 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpListReqDto implements Serializable { + + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; + @ApiModelProperty(example = "차단사유", name = "차단사유",dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단여부", name = "차단여부",dataType = "String") + private String blckYn; + @ApiModelProperty(example = "발송타입", name = "발송타입",dataType = "String") + private String sndblckTpCd; + @ApiModelProperty(example = "검색어 (발신번호)", name = "검색어 (발신번호)", dataType = "String") + private String blckSndrno; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListRes.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListRes.java new file mode 100644 index 0000000..ea2095a --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpListRes implements Serializable{ + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListResDto.java new file mode 100644 index 0000000..5230171 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumIntrcpListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumIntrcpListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private SendNumIntrcpListRes data; + + public SendNumIntrcpListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumIntrcpListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumIntrcpListResDto(ApiResponseCode returnStr, SendNumIntrcpListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcpResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcpResDto.java new file mode 100644 index 0000000..bfe25cf --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcpResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumUpdateIntrcpResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private Object data; + + public SendNumUpdateIntrcpResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumUpdateIntrcpResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumUpdateIntrcpResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcplReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcplReqDto.java new file mode 100644 index 0000000..e55a05e --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/SendNumUpdateIntrcplReqDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class SendNumUpdateIntrcplReqDto implements Serializable { + + @NotNull + @ApiModelProperty(example = "검색어 (발신번호)", name = "검색어 (발신번호)", dataType = "String") + private String blckSndrno; + @ApiModelProperty(example = "발송타입", name = "발송타입", dataType = "String") + private String sndblckTpCd; + @ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String") + private String blckYn; + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String chgDt; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "등록자", name = "등록자", dataType = "String") + private String regId; + @ApiModelProperty(example = "메모", name = "메모", dataType = "String") + private String meno; + + @ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String") + private String chgId; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebInsertIntrcpReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebInsertIntrcpReqDto.java new file mode 100644 index 0000000..a1b2884 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebInsertIntrcpReqDto.java @@ -0,0 +1,36 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class WebInsertIntrcpReqDto implements Serializable { + + @ApiModelProperty(example = "발송일", name = "발송일", dataType = "String") + private String blckDt; + @ApiModelProperty(example = "차단사유", name = "차단사유",dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "차단구분", name = "차단구분",dataType = "String") + private String blckTpCd; + @ApiModelProperty(example = "발신번호", name = "발신번호",dataType = "String") + private String sndrno; + @ApiModelProperty(example = "수신번호", name = "수신번호", dataType = "String") + private String rcvno; + @ApiModelProperty(example = "상세검색", name = "상세검색", notes = "항목 : 고객사명/사업자번호/발송ID", dataType = "String") + private String searchType1; + @ApiModelProperty(example = "검색어 (입력항목)", name = "검색어 (입력항목)", dataType = "String") + private String searchText1; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpList.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpList.java new file mode 100644 index 0000000..10863ad --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpList.java @@ -0,0 +1,30 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class WebIntrcpList implements Serializable { + + @ApiModelProperty(example = "리스트 번호", name = "리스트 번호", dataType = "String") + private String no; + @ApiModelProperty(example = "차단구분", name = "차단구분", dataType = "String") + private String blckTpCd; + @ApiModelProperty(example = "발송ID", name = "발송ID", dataType = "String") + private String userId; + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String sndrno; + @ApiModelProperty(example = "고객사명", name = "고객사명", dataType = "String") + private String custNm; + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bizrno; + @ApiModelProperty(example = "수신번호", name = "수신번호", dataType = "String") + private String rcvno; + @ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String") + private String blckRsnCd; + @ApiModelProperty(example = "발송일자", name = "발송일자", dataType = "String") + private String blckDt; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListRes.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListRes.java new file mode 100644 index 0000000..1e1eace --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class WebIntrcpListRes implements Serializable{ + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListResDto.java new file mode 100644 index 0000000..04f2e9a --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/WebIntrcpListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class WebIntrcpListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private WebIntrcpListRes data; + + public WebIntrcpListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public WebIntrcpListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public WebIntrcpListResDto(ApiResponseCode returnStr, WebIntrcpListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpList.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpList.java new file mode 100644 index 0000000..ce92704 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpList.java @@ -0,0 +1,27 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ZezNumIntrcpList implements Serializable { + + @ApiModelProperty(example = "리스트 번호", name = "리스트 번호", dataType = "String") + private String no; + @ApiModelProperty(example = "고객사", name = "고객사", dataType = "String") + private String custNm; + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bizrno; + @ApiModelProperty(example = "인증코드", name = "인증코드",dataType = "String") + private String authcd080; + @ApiModelProperty(example = "수신번호", name = "수신번호", dataType = "String") + private String rcvblckno; + @ApiModelProperty(example = "등록일", name = "등록일", dataType = "String") + private String regDt; + @ApiModelProperty(example = "등록구분", name = "등록구분", dataType = "String") + private String regTpCd; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListReqDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListReqDto.java new file mode 100644 index 0000000..aee43c7 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListReqDto.java @@ -0,0 +1,28 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ZezNumIntrcpListReqDto implements Serializable { + + @ApiModelProperty(example = "고객사", name = "고객사", dataType = "String") + private String custNm; + @ApiModelProperty(example = "인증코드", name = "인증코드",dataType = "String") + private String authcd080; + @ApiModelProperty(example = "수신번호", name = "수신번호", dataType = "String") + private String rcvblckno; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListRes.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListRes.java new file mode 100644 index 0000000..84d49be --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class ZezNumIntrcpListRes implements Serializable{ + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListResDto.java b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListResDto.java new file mode 100644 index 0000000..9477d61 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/riskMgt/dto/ZezNumIntrcpListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.riskMgt.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class ZezNumIntrcpListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private ZezNumIntrcpListRes data; + + public ZezNumIntrcpListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public ZezNumIntrcpListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public ZezNumIntrcpListResDto(ApiResponseCode returnStr, ZezNumIntrcpListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java index 766ca96..3e5c566 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java @@ -1,19 +1,40 @@ /** * date : 2022. 4. 25. * auth : ckr - * desc : 발신번호관리 + * desc : 발신번호관리 */ package kr.co.uplus.ez.api.sendNumMgt; import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListResDto; +import kr.co.uplus.ez.common.components.ValidComponents; +import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.ApiResponseMessage; @RestController @@ -22,117 +43,162 @@ public class SendNumMgtController { @Autowired SendNumMgtService sendNumService; - + + @Autowired + ValidComponents validComponents; /** * date : 2022. 4. 25. * auth : ckr - * desc : 발신 프로필 목록 조회 + * desc : 발신 프로필 목록 조회 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/profileList" , method = {RequestMethod.POST}) + @ApiOperation(value = "/profileList", notes = "발신 프로필 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "profileList", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage profileList(@RequestBody Map paramMap) throws Exception{ - return sendNumService.profileList(paramMap); + public ProfileListResDto profileList(@RequestBody @Valid ProfileListReqDto profileListReqDto, BindingResult bindingResult) { + + if (validComponents.validParameter(bindingResult)) { + return new ProfileListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + return sendNumService.profileList(profileListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 문자 발신 번호 목록 조회 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/numberList" , method = {RequestMethod.POST}) + + @ApiOperation(value = "/numberList", notes = "문자 발신 번호 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "numberList", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage numberList(@RequestBody Map paramMap) throws Exception{ - return sendNumService.numberList(paramMap); + public SendNumberListResDto numberList(@RequestBody @Valid SendNumberListReqDto sendNumberListReqDto, BindingResult bindingResult) throws Exception{ + + if (validComponents.validParameter(bindingResult)) { + return new SendNumberListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return sendNumService.numberList(sendNumberListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 문자 발신 번호 삭제 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/deleteNumber" , method = {RequestMethod.POST}) + + @ApiOperation(value = "/deleteNumber", notes = "문자 발신 번호 삭제") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "deleteNumber", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage deleteNumber(@RequestBody Map paramMap) throws Exception{ - return sendNumService.deleteNumber(paramMap); + public DeleteNumberResDto deleteNumber(@RequestBody @Valid DeleteNumberReqDto deleteNumberReqDto, BindingResult bindingResult) throws Exception{ + if (validComponents.validParameter(bindingResult)) { + return new DeleteNumberResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + return sendNumService.deleteNumber(deleteNumberReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 문자 발신 번호 등록 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/insertNumber" , method = {RequestMethod.POST}) + + @ApiOperation(value = "/insertNumber", notes = "문자 발신 번호 등록") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "insertNumber", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage insertNumber(@RequestBody Map paramMap) throws Exception{ - return sendNumService.insertNumber(paramMap); + public InsertNumberResDto insertNumber(@RequestBody @Valid InsertNumberReqDto insertNumberReqDto, BindingResult bindingResult) throws Exception{ + + if (validComponents.validParameter(bindingResult)) { + return new InsertNumberResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + return sendNumService.insertNumber(insertNumberReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 문자 발신 번호 정보 상세 조회 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/numberDetail" , method = {RequestMethod.POST}) + @ApiOperation(value = "/numberDetail", notes = "문자 발신 번호 정보 상세 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "numberDetail", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage numberDetail(@RequestBody Map paramMap) throws Exception{ - return sendNumService.numberDetail(paramMap); + public DetailNumberResDto numberDetail(@RequestBody @Valid DetailNumberReqDto detailNumberReqDto, BindingResult bindingResult) throws Exception{ + + if (validComponents.validParameter(bindingResult)) { + return new DetailNumberResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + return sendNumService.numberDetail(detailNumberReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 관리자ID 목록 조회 * @param paramMap - * @throws Exception + * @throws Exception */ - @RequestMapping(value = "/adminList" , method = {RequestMethod.POST}) + @ApiOperation(value = "/adminList", notes = "관리자ID 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) + @RequestMapping(value = "adminList", method = { RequestMethod.POST }) @ResponseBody - public ApiResponseMessage adminList(@RequestBody Map paramMap) throws Exception{ - return sendNumService.adminList(paramMap); + public SendAdminListResDto adminList(@RequestBody @Valid SendAdminListReqDto adminListReqDto, BindingResult bindingResult) throws Exception{ + + if (validComponents.validParameter(bindingResult)) { + return new SendAdminListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + return sendNumService.adminList(adminListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 승인 목록 조회 * @param paramMap - * @throws Exception + * @throws Exception */ @RequestMapping(value = "/apprList" , method = {RequestMethod.POST}) @ResponseBody public ApiResponseMessage apprList(@RequestBody Map paramMap) throws Exception{ return sendNumService.apprList(paramMap); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 발신번호 승인 상세 정보 조회 * @param paramMap - * @throws Exception + * @throws Exception */ @RequestMapping(value = "/apprDetail" , method = {RequestMethod.POST}) @ResponseBody public ApiResponseMessage apprDetail(@RequestBody Map paramMap) throws Exception{ return sendNumService.apprDetail(paramMap); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 발송내역 목록 조회 * @param paramMap - * @throws Exception + * @throws Exception */ @RequestMapping(value = "/insertAppr" , method = {RequestMethod.POST}) @ResponseBody diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java index 152dbe5..4a5426d 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java @@ -1,8 +1,51 @@ package kr.co.uplus.ez.api.sendNumMgt; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.AuthFileInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumber; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumber; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberFile; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListReqDto; + @Mapper -public class SendNumMgtMapper { +interface SendNumMgtMapper { + int selectProfileTotalCnt(ProfileListReqDto profileListReqDto); + + List selectProfileList(ProfileListReqDto profileListReqDto); + + int selectSendNumberTotalCnt(SendNumberListReqDto sendNumberListReqDto); + + List selectSendNumberList(SendNumberListReqDto sendNumberListReqDto); + + int selectAdminTotalCnt(SendAdminListReqDto adminListReqDto); + + List selectAdminList(SendAdminListReqDto adminlistreqdto); + + String selectUserSeqByAdminId(String adminId); + + int deleteNumber(DeleteNumberReqDto deleteNumberReqDto); + + void insertNumber(InsertNumberReqDto insertNumberReqDto); + + void insertNumberDoc(InsertNumberFile insertNumberFile); + + void insertNumberList(InsertNumber insertNumber); + + String selectUserSeqByRegNo(DetailNumberReqDto detailNumberReqDto); + + DetailNumber detailNumber(DetailNumberReqDto detailNumberReqDto); + + List selectAuthFileList(DetailNumberReqDto detailNumberReqDto); } diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java index 0e886a8..93bd926 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java @@ -1,49 +1,104 @@ package kr.co.uplus.ez.api.sendNumMgt; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.io.FilenameUtils; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListRes; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.AuthFileInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.AuthFileList; +import kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumber; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumber; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberFile; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListRes; +import kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListResDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberInfo; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListReqDto; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListRes; +import kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListResDto; +import kr.co.uplus.ez.api.sysMgt.SysMgtMapper; +import kr.co.uplus.ez.api.sysMgt.dto.AdminDetail; +import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailResDto; +import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminReqDto; +import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminResDto; import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.ApiResponseMessage; +import kr.co.uplus.ez.common.data.Paging; +import kr.co.uplus.ez.common.utils.EncryptionUtil; +import kr.co.uplus.ez.common.utils.FileUtil; @Service public class SendNumMgtService { + @Autowired + @Qualifier("sqlSessionTemplateDb1") + private SqlSessionTemplate sqlSessionMaster; + + @Autowired + @Qualifier("sqlSessionTemplateDb2") + private SqlSessionTemplate sqlSessionSlave; + + /** * date : 2022. 4. 25. * auth : ckr - * desc : 발신 프로필 목록 조회 + * desc : 발신 프로필 목록 조회 * @param paramMap - * @return + * @return */ - public ApiResponseMessage profileList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("custNm", "유플러스"); - data.put("bRegNo", "229-81-39938"); - data.put("sendProfile", "@유플러스"); - data.put("sendProfileKey", "Ea98cv472cff7f5bdbc90"); - data.put("stat", "사용"); - data.put("regDt", "2022-03-10"); - dataList.add(data); + public ProfileListResDto profileList(ProfileListReqDto profileListReqDto) { + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + String nowPage = String.valueOf(profileListReqDto.getPage()); + int totalCnt = sendNumMgtMapper.selectProfileTotalCnt(profileListReqDto); + + if(totalCnt == 0) { + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + ProfileListRes profileListRes = new ProfileListRes(); + profileListRes.setList(new ArrayList<>()); + profileListRes.setPaging(paging); + return new ProfileListResDto(ApiResponseCode.CM_NOT_FOUND, profileListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = profileListReqDto.getPage(); + int pagePerRows = profileListReqDto.getPage(); + page = (page - 1) * pagePerRows; + profileListReqDto.setPage(page); + + List profileInfos = sendNumMgtMapper.selectProfileList(profileListReqDto); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + + ProfileListRes profileListRes = new ProfileListRes(); + profileListRes.setList(profileInfos); + profileListRes.setPaging(paging); + + return new ProfileListResDto(ApiResponseCode.SUCCESS, profileListRes); + + } /** @@ -51,35 +106,39 @@ public class SendNumMgtService { * auth : ckr * desc : 문자 발신 번호 목록 조회 * @param paramMap - * @return + * @return */ - public ApiResponseMessage numberList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - data.put("totalCnt","999"); - data.put("currentPage","1"); - dataObj.put("paging", data); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); - data.put("custNm", "유플러스"); - data.put("adminId", "Uplus01"); - data.put("register", "Uplus01"); - data.put("bRegNo", "229-81-39938"); - data.put("sendNum", "010-1234-1234"); - data.put("apprStat", "승인완료"); - data.put("regMethod", "본인인등"); - data.put("regDt", "2022-03-10"); - data.put("regNo", "12345"); - dataList.add(data); + public SendNumberListResDto numberList(SendNumberListReqDto sendNumberListReqDto) { + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + String nowPage = String.valueOf(sendNumberListReqDto.getPage()); + int totalCnt = sendNumMgtMapper.selectSendNumberTotalCnt(sendNumberListReqDto); + + if(totalCnt == 0) { + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + SendNumberListRes sendNumberListRes = new SendNumberListRes(); + sendNumberListRes.setList(new ArrayList<>()); + sendNumberListRes.setPaging(paging); + return new SendNumberListResDto(ApiResponseCode.CM_NOT_FOUND, sendNumberListRes); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + int page = sendNumberListReqDto.getPage(); + int pagePerRows = sendNumberListReqDto.getPage(); + page = (page - 1) * pagePerRows; + sendNumberListReqDto.setPage(page); + + List sendNumberInfos = sendNumMgtMapper.selectSendNumberList(sendNumberListReqDto); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + + SendNumberListRes sendNumberListRes = new SendNumberListRes(); + sendNumberListRes.setList(sendNumberInfos); + sendNumberListRes.setPaging(paging); + + return new SendNumberListResDto(ApiResponseCode.SUCCESS, sendNumberListRes); } /** @@ -87,11 +146,19 @@ public class SendNumMgtService { * auth : ckr * desc : 문자 발신 번호 삭제 * @param paramMap - * @return + * @return */ - public ApiResponseMessage deleteNumber(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public DeleteNumberResDto deleteNumber(DeleteNumberReqDto deleteNumberReqDto) { + + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + + try { + sendNumMgtMapper.deleteNumber(deleteNumberReqDto); + } catch (Exception e) { + return new DeleteNumberResDto(ApiResponseCode.CM_DB_QUERY_ERR); + } + + return new DeleteNumberResDto(ApiResponseCode.SUCCESS); } /** @@ -99,11 +166,148 @@ public class SendNumMgtService { * auth : ckr * desc : 문자 발신 번호 등록 * @param paramMap - * @return + * @return */ - public ApiResponseMessage insertNumber(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - return result; + public InsertNumberResDto insertNumber(InsertNumberReqDto insertNumberReqDto) { + FileUtil fileUtil = new FileUtil(); + + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + + String adminId = insertNumberReqDto.getAdminId(); + + String userSeq = sendNumMgtMapper.selectUserSeqByAdminId(adminId); + + insertNumberReqDto.setUserSeq(userSeq); + insertNumberReqDto.setReqCnt(insertNumberReqDto.getList().size()+1); + try { + // 1. EZ_SNDRNO_REG + sendNumMgtMapper.insertNumber(insertNumberReqDto); + + String path = "C:/hubeasyfiles/sndrNo/"+insertNumberReqDto.getAdminId(); + File dir = new File(path); + if(!dir.isDirectory()) { + dir.mkdirs(); + } + + for(int i=0;i paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - dataObj.put("adminId", "Uplus01"); - dataObj.put("custNm", "유플러스"); - dataObj.put("bRegNo", "229-81-39938"); - dataObj.put("authSendNumYn", "Y"); - dataObj.put("authBsnsYn", "Y"); - - for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("sendNm", "테스트"+(i+1)); - data.put("sendNum", "02-555-5555"); - dataList.add(data); + public DetailNumberResDto numberDetail(DetailNumberReqDto detailNumberReqDto) { + + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + + DetailNumber detailNumber = new DetailNumber(); + try { + detailNumber = sendNumMgtMapper.detailNumber(detailNumberReqDto); + + if(detailNumber == null) { + return new DetailNumberResDto(ApiResponseCode.CM_NOT_FOUND); + } + detailNumber.setList(sendNumMgtMapper.selectAuthFileList(detailNumberReqDto)); + } catch (Exception e) { + return new DetailNumberResDto(ApiResponseCode.CM_DB_QUERY_ERR); } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + + return new DetailNumberResDto(ApiResponseCode.SUCCESS, detailNumber); } /** @@ -141,32 +341,27 @@ public class SendNumMgtService { * auth : ckr * desc : 관리자ID 목록 조회 * @param paramMap - * @return + * @return */ - public ApiResponseMessage adminList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - data = new HashMap<>(); - data.put("adminId", "Test"); - data.put("bRegNo", "229-81-39938"); - dataList.add(data); - - data = new HashMap<>(); - data.put("adminId", "Test01"); - data.put("bRegNo", "229-81-55555"); - dataList.add(data); - - data = new HashMap<>(); - data.put("adminId", "Test02"); - data.put("bRegNo", "229-81-44444"); - dataList.add(data); - - dataObj.put("list", dataList); - result.setData(dataObj); - return result; + public SendAdminListResDto adminList(SendAdminListReqDto adminListReqDto) { + SendNumMgtMapper sendNumMgtMapper = sqlSessionSlave.getMapper(SendNumMgtMapper.class); + int totalCnt = sendNumMgtMapper.selectAdminTotalCnt(adminListReqDto); + + if(totalCnt == 0) { + SendAdminListRes adminListRes = new SendAdminListRes(); + adminListRes.setList(new ArrayList<>()); + return new SendAdminListResDto(ApiResponseCode.CM_NOT_FOUND, adminListRes); + } + + List adminInfos = sendNumMgtMapper.selectAdminList(adminListReqDto); + + Paging paging = new Paging(); + paging.setTotalCnt(String.valueOf(totalCnt)); + + SendAdminListRes adminListRes = new SendAdminListRes(); + adminListRes.setList(adminInfos); + + return new SendAdminListResDto(ApiResponseCode.SUCCESS, adminListRes); } /** @@ -174,7 +369,7 @@ public class SendNumMgtService { * auth : ckr * desc : 발신번호 승인 목록 조회 * @param paramMap - * @return + * @return */ public ApiResponseMessage apprList(Map paramMap) { ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); @@ -184,10 +379,10 @@ public class SendNumMgtService { data.put("totalCnt","999"); data.put("currentPage","1"); dataObj.put("paging", data); - + for(int i=0; i<10; i++) { - data = new HashMap<>(); - data.put("no", ""+(i+1)); + data = new HashMap<>(); + data.put("no", ""+(i+1)); data.put("reqApprDt", "2022-03-03"); data.put("adminId", "Uplus01"); data.put("register", "Uplus01"); @@ -197,12 +392,12 @@ public class SendNumMgtService { data.put("returnCnt", "1"); data.put("apprStat", "처리완료"); data.put("apprDt", "2022-03-03"); - - dataList.add(data); + + dataList.add(data); } dataObj.put("list", dataList); result.setData(dataObj); - + return result; } @@ -211,7 +406,7 @@ public class SendNumMgtService { * auth : ckr * desc : 발신번호 승인 상세 정보 조회 * @param paramMap - * @return + * @return */ public ApiResponseMessage apprDetail(Map paramMap) { ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); @@ -226,29 +421,29 @@ public class SendNumMgtService { dataObj.put("returnReason", "반려내용 - 사용거부 번호"); dataObj.put("authSendNumNms", "통신서비스 가입증명원.jpg"); dataObj.put("authBsnsNms", "인감증명서.jpg,사업자등록증.jpg"); - - data = new HashMap<>(); - data.put("no", "1"); + + data = new HashMap<>(); + data.put("no", "1"); data.put("sendNum", "02-1234-5678"); - data.put("apprStat", "반려"); + data.put("apprStat", "반려"); dataList.add(data); - - data = new HashMap<>(); - data.put("no", "2"); + + data = new HashMap<>(); + data.put("no", "2"); data.put("sendNum", "070-1234-5678"); - data.put("apprStat", "승인"); + data.put("apprStat", "승인"); dataList.add(data); - - data = new HashMap<>(); - data.put("no", "3"); + + data = new HashMap<>(); + data.put("no", "3"); data.put("sendNum", "1588-1677"); - data.put("apprStat", "승인"); + data.put("apprStat", "승인"); dataList.add(data); - - dataObj.put("list", dataList); - + + dataObj.put("list", dataList); + result.setData(dataObj); - + return result; } @@ -257,7 +452,7 @@ public class SendNumMgtService { * auth : ckr * desc : 발송내역 목록 조회 * @param paramMap - * @return + * @return */ public ApiResponseMessage insertAppr(Map paramMap) { ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileInfo.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileInfo.java new file mode 100644 index 0000000..9314843 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileInfo.java @@ -0,0 +1,27 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class AuthFileInfo implements Serializable{ + + + @ApiModelProperty(example = "서류 유형 코드", name = "서류 유형 코드", dataType = "String") + private String docTpCd; + + @ApiModelProperty(example = "서류 제목", name = "서류 제목", dataType = "String") + private String docTitle; + + @ApiModelProperty(example = "파일 명", name = "파일 명", dataType = "String") + private String fileNm; + + @ApiModelProperty(example = "파일 경로", name = "파일 경로", dataType = "String") + private String filePath; + + @ApiModelProperty(example = "파일 크기", name = "파일 크기", dataType = "String") + private String fileSize; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileList.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileList.java new file mode 100644 index 0000000..20e162b --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/AuthFileList.java @@ -0,0 +1,12 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class AuthFileList implements Serializable{ + List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumber.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumber.java new file mode 100644 index 0000000..5eb4e3d --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumber.java @@ -0,0 +1,17 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DeleteNumber implements Serializable{ + + @ApiModelProperty(example = "등록번호", name = "등록번호", dataType = "String") + private String regNo; + + @ApiModelProperty(example = "관리자 ID", name = "관리자 ID", dataType = "String") + private String adminId; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberReqDto.java new file mode 100644 index 0000000..c9b7044 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberReqDto.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DeleteNumberReqDto implements Serializable{ + + @ApiModelProperty(example = "등록번호 리스트", name = "등록번호 리스트", dataType = "String") + private List list; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberResDto.java new file mode 100644 index 0000000..4d30c6a --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumberResDto.java @@ -0,0 +1,32 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DeleteNumberResDto extends ResponseMessage implements Serializable{ + + + // 데이터. + private Object data; + + public DeleteNumberResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public DeleteNumberResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public DeleteNumberResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumber.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumber.java new file mode 100644 index 0000000..41af45c --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumber.java @@ -0,0 +1,29 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DetailNumber implements Serializable{ + + @ApiModelProperty(example = "관리자 ID", name = "관리자 ID", dataType = "String") + private String adminId; + @ApiModelProperty(example = "고객사명(이름)", name = "고객사명(이름)", dataType = "String") + private String custNm; + @ApiModelProperty(example = "사업자번호(생년월일)", name = "사업자번호(생년월일)", dataType = "String") + private String bRegNo; + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String regNo; + @ApiModelProperty(example = "명의자 구분", name = "명의자 구분", dataType = "String") + private String nmineeDivCd; + + private List list; + + + @ApiModelProperty(example = "등록요청번호", name = "등록요청번호", dataType = "String", hidden=true) + private String regRegNo; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberReqDto.java new file mode 100644 index 0000000..ef0d5ab --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberReqDto.java @@ -0,0 +1,18 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DetailNumberReqDto implements Serializable{ + + @ApiModelProperty(example = "등록번호", name = "등록번호", dataType = "String") + private String regNo; + + @ApiModelProperty(example = "관리자 ID", name = "관리자 ID", dataType = "String") + private String adminId; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberResDto.java new file mode 100644 index 0000000..281faab --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberResDto.java @@ -0,0 +1,30 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class DetailNumberResDto extends ResponseMessage implements Serializable{ + // 데이터. + private DetailNumber data; + + public DetailNumberResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public DetailNumberResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public DetailNumberResDto(ApiResponseCode returnStr, DetailNumber data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumber.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumber.java new file mode 100644 index 0000000..8e1fe11 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumber.java @@ -0,0 +1,32 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class InsertNumber implements Serializable{ + + @ApiModelProperty(example = "발신번호 명", name = "발신번호 명", dataType = "String") + private String sendNm; + + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String sendNum; + + @ApiModelProperty(example = "고객일련번호", name = "고객일련번호", dataType = "String", hidden=true) + private String custSeq; + + @ApiModelProperty(example = "등록요청번호", name = "등록요청번호", dataType = "String", hidden=true) + private String regReqNo; + + @ApiModelProperty(example = "명의자구분코드", name = "명의자구분코드", dataType = "String", hidden=true) + private String nmineeDivCd; + + @ApiModelProperty(example = "인앱채널구분코드", name = "인앱채널구분코드", dataType = "String", hidden=true) + private String inchDivCd; + + @ApiModelProperty(example = "등록 ID", name = "등록 ID", dataType = "String", hidden=true) + private String regId; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberFile.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberFile.java new file mode 100644 index 0000000..188e391 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberFile.java @@ -0,0 +1,18 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class InsertNumberFile implements Serializable{ + private String regReqNo; + private String docNo; + private String docTpCd; + private String docTitle; + private String fileNm; + private String filePath; + private long fileSize; + private String regId; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberReqDto.java new file mode 100644 index 0000000..b54a93e --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberReqDto.java @@ -0,0 +1,53 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import javax.validation.constraints.NotNull; + +import org.springframework.web.multipart.MultipartFile; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class InsertNumberReqDto implements Serializable{ + + @ApiModelProperty(example = "관리자 ID", name = "관리자 ID", dataType = "String") + private String adminId; + + @ApiModelProperty(example = "고객사명(이름)", name = "고객사명(이름)", dataType = "String") + private String custNm; + + @ApiModelProperty(example = "사업자번호(생년월일)", name = "사업자번호(생년월일)", dataType = "String") + private String bRegNo; + + private List list; + + @ApiModelProperty(example = "발신번호 인증 파일", name = "발신번호 인증 파일", dataType = "String") + private List authSendNum; + + @ApiModelProperty(example = "사업자 인증 파일", name = "사업자 인증 파일", dataType = "String") + private List authBsns; + + @ApiModelProperty(example = "명의자 구분 코드", name = "명의자 구분 코드", dataType = "String") + private String nmineeDivCd; + + @ApiModelProperty(example = "인입채널 구분 코드", name = "인입채널 구분 코드", dataType = "String") + private String inchDivCd; + + @NotNull + @ApiModelProperty(example = "등록 ID", name = "등록 ID", dataType = "String", hidden=true) + private String regId; + + @ApiModelProperty(example = "이용자 일련번호", name = "이용자 일련번호", dataType = "String", hidden=true) + private String userSeq; + + @ApiModelProperty(example = "등록요청번호", name = "등록요청번호", dataType = "String", hidden=true) + private String regReqNo; + + @ApiModelProperty(example = "요청건수", name = "요청건수", dataType = "String", hidden=true) + private int reqCnt; +} + diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberResDto.java new file mode 100644 index 0000000..618cbdf --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/InsertNumberResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class InsertNumberResDto extends ResponseMessage implements Serializable{ + + // 데이터. + private Object data; + + public InsertNumberResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public InsertNumberResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public InsertNumberResDto(ApiResponseCode returnStr, Object data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileInfo.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileInfo.java new file mode 100644 index 0000000..b4fc65b --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileInfo.java @@ -0,0 +1,27 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class ProfileInfo implements Serializable { + + @ApiModelProperty(example = "리스트번호", name = "리스트번호", dataType = "String") + private String no; + @ApiModelProperty(example = "고객사명", name = "고객사명", dataType = "String") + private String custNm; + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bRegNo; + @ApiModelProperty(example = "발신프로필", name = "발신프로필", dataType = "String") + private String sendProfile; + @ApiModelProperty(example = "발신프로필 Key", name = "발신프로필 Key", dataType = "String") + private String sendProfileKey; + @ApiModelProperty(example = "상태", name = "상태", notes = "사용/휴면/삭제", dataType = "String") + private String stat; + @ApiModelProperty(example = "등록일", name = "등록일", notes = "YYYY-MM-DD", dataType = "String") + private String regDt; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListReqDto.java new file mode 100644 index 0000000..1fb0582 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListReqDto.java @@ -0,0 +1,29 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import javax.validation.constraints.NotNull; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class ProfileListReqDto implements Serializable { + + @ApiModelProperty(example = "상태", name = "상태", notes = "항목 : 전체(Default)/사용/미사용/휴면/삭제", dataType = "String") + private String searchType1; + @ApiModelProperty(example = "상세검색", name = "상세검색", notes = "항목 : 고객사명/사업자번호(생년월일)/발신프로필", dataType = "String") + private String searchType2; + @ApiModelProperty(example = "검색어(입력)", name = "검색어(입력)", notes = "검색어(입력항목)", dataType = "String") + private String searchText1; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수",notes = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "int") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListRes.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListRes.java new file mode 100644 index 0000000..ca11c23 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListRes.java @@ -0,0 +1,15 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class ProfileListRes implements Serializable{ + + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListResDto.java new file mode 100644 index 0000000..1c59516 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/ProfileListResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class ProfileListResDto extends ResponseMessage implements Serializable{ + + // 데이터. + private ProfileListRes data; + + public ProfileListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public ProfileListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public ProfileListResDto(ApiResponseCode returnStr, ProfileListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminInfo.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminInfo.java new file mode 100644 index 0000000..aa787c5 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminInfo.java @@ -0,0 +1,20 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendAdminInfo implements Serializable{ + + @ApiModelProperty(example = "관리자ID", name = "관리자ID", dataType = "String") + private String adminId; + + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bRegNo; + + @ApiModelProperty(example = "고객사명", name = "고객사명", dataType = "String") + private String custNm; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListReqDto.java new file mode 100644 index 0000000..89cab7d --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListReqDto.java @@ -0,0 +1,14 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendAdminListReqDto implements Serializable{ + + @ApiModelProperty(example = "검색어", name = "검색어", dataType = "String") + private String searchText1; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListRes.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListRes.java new file mode 100644 index 0000000..80d4e8a --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListRes.java @@ -0,0 +1,13 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendAdminListRes implements Serializable{ + + List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListResDto.java new file mode 100644 index 0000000..fc0c2e9 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendAdminListResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendAdminListResDto extends ResponseMessage implements Serializable{ + + // 데이터. + private SendAdminListRes data; + + public SendAdminListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendAdminListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendAdminListResDto(ApiResponseCode returnStr, SendAdminListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumber.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumber.java new file mode 100644 index 0000000..1e01d0b --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumber.java @@ -0,0 +1,16 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendNumber implements Serializable{ + + @ApiModelProperty(example = "발신번호명", name = "발신번호명", dataType = "String") + private String sendNm; + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String sendNum; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberInfo.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberInfo.java new file mode 100644 index 0000000..4b74eff --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberInfo.java @@ -0,0 +1,35 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendNumberInfo implements Serializable{ + + @ApiModelProperty(example = "리스트번호", name = "리스트번호", dataType = "String") + private String no; + @ApiModelProperty(example = "고객사명", name = "고객사명", notes = "고객사명( 개인: 이름)", dataType = "String") + private String custNm; + @ApiModelProperty(example = "관리자ID", name = "관리자ID", dataType = "String") + private String adminId; + @ApiModelProperty(example = "등록자ID", name = "등록자ID", dataType = "String") + private String register; + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bRegNo; + @ApiModelProperty(example = "명의자 구분", name = "명의자 구분", dataType = "String") + private String nmineeDivCd; + @ApiModelProperty(example = "인앱채널 구분", name = "인앱채널 구분", dataType = "String") + private String inchDivCd; + @ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String") + private String regNo; + @ApiModelProperty(example = "승인상태", name = "승인상태", notes = "항목 : 01:승인대기/02:승인완료/03:반려", dataType = "String") + private String sttusCd; + @ApiModelProperty(example = "등록방법", name = "등록방법", notes = "항목 : 01:본인인증, 02:서류심사", dataType = "String") + private String regTpCd; + @ApiModelProperty(example = "등록일", name = "등록일", notes = "YYYY-MM-DD", dataType = "String") + private String regDt; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListReqDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListReqDto.java new file mode 100644 index 0000000..f1da821 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListReqDto.java @@ -0,0 +1,34 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import javax.validation.constraints.NotNull; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendNumberListReqDto implements Serializable{ + + + @ApiModelProperty(example = "승인상태", name = "승인상태", notes = "항목 : 전체(Defalut)/승인대기/승인완료/반려", dataType = "String") + private String searchType1; + @ApiModelProperty(example = "명의자 구분", name = "명의자 구분", notes = "항목 : 전체/사업자(본인, 대표, 임직원)/타사업자", dataType = "String") + private String searchType2; + @ApiModelProperty(example = "인입채널 구분", name = "인입채널 구분", notes = "항목 : 전체/홈페이지/어드민", dataType = "String") + private String searchType3; + @ApiModelProperty(example = "상세검색", name = "상세검색", notes = "항목 : 사업자번호(생년월일), 발신번호, 고객사명(이름)", dataType = "String") + private String searchType4; + @ApiModelProperty(example = "검색어(입력)", name = "검색어(입력)", notes = "검색어(입력항목)", dataType = "String") + private String searchText1; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수",notes = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "int") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListRes.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListRes.java new file mode 100644 index 0000000..0782e49 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListRes.java @@ -0,0 +1,14 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; +import java.util.List; + +import kr.co.uplus.ez.common.data.Paging; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendNumberListRes implements Serializable{ + private Paging paging; + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListResDto.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListResDto.java new file mode 100644 index 0000000..d9592ca --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberListResDto.java @@ -0,0 +1,31 @@ +package kr.co.uplus.ez.api.sendNumMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +@SuppressWarnings("serial") +@Data +public class SendNumberListResDto extends ResponseMessage implements Serializable{ + + // 데이터. + private SendNumberListRes data; + + public SendNumberListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SendNumberListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public SendNumberListResDto(ApiResponseCode returnStr, SendNumberListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } +} diff --git a/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtController.java b/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtController.java index 6d4164c..7066a4f 100644 --- a/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtController.java @@ -5,19 +5,6 @@ */ package kr.co.uplus.ez.api.servMgt; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; @@ -25,6 +12,12 @@ import kr.co.uplus.ez.api.servMgt.dto.RejectRecvListReqDto; import kr.co.uplus.ez.api.servMgt.dto.RejectRecvListResDto; import kr.co.uplus.ez.common.components.ValidComponents; import kr.co.uplus.ez.common.data.ApiResponseCode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; @RestController @@ -41,15 +34,15 @@ public class ServMgtController { * date : 2022. 4. 25. * auth : ckr * desc : 080수신거부 목록 조회 - * @param paramMap + * @param rejectRecvListReqDto * @return - * @throws Exception + * @ */ @ApiOperation(value = "rejectRecvList", notes = "080수신거부 목록 조회") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "rejectRecvList", method = { RequestMethod.POST }) @ResponseBody - public RejectRecvListResDto rejectRecvList(@RequestBody @Valid RejectRecvListReqDto rejectRecvListReqDto, BindingResult bindingResult) throws Exception{ + public RejectRecvListResDto rejectRecvList(@RequestBody @Valid RejectRecvListReqDto rejectRecvListReqDto, BindingResult bindingResult) { if (validComponents.validParameter(bindingResult)) { return new RejectRecvListResDto(ApiResponseCode.CM_PARAMETER_ERROR); diff --git a/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtService.java b/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtService.java index 9c78824..a07084d 100644 --- a/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/servMgt/ServMgtService.java @@ -1,23 +1,20 @@ package kr.co.uplus.ez.api.servMgt; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.mybatis.spring.SqlSessionTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - import kr.co.uplus.ez.api.servMgt.dto.RejectRecvInfo; import kr.co.uplus.ez.api.servMgt.dto.RejectRecvListReqDto; import kr.co.uplus.ez.api.servMgt.dto.RejectRecvListRes; import kr.co.uplus.ez.api.servMgt.dto.RejectRecvListResDto; import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.Paging; +import org.mybatis.spring.SqlSessionTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; @Service public class ServMgtService { @@ -37,7 +34,7 @@ public class ServMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 080수신거부 목록 조회 - * @param paramMap + * @param rejectRecvListReqDto * @return */ public RejectRecvListResDto rejectRecvList(RejectRecvListReqDto rejectRecvListReqDto) { diff --git a/src/main/java/kr/co/uplus/ez/api/stats/StatsController.java b/src/main/java/kr/co/uplus/ez/api/stats/StatsController.java index d624c33..e007979 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/StatsController.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/StatsController.java @@ -1,130 +1,174 @@ /** * date : 2022. 4. 25. * auth : ckr - * desc : 발송 통계 + * desc : 발송 통계 */ package kr.co.uplus.ez.api.stats; import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import kr.co.uplus.ez.api.stats.dto.BsnmDayListReqDto; +import kr.co.uplus.ez.api.stats.dto.BsnmDayListResDto; +import kr.co.uplus.ez.api.stats.dto.BsnmMonthListReqDto; +import kr.co.uplus.ez.api.stats.dto.BsnmMonthListResDto; +import kr.co.uplus.ez.api.stats.dto.DayListReqDto; +import kr.co.uplus.ez.api.stats.dto.DayListResDto; +import kr.co.uplus.ez.api.stats.dto.MonthListReqDto; +import kr.co.uplus.ez.api.stats.dto.MonthListResDto; +import kr.co.uplus.ez.common.components.ValidComponents; +import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.ApiResponseMessage; @RestController @RequestMapping(value = "api/v1/bo/stats") public class StatsController { - + @Autowired StatsService statsService; - + + @Autowired + ValidComponents validComponents; + /** * date : 2022. 4. 25. * auth : ckr * desc : 월별 통계 목록 조회 - * @param paramMap - * @throws Exception + * @param monthListReqDto + * @ */ + @ApiOperation(value = "monthList", notes = "월별 통계 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/monthList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage monthList(@RequestBody Map paramMap) throws Exception{ - return statsService.monthList(paramMap); + public MonthListResDto monthList(@RequestBody @Valid MonthListReqDto monthListReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new MonthListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return statsService.monthList(monthListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 월별 통계 목록 엑셀 다운로드 * @param paramMap - * @throws Exception + * @ */ + @Deprecated @RequestMapping(value = "/monthListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage monthListExcel(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage monthListExcel(@RequestBody Map paramMap) { return statsService.monthListExcel(paramMap); } - + /** * date : 2022. 4. 25. * auth : ckr - * desc : 일별 통계 목록 조회 - * @param paramMap - * @throws Exception + * desc : 일별 통계 목록 조회 + * @param dayListReqDto + * @ */ + @ApiOperation(value = "dayList", notes = "일별 통계 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/dayList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage dayList(@RequestBody Map paramMap) throws Exception{ - return statsService.dayList(paramMap); + public DayListResDto dayList(@RequestBody @Valid DayListReqDto dayListReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new DayListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return statsService.dayList(dayListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 일별 통계 목록 엑셀 다운로드 * @param paramMap - * @throws Exception + * @ */ + @Deprecated @RequestMapping(value = "/dayListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage dayListExcel(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage dayListExcel(@RequestBody Map paramMap) { return statsService.dayListExcel(paramMap); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 사업자 월별 통계 목록 조회 - * @param paramMap - * @throws Exception + * @param bsnmMonthListReqDto + * @ */ + @ApiOperation(value = "bsnmMonthList", notes = "사업자 월별 통계 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/bsnmMonthList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage bsnmMonthList(@RequestBody Map paramMap) throws Exception{ - return statsService.bsnmMonthList(paramMap); + public BsnmMonthListResDto bsnmMonthList(@RequestBody @Valid BsnmMonthListReqDto bsnmMonthListReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new BsnmMonthListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return statsService.bsnmMonthList(bsnmMonthListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 사업자 월별 통계 목록 엑셀 다운로드 * @param paramMap - * @throws Exception + * @ */ + @Deprecated @RequestMapping(value = "/bsnmMonthListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage bsnmMonthListExcel(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage bsnmMonthListExcel(@RequestBody Map paramMap) { return statsService.bsnmMonthListExcel(paramMap); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 사업자 일별 통계 목록 조회 - * @param paramMap - * @throws Exception + * @param bsnmDayListReqDto + * @ */ + @ApiOperation(value = "bsnmDayList", notes = "사업자 일별 통계 목록 조회") + @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "/bsnmDayList" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage bsnmDayList(@RequestBody Map paramMap) throws Exception{ - return statsService.bsnmDayList(paramMap); + public BsnmDayListResDto bsnmDayList(@RequestBody @Valid BsnmDayListReqDto bsnmDayListReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { + return new BsnmDayListResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + return statsService.bsnmDayList(bsnmDayListReqDto); } - + /** * date : 2022. 4. 25. * auth : ckr * desc : 사업자 일별 통계 목록 엑셀 다운로드 * @param paramMap - * @throws Exception + * @ */ + @Deprecated @RequestMapping(value = "/bsnmDayListExcel" , method = {RequestMethod.POST}) @ResponseBody - public ApiResponseMessage bsnmDayListExcel(@RequestBody Map paramMap) throws Exception{ + public ApiResponseMessage bsnmDayListExcel(@RequestBody Map paramMap) { return statsService.bsnmDayListExcel(paramMap); } - + } diff --git a/src/main/java/kr/co/uplus/ez/api/stats/StatsMapper.java b/src/main/java/kr/co/uplus/ez/api/stats/StatsMapper.java index 2386b76..8a65a3d 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/StatsMapper.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/StatsMapper.java @@ -1,8 +1,18 @@ package kr.co.uplus.ez.api.stats; +import kr.co.uplus.ez.api.stats.dto.*; import org.apache.ibatis.annotations.Mapper; -@Mapper -public class StatsMapper { +import java.util.List; +@Mapper +public interface StatsMapper { + + List selectMonStatList(MonthListReqDto monthListReqDto); + + List selectDayStatList(DayListReqDto dayListReqDto); + + List selectCustMstatList(BsnmMonthListReqDto bsnmMonthListReqDto); + + List selectCustDstatList(BsnmDayListReqDto bsnmDayListReqDto); } diff --git a/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java b/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java index 6f359cb..18833a7 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java @@ -1,51 +1,45 @@ package kr.co.uplus.ez.api.stats; +import kr.co.uplus.ez.api.stats.dto.*; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ApiResponseMessage; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -import kr.co.uplus.ez.common.data.ApiResponseCode; -import kr.co.uplus.ez.common.data.ApiResponseMessage; - @Service public class StatsService { + @Autowired + @Qualifier("sqlSessionTemplateDb1") + private SqlSessionTemplate sqlSessionMaster; + + @Autowired + @Qualifier("sqlSessionTemplateDb2") + private SqlSessionTemplate sqlSessionSlave; + /** * date : 2022. 4. 25. * auth : ckr * desc : 월별 통계 목록 조회 - * @param paramMap + * @param monthListReqDto * @return */ - public ApiResponseMessage monthList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - for(int i=1; i<=4; i++) { - data = new HashMap<>(); - data.put("date", "2022-0"+i); - data.put("allSendCnt", "40000000"); - data.put("allSuccesCnt", "40000000(100%)"); - data.put("smsSendCnt", "10000000"); - data.put("smsSuccesCnt", "10000000(100%)"); - data.put("lmsSendCnt", "10000000"); - data.put("lmsSuccesCnt", "10000000(100%)"); - data.put("mmsSendCnt", "10000000"); - data.put("mmsSuccesCnt", "10000000(100%)"); - data.put("notiTalkSendCnt", "10000000"); - data.put("notiTalkSuccesCnt", "10000000(100%)"); - - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + public MonthListResDto monthList(MonthListReqDto monthListReqDto) { + StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); + + List monthLists = statsMapper.selectMonStatList(monthListReqDto); + + MonthListRes monthListRes = new MonthListRes(); + monthListRes.setList(monthLists); + + return new MonthListResDto(ApiResponseCode.SUCCESS, monthListRes); } /** @@ -87,35 +81,18 @@ public class StatsService { * date : 2022. 4. 25. * auth : ckr * desc : 일별 통계 목록 조회 - * @param paramMap + * @param dayListReqDto * @return */ - public ApiResponseMessage dayList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - for(int i=1; i<=4; i++) { - data = new HashMap<>(); - data.put("date", "2022-03-0"+i); - data.put("allSendCnt", "40000000"); - data.put("allSuccesCnt", "40000000(100%)"); - data.put("smsSendCnt", "10000000"); - data.put("smsSuccesCnt", "10000000(100%)"); - data.put("lmsSendCnt", "10000000"); - data.put("lmsSuccesCnt", "10000000(100%)"); - data.put("mmsSendCnt", "10000000"); - data.put("mmsSuccesCnt", "10000000(100%)"); - data.put("notiTalkSendCnt", "10000000"); - data.put("notiTalkSuccesCnt", "10000000(100%)"); - - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + public DayListResDto dayList(DayListReqDto dayListReqDto) { + StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); + + List dayLists = statsMapper.selectDayStatList(dayListReqDto); + + DayListRes dayListRes = new DayListRes(); + dayListRes.setList(dayLists); + + return new DayListResDto(ApiResponseCode.SUCCESS, dayListRes); } /** @@ -157,37 +134,19 @@ public class StatsService { * date : 2022. 4. 25. * auth : ckr * desc : 사업자 월별 통계 목록 조회 - * @param paramMap + * @param bsnmMonthListReqDto * @return */ - public ApiResponseMessage bsnmMonthList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - for(int i=1; i<=4; i++) { - data = new HashMap<>(); - data.put("date", "2022-0"+i); - data.put("custNm", "유플러스"); - data.put("bRegNo", "사업자번호"); - data.put("allSendCnt", "40000000"); - data.put("allSuccesCnt", "40000000(100%)"); - data.put("smsSendCnt", "10000000"); - data.put("smsSuccesCnt", "10000000(100%)"); - data.put("lmsSendCnt", "10000000"); - data.put("lmsSuccesCnt", "10000000(100%)"); - data.put("mmsSendCnt", "10000000"); - data.put("mmsSuccesCnt", "10000000(100%)"); - data.put("notiTalkSendCnt", "10000000"); - data.put("notiTalkSuccesCnt", "10000000(100%)"); - - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + public BsnmMonthListResDto bsnmMonthList(BsnmMonthListReqDto bsnmMonthListReqDto) { + + StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); + + List bsnmMonthLists = statsMapper.selectCustMstatList(bsnmMonthListReqDto); + + BsnmMonthListRes bsnmMonthListRes = new BsnmMonthListRes(); + bsnmMonthListRes.setList(bsnmMonthLists); + + return new BsnmMonthListResDto(ApiResponseCode.SUCCESS, bsnmMonthListRes); } /** @@ -231,37 +190,18 @@ public class StatsService { * date : 2022. 4. 25. * auth : ckr * desc : 사업자 일별 통계 목록 조회 - * @param paramMap + * @param bsnmDayListReqDto * @return */ - public ApiResponseMessage bsnmDayList(Map paramMap) { - ApiResponseMessage result = new ApiResponseMessage(ApiResponseCode.SUCCESS); - Map dataObj = new HashMap<>(); - List> dataList = new ArrayList<>(); - Map data = new HashMap<>(); - - for(int i=1; i<=9; i++) { - data = new HashMap<>(); - data.put("date", "2022-03-0"+i); - data.put("custNm", "유플러스"); - data.put("bRegNo", "사업자번호"); - data.put("allSendCnt", "40000000"); - data.put("allSuccesCnt", "40000000(100%)"); - data.put("smsSendCnt", "10000000"); - data.put("smsSuccesCnt", "10000000(100%)"); - data.put("lmsSendCnt", "10000000"); - data.put("lmsSuccesCnt", "10000000(100%)"); - data.put("mmsSendCnt", "10000000"); - data.put("mmsSuccesCnt", "10000000(100%)"); - data.put("notiTalkSendCnt", "10000000"); - data.put("notiTalkSuccesCnt", "10000000(100%)"); - - dataList.add(data); - } - dataObj.put("list", dataList); - result.setData(dataObj); - - return result; + public BsnmDayListResDto bsnmDayList(BsnmDayListReqDto bsnmDayListReqDto) { + StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); + + List bsnmDayLists = statsMapper.selectCustDstatList(bsnmDayListReqDto); + + BsnmDayListRes bsnmDayListRes = new BsnmDayListRes(); + bsnmDayListRes.setList(bsnmDayLists); + + return new BsnmDayListResDto(ApiResponseCode.SUCCESS, bsnmDayListRes); } /** diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayList.java new file mode 100644 index 0000000..d98cdc2 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayList.java @@ -0,0 +1,44 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmDayList implements Serializable { + + @ApiModelProperty(example = "날짜", name = "날짜", dataType = "String") + private String sumYmd; + @ApiModelProperty(example = "전체 발송건수", name = "전체 발송건수", dataType = "String") + private String sndCnt; + @ApiModelProperty(example = "전체 성공건수", name = "전체 성공건수", dataType = "String") + private String succCnt; + @ApiModelProperty(example = "전체 성공율", name = "전체 성공율", dataType = "String") + private String succRt; + @ApiModelProperty(example = "SMS 발송건수", name = "SMS 발송건수", dataType = "String") + private String sndCntS; + @ApiModelProperty(example = "SMS 성공건수", name = "SMS 성공건수", dataType = "String") + private String succCntS; + @ApiModelProperty(example = "SMS 성공율", name = "SMS 성공율", dataType = "String") + private String succRtS; + @ApiModelProperty(example = "LMS 발송건수", name = "LMS 발송건수", dataType = "String") + private String sndCntL; + @ApiModelProperty(example = "LMS 성공건수", name = "LMS 성공건수", dataType = "String") + private String succCntL; + @ApiModelProperty(example = "LMS 성공율", name = "LMS 성공율", dataType = "String") + private String succRtL; + @ApiModelProperty(example = "MMS 발송건수", name = "MMS 발송건수", dataType = "String") + private String sndCntM; + @ApiModelProperty(example = "MMS 성공건수", name = "MMS 성공건수", dataType = "String") + private String succCntM; + @ApiModelProperty(example = "MMS 성공율", name = "MMS 성공율", dataType = "String") + private String succRtM; + @ApiModelProperty(example = "알림톡 발송건수", name = "알림톡 발송건수", dataType = "String") + private String sndCntR; + @ApiModelProperty(example = "알림톡 성공건수", name = "알림톡 성공건수", dataType = "String") + private String succCntR; + @ApiModelProperty(example = "알림톡 성공율", name = "알림톡 성공율", dataType = "String") + private String succRtR; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListReqDto.java new file mode 100644 index 0000000..7a5ccc7 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListReqDto.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmDayListReqDto implements Serializable { + + @ApiModelProperty(example = "조회시작월", name = "조회시작월", dataType = "String") + private String startMon; + @ApiModelProperty(example = "조회종료월", name = "조회종료월",dataType = "String") + private String endMon; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListRes.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListRes.java new file mode 100644 index 0000000..c849a9f --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListRes.java @@ -0,0 +1,13 @@ +package kr.co.uplus.ez.api.stats.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class BsnmDayListRes implements Serializable{ + + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListResDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListResDto.java new file mode 100644 index 0000000..0ab196b --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmDayListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmDayListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private BsnmDayListRes data; + + public BsnmDayListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public BsnmDayListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public BsnmDayListResDto(ApiResponseCode returnStr, BsnmDayListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthList.java new file mode 100644 index 0000000..234804f --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthList.java @@ -0,0 +1,44 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmMonthList implements Serializable { + + @ApiModelProperty(example = "날짜", name = "날짜", dataType = "String") + private String sumYmd; + @ApiModelProperty(example = "전체 발송건수", name = "전체 발송건수", dataType = "String") + private String sndCnt; + @ApiModelProperty(example = "전체 성공건수", name = "전체 성공건수", dataType = "String") + private String succCnt; + @ApiModelProperty(example = "전체 성공율", name = "전체 성공율", dataType = "String") + private String succRt; + @ApiModelProperty(example = "SMS 발송건수", name = "SMS 발송건수", dataType = "String") + private String sndCntS; + @ApiModelProperty(example = "SMS 성공건수", name = "SMS 성공건수", dataType = "String") + private String succCntS; + @ApiModelProperty(example = "SMS 성공율", name = "SMS 성공율", dataType = "String") + private String succRtS; + @ApiModelProperty(example = "LMS 발송건수", name = "LMS 발송건수", dataType = "String") + private String sndCntL; + @ApiModelProperty(example = "LMS 성공건수", name = "LMS 성공건수", dataType = "String") + private String succCntL; + @ApiModelProperty(example = "LMS 성공율", name = "LMS 성공율", dataType = "String") + private String succRtL; + @ApiModelProperty(example = "MMS 발송건수", name = "MMS 발송건수", dataType = "String") + private String sndCntM; + @ApiModelProperty(example = "MMS 성공건수", name = "MMS 성공건수", dataType = "String") + private String succCntM; + @ApiModelProperty(example = "MMS 성공율", name = "MMS 성공율", dataType = "String") + private String succRtM; + @ApiModelProperty(example = "알림톡 발송건수", name = "알림톡 발송건수", dataType = "String") + private String sndCntR; + @ApiModelProperty(example = "알림톡 성공건수", name = "알림톡 성공건수", dataType = "String") + private String succCntR; + @ApiModelProperty(example = "알림톡 성공율", name = "알림톡 성공율", dataType = "String") + private String succRtR; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListReqDto.java new file mode 100644 index 0000000..f5b5bf2 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListReqDto.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmMonthListReqDto implements Serializable { + + @ApiModelProperty(example = "조회시작월", name = "조회시작월", dataType = "String") + private String startMon; + @ApiModelProperty(example = "조회종료월", name = "조회종료월",dataType = "String") + private String endMon; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListRes.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListRes.java new file mode 100644 index 0000000..989a064 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListRes.java @@ -0,0 +1,13 @@ +package kr.co.uplus.ez.api.stats.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class BsnmMonthListRes implements Serializable{ + + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListResDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListResDto.java new file mode 100644 index 0000000..5d1b2b9 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/BsnmMonthListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class BsnmMonthListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private BsnmMonthListRes data; + + public BsnmMonthListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public BsnmMonthListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public BsnmMonthListResDto(ApiResponseCode returnStr, BsnmMonthListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java new file mode 100644 index 0000000..077b57c --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java @@ -0,0 +1,44 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class DayList implements Serializable { + + @ApiModelProperty(example = "날짜", name = "날짜", dataType = "String") + private String sumYmd; + @ApiModelProperty(example = "전체 발송건수", name = "전체 발송건수", dataType = "String") + private String sndCnt; + @ApiModelProperty(example = "전체 성공건수", name = "전체 성공건수", dataType = "String") + private String succCnt; + @ApiModelProperty(example = "전체 성공율", name = "전체 성공율", dataType = "String") + private String succRt; + @ApiModelProperty(example = "SMS 발송건수", name = "SMS 발송건수", dataType = "String") + private String sndCntS; + @ApiModelProperty(example = "SMS 성공건수", name = "SMS 성공건수", dataType = "String") + private String succCntS; + @ApiModelProperty(example = "SMS 성공율", name = "SMS 성공율", dataType = "String") + private String succRtS; + @ApiModelProperty(example = "LMS 발송건수", name = "LMS 발송건수", dataType = "String") + private String sndCntL; + @ApiModelProperty(example = "LMS 성공건수", name = "LMS 성공건수", dataType = "String") + private String succCntL; + @ApiModelProperty(example = "LMS 성공율", name = "LMS 성공율", dataType = "String") + private String succRtL; + @ApiModelProperty(example = "MMS 발송건수", name = "MMS 발송건수", dataType = "String") + private String sndCntM; + @ApiModelProperty(example = "MMS 성공건수", name = "MMS 성공건수", dataType = "String") + private String succCntM; + @ApiModelProperty(example = "MMS 성공율", name = "MMS 성공율", dataType = "String") + private String succRtM; + @ApiModelProperty(example = "알림톡 발송건수", name = "알림톡 발송건수", dataType = "String") + private String sndCntR; + @ApiModelProperty(example = "알림톡 성공건수", name = "알림톡 성공건수", dataType = "String") + private String succCntR; + @ApiModelProperty(example = "알림톡 성공율", name = "알림톡 성공율", dataType = "String") + private String succRtR; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java new file mode 100644 index 0000000..8d266a0 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class DayListReqDto implements Serializable { + + @ApiModelProperty(example = "조회시작월", name = "조회시작월", dataType = "String") + private String startMon; + @ApiModelProperty(example = "조회종료월", name = "조회종료월",dataType = "String") + private String endMon; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListRes.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListRes.java new file mode 100644 index 0000000..fa18d19 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListRes.java @@ -0,0 +1,13 @@ +package kr.co.uplus.ez.api.stats.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class DayListRes implements Serializable{ + + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListResDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListResDto.java new file mode 100644 index 0000000..0946d84 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class DayListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private DayListRes data; + + public DayListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public DayListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public DayListResDto(ApiResponseCode returnStr, DayListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java new file mode 100644 index 0000000..c373d58 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java @@ -0,0 +1,44 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MonthList implements Serializable { + + @ApiModelProperty(example = "날짜", name = "날짜", dataType = "String") + private String sumYmd; + @ApiModelProperty(example = "전체 발송건수", name = "전체 발송건수", dataType = "String") + private String sndCnt; + @ApiModelProperty(example = "전체 성공건수", name = "전체 성공건수", dataType = "String") + private String succCnt; + @ApiModelProperty(example = "전체 성공율", name = "전체 성공율", dataType = "String") + private String succRt; + @ApiModelProperty(example = "SMS 발송건수", name = "SMS 발송건수", dataType = "String") + private String sndCntS; + @ApiModelProperty(example = "SMS 성공건수", name = "SMS 성공건수", dataType = "String") + private String succCntS; + @ApiModelProperty(example = "SMS 성공율", name = "SMS 성공율", dataType = "String") + private String succRtS; + @ApiModelProperty(example = "LMS 발송건수", name = "LMS 발송건수", dataType = "String") + private String sndCntL; + @ApiModelProperty(example = "LMS 성공건수", name = "LMS 성공건수", dataType = "String") + private String succCntL; + @ApiModelProperty(example = "LMS 성공율", name = "LMS 성공율", dataType = "String") + private String succRtL; + @ApiModelProperty(example = "MMS 발송건수", name = "MMS 발송건수", dataType = "String") + private String sndCntM; + @ApiModelProperty(example = "MMS 성공건수", name = "MMS 성공건수", dataType = "String") + private String succCntM; + @ApiModelProperty(example = "MMS 성공율", name = "MMS 성공율", dataType = "String") + private String succRtM; + @ApiModelProperty(example = "알림톡 발송건수", name = "알림톡 발송건수", dataType = "String") + private String sndCntR; + @ApiModelProperty(example = "알림톡 성공건수", name = "알림톡 성공건수", dataType = "String") + private String succCntR; + @ApiModelProperty(example = "알림톡 성공율", name = "알림톡 성공율", dataType = "String") + private String succRtR; +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java new file mode 100644 index 0000000..cebd3a5 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java @@ -0,0 +1,26 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MonthListReqDto implements Serializable { + + @ApiModelProperty(example = "조회시작월", name = "조회시작월", dataType = "String") + private String startMon; + @ApiModelProperty(example = "조회종료월", name = "조회종료월",dataType = "String") + private String endMon; + + @NotNull + @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") + private int pagePerRows; + + @NotNull + @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") + private int page; + +} \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListRes.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListRes.java new file mode 100644 index 0000000..f331444 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListRes.java @@ -0,0 +1,13 @@ +package kr.co.uplus.ez.api.stats.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@SuppressWarnings("serial") +@Data +public class MonthListRes implements Serializable{ + + private List list; +} diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListResDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListResDto.java new file mode 100644 index 0000000..ca2ef21 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListResDto.java @@ -0,0 +1,33 @@ +package kr.co.uplus.ez.api.stats.dto; + +import io.swagger.annotations.ApiModelProperty; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; +import lombok.Data; + +import java.io.Serializable; + +@SuppressWarnings("serial") +@Data +public class MonthListResDto extends ResponseMessage implements Serializable{ + + @ApiModelProperty(example = "데이터") + private MonthListRes data; + + public MonthListResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public MonthListResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + public MonthListResDto(ApiResponseCode returnStr, MonthListRes data) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + this.data = data; + } + +} diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java index ce3fa6e..262c5b4 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java @@ -5,49 +5,23 @@ */ package kr.co.uplus.ez.api.sysMgt; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import kr.co.uplus.ez.api.sysMgt.dto.*; +import kr.co.uplus.ez.common.components.ValidComponents; +import kr.co.uplus.ez.common.data.ApiResponseCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminListReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminListResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthDetailReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthDetailResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthListResDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAuthResDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAuthResDto; -import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangIdReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangIdResDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAuthResDto; -import kr.co.uplus.ez.common.components.ValidComponents; -import kr.co.uplus.ez.common.data.ApiResponseCode; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Map; /** * 시스템 관리 Controller. @@ -200,7 +174,7 @@ public class SysMgtController { /** * date : 2022. 4. 25. auth : ckr desc : 권한 삭제 * - * @param paramMap + * @param deleteAuthReqDto * @return @ */ @RequestMapping(value = "/deleteAuth", method = { RequestMethod.POST }) @@ -216,7 +190,7 @@ public class SysMgtController { /** * date : 2022. 4. 25. auth : ckr desc : 권한 상세 조회 * - * @param paramMap + * @param authDetailReqDto * @return @ */ @RequestMapping(value = "/authDetail", method = { RequestMethod.POST }) @@ -232,7 +206,7 @@ public class SysMgtController { /** * date : 2022. 4. 25. auth : ckr desc : 권한 추가 * - * @param paramMap + * @param insertAuthReqDto * @return @ */ @RequestMapping(value = "/insertAuth", method = { RequestMethod.POST }) @@ -253,7 +227,7 @@ public class SysMgtController { /** * date : 2022. 4. 25. auth : ckr desc : 권한 수정 * - * @param paramMap + * @param updateAuthReqDto * @return @ */ @RequestMapping(value = "/updateAuth", method = { RequestMethod.POST }) diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java index e7e2c11..e5c7d0c 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java @@ -1,10 +1,9 @@ package kr.co.uplus.ez.api.sysMgt; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import kr.co.uplus.ez.api.sysMgt.dto.*; +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.Paging; +import kr.co.uplus.ez.common.utils.EncryptionUtil; import org.apache.commons.lang3.StringUtils; import org.mybatis.spring.SqlSessionTemplate; import org.slf4j.Logger; @@ -12,43 +11,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import org.springframework.validation.BindingResult; -import org.springframework.validation.FieldError; -import org.springframework.validation.ObjectError; -import kr.co.uplus.ez.api.sysMgt.dto.AdminDetail; -import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminInfo; -import kr.co.uplus.ez.api.sysMgt.dto.AdminListReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AdminListRes; -import kr.co.uplus.ez.api.sysMgt.dto.AdminListResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthDetail; -import kr.co.uplus.ez.api.sysMgt.dto.AuthDetailReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthDetailResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthInfo; -import kr.co.uplus.ez.api.sysMgt.dto.AuthListRes; -import kr.co.uplus.ez.api.sysMgt.dto.AuthListResDto; -import kr.co.uplus.ez.api.sysMgt.dto.AuthMenu; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.DeleteAuthResDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.InsertAuthResDto; -import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangId; -import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangIdReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangIdResDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAdminReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAdminResDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAuthReqDto; -import kr.co.uplus.ez.api.sysMgt.dto.UpdateAuthResDto; -import kr.co.uplus.ez.common.data.ApiResponseCode; -import kr.co.uplus.ez.common.data.ApiResponseMessage; -import kr.co.uplus.ez.common.data.Paging; -import kr.co.uplus.ez.common.utils.EncryptionUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class SysMgtService { @@ -124,7 +91,6 @@ public class SysMgtService { } } catch (Exception e) { - // TODO: handle exception return new SearchMadangIdResDto(ApiResponseCode.CM_DB_QUERY_ERR); } @@ -208,7 +174,7 @@ public class SysMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 관리자 정보 상세 조회 - * @param paramMap + * @param adminDetailReqDto * @return */ public AdminDetailResDto adminDetail(AdminDetailReqDto adminDetailReqDto) { @@ -223,7 +189,6 @@ public class SysMgtService { return new AdminDetailResDto(ApiResponseCode.CM_NOT_FOUND); } } catch (Exception e) { - // TODO: handle exception return new AdminDetailResDto(ApiResponseCode.CM_DB_QUERY_ERR); } @@ -261,7 +226,7 @@ public class SysMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 권한 삭제 - * @param paramMap + * @param deleteAuthReqDto * @return */ public DeleteAuthResDto deleteAuth(DeleteAuthReqDto deleteAuthReqDto) { @@ -294,7 +259,7 @@ public class SysMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 권한 상세 조회 - * @param paramMap + * @param authDetailReqDto * @return */ public AuthDetailResDto authDetail(AuthDetailReqDto authDetailReqDto) { @@ -320,7 +285,6 @@ public class SysMgtService { } catch (Exception e) { - // TODO: handle exception return new AuthDetailResDto(ApiResponseCode.CM_DB_QUERY_ERR); } @@ -332,7 +296,7 @@ public class SysMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 권한 추가 - * @param paramMap + * @param insertAuthReqDto * @return */ public InsertAuthResDto insertAuth(InsertAuthReqDto insertAuthReqDto, String regId) { @@ -375,7 +339,6 @@ public class SysMgtService { } } catch (Exception e) { - // TODO: handle exception return new InsertAuthResDto(ApiResponseCode.CM_DB_QUERY_ERR); } return new InsertAuthResDto(ApiResponseCode.SUCCESS); @@ -385,7 +348,7 @@ public class SysMgtService { * date : 2022. 4. 25. * auth : ckr * desc : 권한 수정 - * @param paramMap + * @param updateAuthReqDto * @return */ public UpdateAuthResDto updateAuth(UpdateAuthReqDto updateAuthReqDto, String regId) { @@ -421,7 +384,6 @@ public class SysMgtService { } } catch (Exception e) { - // TODO: handle exception return new UpdateAuthResDto(ApiResponseCode.CM_DB_QUERY_ERR); } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index d5c5dd8..3db1e04 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -54,19 +54,13 @@ See here for more details: http://gordondickens.com/wordpress/2013/03/27/sawing- - + - - - - - - - + diff --git a/src/main/resources/mapper/mysql/attractMgt/attractMgt-mapper.xml b/src/main/resources/mapper/mysql/attractMgt/attractMgt-mapper.xml index d771f7b..8b2db32 100644 --- a/src/main/resources/mapper/mysql/attractMgt/attractMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/attractMgt/attractMgt-mapper.xml @@ -3,5 +3,130 @@ + + + + + + + + + AND DATE_FORMAT(esi.SUBS_DT, '%Y%m%d') BETWEEN #{subsStDt} AND #{subsEdDt} + + + AND esi.SUBS_STTUS_CD = #{subsSttusCd} + + + AND eci.CUST_TY_CD = #{custTyCd} + + + AND eiu.LOGIN_ID = #{loginId} + + + AND eig.NORG_NM = #{norgNm} + + + AND eci.CUST_NM = #{custNm} + + + AND esu.USER_NM = #{userNm} + + + AND eci.BIZRNO = #{bizrno} + + \ No newline at end of file diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml index 3c02366..269fdf0 100644 --- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml @@ -17,7 +17,7 @@ eci.CUST_SEQ = esi.CUST_SEQ AND esi.CUST_SEQ = esu.CUST_SEQ WHERE 1 = 1 - + + /* riskMgt-mapper.xml(selectSndrnoBlckTotalCnt) */ + SELECT + COUNT(*) AS TOTALCNT + FROM ${HUBEZ_COMMON}.EZ_SNDRNO_BLCK esb + WHERE 1 = 1 + + + + + + + + AND esb.BLCK_SNDRNO LIKE UPPER(CONCAT('%', #{regId}, '%')) + + + AND esb.SNDBLCK_TP_CD = #{sndblckTpCd} + + + AND esb.BLCK_YN = #{blckYn} + + + AND esb.BLCK_RSN_CD = #{blckRsnCd} + + + AND esb.BLCK_SNDRNO = #{blckSndrno} + + + + + + + /* riskMgt-mapper.xml(insertSndrnoBlck) */ + INSERT + INTO ${HUBEZ_COMMON}.EZ_SNDRNO_BLCK + (BLCK_SNDRNO + , SNDBLCK_TP_CD + , BLCK_RSN_CD + , MENO + , BLCK_YN + , REG_ID + , REG_DT + , CHG_ID + , CHG_DT + ) VALUES ( + #{blckSndrno} + , #{sndblckTpCd} + , #{blckRsnCd} + , #{meno} + , #{blckYn} + , #{regId} + , NOW() + , #{regId} + , NOW()) + + + + /* riskMgt-mapper.xml(updateSndrnoBlck) */ + UPDATE + ${HUBEZ_COMMON}.EZ_SNDRNO_BLCK + SET + CHG_ID = #{} + , CHG_DT = NOW() + + , SNDBLCK_TP_CD = #{sndblckTpCd} + + + , BLCK_RSN_CD = #{blckRsnCd} + + + , MENO = #{meno} + + + , BLCK_YN = #{blckYn} + + WHERE BLCK_SNDRNO = #{blckSndrno} + + + + /* riskMgt-mapper.xml(deleteSndrnoBlck) */ + DELETE + FROM + ${HUBEZ_COMMON}.EZ_SNDRNO_BLCK + WHERE + BLCK_SNDRNO = #{blckSndrno} + + + + + + + + + + AND UPPER(eci.CUST_NM) LIKE UPPER(CONCAT('%', #{custNm}, '%')) + + + AND er.AUTHCD_080 = #{authcd080} + + + AND er.RCVBLCKNO = #{rcvblckno} + + + + + + + + + + AND emb.REG_ID = #{regId} + + + AND emb.BLCK_RSN_CD = #{blckRsnCd} + + + AND UPPER(ebd.WORD) LIKE UPPER(CONCAT('%', #{word}, '%')) + + + + + + + + + /* riskMgt-mapper.xml(insertMsgBlckword) */ + INSERT + INTO ${HUBEZ_COMMON}.EZ_MSG_BLCKWORD ( + BLCK_CONT_CD + , BLCK_RSN_CD + , BLCK_YN + , MEMO + , REG_ID + , REG_DT + , CHG_ID + , CHG_DT + ) VALUES( + #{blckContCd} + , #{blckRsnCd} + , #{blckYn} + , #{memo} + , #{regId} + , NOW() + , #{regId} + , NOW()) + + + + /* riskMgt-mapper.xml(insertBlckwordDtl) */ + INSERT + INTO ${HUBEZ_COMMON}.EZ_BLCKWORD_DTL ( + SEQ_NO + , WORD + , REG_ID + , REG_DT + ) VALUES( + #{seqNo} + , #{word} + , #{regId} + , NOW()) + + + + /* riskMgt-mapper.xml(updateMsgBlckword) */ + UPDATE + ${HUBEZ_COMMON}.EZ_MSG_BLCKWORD + SET + CHG_ID = #{chgId} + , CHG_DT = NOW() + + , BLCK_CONT_CD = #{blckContCd} + + + , BLCK_RSN_CD = #{blckRsnCd} + + + , BLCK_YN = #{blckYn} + + + , MEMO = #{memo} + + WHERE + SEQ_NO = #{seqNo} + + + + /* riskMgt-mapper.xml(deleteMsgBlckword) */ + DELETE FROM + ${HUBEZ_COMMON}.EZ_MSG_BLCKWORD + WHERE + SEQ_NO = #{seqNo} + + + + /* riskMgt-mapper.xml(deleteBlckwordDtl) */ + DELETE FROM + ${HUBEZ_COMMON}.EZ_BLCKWORD_DTL + WHERE SEQ_NO = #{seqNo} + + + + + + + + + AND DATE_FORMAT(ewb.BLCK_DT, '%Y-%m-%d') = #{blckDt} + + + AND BLCK_RSN_CD = #{blckRsnCd} + + + AND BLCK_TP_CD = #{blckTpCd} + + + AND SNDRNO = #{sndrno} + + + + AND UPPER(CUST_NM) LIKE UPPER(CONCAT('%', #{searchText1}, '%')) + + + AND SNDRNO = #{searchText1} + + + AND USER_ID = #{searchText1} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml index fe91078..a091533 100644 --- a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml @@ -3,5 +3,354 @@ + + + + + + + + + AND MSGHB_STTUS_CD = 'A' + AND BLCK_YN = 'N' + AND DORM_YN = 'N' + + + AND MSGHB_STTUS_CD = 'A' + AND (BLCK_YN = 'Y' OR DORM_YN = 'Y') + + + AND MSGHB_STTUS_CD = 'D' + + + AND DORM_YN = 'Y' + + + + + + + + and UPPER(eci.CUST_NM) LIKE CONCAT('%' , UPPER(#{searchText1}), '%') + + + and eci.BIZRNO = #{searchText1} + + + and ekc.CHNL_ID = #{searchText1} + + + + + + + + + + + AND ess.STTUS_CD = #{searchType1} + + + AND ess.NMINEE_DIV_CD = #{searchType2} + + + AND ess.INCH_DIV_CD = #{searchType3} + + + + + + AND eci.BIZRNO = #{searchText1} + + + AND ess.SNDRNO = #{searchText1} + + + AND UPPER(eci.CUST_NM) LIKE CONCAT('%' , UPPER(#{searchText1}), '%') + + + + + + + + + + + + + + /* sendNumMgt-mapper.xml(deleteNumber) */ + DELETE FROM ess + USING ${HUBEZ_COMMON}.EZ_SVC_SNDRNO ess + INNER JOIN ${HUBEZ_COMMON}.EZ_SNDRNO_REG esr + ON ess.REG_REQ_NO = esr.REG_REQ_NO + INNER JOIN ${HUBEZ_COMMON}.EZ_SVC_USER esu + ON esr.USER_SEQ = esu.USER_SEQ + WHERE + esu.USER_ID = #{adminId} + AND ess.SNDRNO = #{regNo} + + + + /* sendNumMgt-mapper.xml(insertNumber) */ + + SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m'), LPAD(${HUBEZ_COMMON}.FUN_NEXT_SEQ('SNDRNO_REG_SEQ'), 7, '0')) AS REG_REQ_NO + + INSERT INTO + ${HUBEZ_COMMON}.EZ_SNDRNO_REG ( + REQ_STTUS_CD + ,REQ_CNT + ,APV_CNT + ,REJT_CNT + ,REQ_DT + ,USER_SEQ + ,REG_ID + ,REG_DT + ,CHG_ID + ,CHG_DT + ) + VALUES( + '01' + ,#{reqCnt} + ,0 + ,0 + ,NOW() + ,#{userSeq} + ,#{madangId} + ,NOW() + ,#{madangId} + ,NOW() + ) + + + + /* sendNumMgt-mapper.xml(insertNumberDoc) */ + INSERT INTO + ${HUBEZ_COMMON}.EZ_SNDRNO_DOC ( + REG_REQ_NO + ,DOC_NO + ,DOC_TP_CD + ,DOC_TITLE + ,FILE_NM + ,FILE_PATH + ,REG_ID + ,REG_DT + ,CHG_ID + ,CHG_DT + ) + VALUES( + #{regReqNo} + ,#{docNo} + ,#{docTpCd} + ,#{docTitle} + ,#{fileNm} + ,#{filePath} + ,#{regId} + ,NOW() + ,#{regId} + ,NOW() + ) + + + + /* sendNumMgt-mapper.xml(insertNumberList) */ + INSERT INTO + ${HUBEZ_COMMON}.EZ_SVC_SNDRNO( + SNDRNO + ,REG_TP_CD + ,SNDRNO_NM + ,CUST_SEQ + ,REG_REQ_NO + ,STTUS_CD + ,USE_YN + ,NMINEE_DIV_CD + ,INCH_DIV_CD + ,REG_ID + ,REG_DT + ,CHG_ID + ,CHG_DT + ) + VALUES( + #{sendNum} + ,'02' + ,#{sendNm} + ,#{custSeq} + ,#{regReqNo} + ,'01' + ,'Y' + ,#{nmineeDivCd} + ,#{inchDivCd} + ,#{regId} + ,NOW() + ,#{regId} + ,NOW() + + ) + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/mysql/stats/stats-mapper.xml b/src/main/resources/mapper/mysql/stats/stats-mapper.xml index 9be64c0..8e45e3a 100644 --- a/src/main/resources/mapper/mysql/stats/stats-mapper.xml +++ b/src/main/resources/mapper/mysql/stats/stats-mapper.xml @@ -3,5 +3,255 @@ + + + + + + + \ No newline at end of file