This commit is contained in:
subsub 2023-06-15 16:04:22 +09:00
commit 6c95b410dc
19 changed files with 150 additions and 41 deletions

View File

@ -1,6 +1,7 @@
package itn.let.fax.user.web;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -68,7 +69,7 @@ public class FaxController {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(StringUtils.isEmpty(userId)) {
return "redirect:/web/user/login/login.do";
//return "redirect:/web/user/login/login.do";
}
// TODO 미로그인 로그인 페이지로 이동 처리
model.addAttribute("loginVO", loginVO);
@ -102,9 +103,11 @@ public class FaxController {
tempList.add(seqId);
}
if (null != userId && !userId.equals("")) {
faxAddrVO.setAddrIdList(tempList);
faxAddrVO.setMberId(userId);
resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO);
}
for(FaxAddrVO tmp : resultFaxAddrList) {
@ -141,7 +144,12 @@ public class FaxController {
}
/* 목록을 가져 온다 */
Map<String, Object> faxDataViewMap = faxService.selectFaxDataView(userId);
Map<String, Object> faxDataViewMap = new HashMap<String, Object>();
if (null != userId && !userId.equals("")) {
faxDataViewMap = faxService.selectFaxDataView(userId);
}
//최근 전송내역
model.addAttribute("resultLatestMsgList", faxDataViewMap.get("resultLatestMsgList"));
//자주보내는 번호
@ -158,7 +166,6 @@ public class FaxController {
model.addAttribute("moveAddrFlag", moveAddrFlag);
model.addAttribute("moveAddrAllFlag", moveAddrAllFlag);
return "/web/fax/faxDataView";
}
@RequestMapping(value= {"/web/mjon/fax/faxSendList.do"})

View File

@ -48,6 +48,10 @@
THEN 'S'
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
THEN 'S'
WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN (
A.RSLT_CODE IS NULL
AND A.RSLT_CODE2 IS NULL
@ -74,6 +78,10 @@
THEN 'S'
WHEN MD.AGENT_CODE = '07' AND (MD.RSLT_CODE = '6' OR MD.RSLT_CODE = '1000')
THEN 'S'
WHEN MD.AGENT_CODE = '08' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001')
THEN 'S'
WHEN MD.AGENT_CODE = '09' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001')
THEN 'S'
WHEN (
MD.RSLT_CODE IS NULL
AND MD.RSLT_CODE2 IS NULL
@ -100,6 +108,10 @@
THEN 'S'
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
THEN 'S'
WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN (
A.RSLT_CODE IS NULL
AND A.RSLT_CODE2 IS NULL
@ -301,6 +313,10 @@
THEN 'S'
WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000')
THEN 'S'
WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
THEN 'S'
WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
THEN 'S'
ELSE 'F'
END) = 'S'
) AS successCount
@ -325,6 +341,10 @@
THEN 'E'
WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013'
THEN 'E'
WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
THEN 'E'
WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
THEN 'E'
ELSE 'ETC'
END) = 'E'
) AS callRejectionCount
@ -625,6 +645,10 @@
THEN 'S'
WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000')
THEN 'S'
WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
THEN 'S'
WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
THEN 'S'
ELSE 'F'
END) = 'S'
) AS successCount
@ -649,6 +673,10 @@
THEN 'E'
WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013'
THEN 'E'
WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
THEN 'E'
WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404')
THEN 'E'
ELSE 'ETC'
END) = 'E'
) AS callRejectionCount
@ -1028,6 +1056,10 @@
THEN 'S'
WHEN AA.AGENT_CODE = '07' AND (AA.RSLT_CODE = '6' OR AA.RSLT_CODE = '1000')
THEN 'S'
WHEN AA.AGENT_CODE = '08' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001')
THEN 'S'
WHEN AA.AGENT_CODE = '09' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001')
THEN 'S'
WHEN (
AA.RSLT_CODE IS NULL
AND AA.RSLT_CODE2 IS NULL
@ -1261,6 +1293,10 @@
THEN 'S'
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
THEN 'S'
WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
THEN 'S'
WHEN (
A.RSLT_CODE IS NULL
AND A.RSLT_CODE2 IS NULL
@ -2035,6 +2071,7 @@
, MANAGER_NM AS managerNm
, EXCEPT_SPAM_YN AS exceptSpamYn
, HOTLINE_AGENT_CODE AS hotlineAgentCode
, BLINE_CODE AS blineCode
FROM LETTNGNRLMBER
WHERE MBER_ID = #userId#
@ -3587,6 +3624,10 @@
THEN 'S'
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
THEN 'S'
WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN (
MMD.RSLT_CODE IS NULL
AND MMD.RSLT_CODE2 IS NULL
@ -3636,6 +3677,10 @@
THEN 'S'
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000')
THEN 'S'
WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
THEN 'S'
WHEN (
MMD.RSLT_CODE IS NULL
AND MMD.RSLT_CODE2 IS NULL
@ -5896,6 +5941,8 @@
WHEN A.AGENT_CODE = '04' AND A.RSLT_CODE IN ('4100','6600') THEN 'S'
WHEN A.AGENT_CODE = '05' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S'
WHEN A.AGENT_CODE = '08' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
WHEN A.AGENT_CODE = '09' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
WHEN A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL THEN 'W'
ELSE 'F'
END AS SWF
@ -5908,7 +5955,7 @@
B.MSG_TYPE IN (4, 6)
AND A.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d')
AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > A.SENT_DATE
AND A.AGENT_CODE IN ('01','04','05','07')
AND A.AGENT_CODE IN ('01','04','05','07','08','09')
) B
LEFT OUTER JOIN mj_msg_cost AGENT
ON B.AGENT_CODE = AGENT.AGENT_CODE
@ -5992,6 +6039,10 @@
SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'05','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW()
UNION ALL
SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'07','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW()
UNION ALL
SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'08','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW()
UNION ALL
SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'09','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW()
) C
GROUP BY
C.RSLT_DATE

View File

@ -644,7 +644,7 @@ function fnSmishingUpdate(flag) {
</tr>
</c:forEach>
<c:if test="${empty resultList}">
<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>

View File

@ -18,6 +18,7 @@
<!-- 현재 jsp에서 사용하는 file 관련 js -->
<script type="text/javascript" src="<c:out value='/js/user/fax/file.js' />"></script>
<script type="text/javascript">
var loginVO = '${loginVO}';
$(document).ready(function(){
@ -45,6 +46,11 @@
// 발송 버튼 클릭
$('#sendBtn').click(function(){
if(loginVO == "" || loginVO == null){
alert("팩스발송 서비스는 로그인 후 이용 가능합니다.");
return false;
}
if(!valueChk()){
return false;
}
@ -91,6 +97,22 @@
//////////////////////////////////////// 주소록에서 넘겨받은 주소록청보 처리해주기
modeAddrListInsert();
//주소록 불러오기 버튼 클릭시
$('.popupAddr').click(function(){
if(loginVO == "" || loginVO == null){
alert("로그인 후 이용이 가능합니다.");
return false;
}
});
//엑셀 불러오기 버튼 클릭시
$('.popupAddrExcel').click(function(){
if(loginVO == "" || loginVO == null){
alert("로그인 후 이용이 가능합니다.");
return false;
}
});
});
@ -386,7 +408,7 @@
<button type="button" data-tooltip="popup06" class="btnType btnType7 popupAddr">주소록 불러오기</button>
</div>
<div class="btn_popup_wrap">
<button type="button" data-tooltip="popup02" class="btnType btnType7">엑셀 불러오기</button>
<button type="button" data-tooltip="popup02" class="btnType btnType7 popupAddrExcel">엑셀 불러오기</button>
</div>
<div class="btn_popup_wrap">
<button type="button" data-tooltip="popup03" class="btnType btnType7 tab1">최근 전송내역</button>

View File

@ -371,8 +371,6 @@ function addTemplate(){
return;
};
// 메시지 유형 선택여부에 따른 필수값 체크
if(selectTemplateType == "EX"){
if(inputTemplateExtra == null || inputTemplateExtra == ""){
@ -539,6 +537,10 @@ function addTemplate(){
}
if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
return false;
}
var data = new FormData(bizForm);

View File

@ -1085,7 +1085,7 @@
<div class="input_left"><span class="essential">*</span>대표</div>
<div class="input_right">
<label for="" class="label">대표 입력</label> <input type="text"
class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
</div>
</div>
<div class="input_list_item input_list_biz">

View File

@ -946,7 +946,7 @@ var blineCode = '${blineCode}';
<div class="input_left"><span class="essential">*</span>대표</div>
<div class="input_right">
<label for="" class="label">대표 입력</label> <input type="text"
class="list_inputType1 onlyC" name="ceoNm" maxlength="5" />
class="list_inputType1 onlyC" name="ceoNm" maxlength="50" />
</div>
</div>
<div class="input_list_item input_list_biz">

View File

@ -1082,7 +1082,7 @@
<div class="input_left"><span class="essential">*</span>대표</div>
<div class="input_right">
<label for="" class="label">대표 입력</label> <input type="text"
class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="5" />
class="list_inputType1 onlyC" name="pre_ceoNm" id="pre_ceoNm" maxlength="50" />
</div>
</div>
<div class="input_list_item input_list_biz">

View File

@ -893,7 +893,7 @@ function changeValueWork(obj){
<div class="input_left"><span class="essential">*</span>대표</div>
<div class="input_right">
<label for="" class="label">대표명 입력</label>
<input type="text" class="list_inputType1" name="ceoNm" maxlength="10" value="${userInfo.ceoNm}"/>
<input type="text" class="list_inputType1" name="ceoNm" maxlength="50" value="${userInfo.ceoNm}"/>
</div>
</div>
<div class="input_list_item input_list_biz">

View File

@ -221,7 +221,7 @@ function changeValueWork(obj){
<div class="input_left"><span class="essential">*</span>대표</div>
<div class="input_right">
<label for="" class="label">대표 입력</label>
<input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="5" />
<input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" maxlength="50" />
</div>
</div>
<div class="input_list_item input_list_biz">

View File

@ -195,9 +195,9 @@
<td>Object</td>
</tr>
<tr>
<th>[data].msgGroupId</th>
<td>메세지 그룹 ID</td>
<td>String</td>
<th>[data].msgGroupIdList</th>
<td>메세지 그룹 ID 리스트</td>
<td>List String</td>
</tr>
<tr>
<th>[data].msgType</th>
@ -242,8 +242,12 @@
<p>"resultCode":"0"</p>
<p>, "data":[</p>
<div>
<p>"msgGroupId":"MSGGID_0000000000000"</p>
<p>, "msgType":"4"</p>
<p>"msgGroupIdList":[</p>
<p>&nbsp;&nbsp;&nbsp; 0:"MSGGID_0000000000000"</p>
<p>&nbsp;&nbsp;&nbsp; 1:"MSGGID_0000000000001"</p>
<p>&nbsp;&nbsp;&nbsp; 2:"MSGGID_0000000000002"</p>
<p>]</p>
<p>, "msgType":"LMS"</p>
<p>, "blockCnt":"0"</p>
<p>, "failCnt":"0"</p>
<p>, "successCnt":"3"</p>

View File

@ -792,6 +792,25 @@ function strChinJpnCheck(str){
return rtnStr;
}
//받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환
function kakaoTemplateEmojiCheck (str) {
var regex = /[\u{1F004}-\u{1F9E6}]|[\u{1F600}-\u{1F9D0}]/gu;
var usedEmoji = "";
var returnFlag = true;
var splitMsg = str.split(/.*?/u);
for(var i=0; i < splitMsg.length; i++){
if(splitMsg[i].match(regex)) {
usedEmoji = usedEmoji + splitMsg[i];
returnFlag = false;
}
}
if(!returnFlag) alert("알림톡 내용에 이모지는 사용할 수 없습니다.\n이모지 삭제후 등록해주세요.\n(" + usedEmoji + ")");
return returnFlag;
}
//받아온 str 에 이모지가 포함되어있는지 체크하여 갯수로 반환
function emojiCheck (str) {
var regex = /[\u{1F004}-\u{1F9E6}]|[\u{1F600}-\u{1F9D0}]/gu;

View File

@ -134,7 +134,7 @@
</div>
<div class="input_list_item">
<div class="input_left">*api key
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
</div>
</div>

View File

@ -24,19 +24,19 @@
//회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용해주세요
//실제서비스용
final String mberId = "goodgkdus"; //문자온 로그인 아이디
final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key
// final String mberId = "goodgkdus"; //문자온 로그인 아이디
// final String apiKey = "12e749877379aa7426275414050694b953"; //발급받은 api key
//테스트용
//String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디
//String apiKey = request.getParameter("p_apiKey"); //발급받은 api key
String mberId = request.getParameter("p_mberId"); //문자온 로그인 아이디
String apiKey = request.getParameter("p_apiKey"); //발급받은 api key
/******************** 전송요청 URL ********************/
//final String apiUrl = "https://api.munjaon.co.kr/api/inqry/hstryDetail";
// final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail";
final String apiUrl = "http://localhost:8088/api/inqry/hstryDetail";
String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail";
// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/inqry/hstryDetail";
/**************** 발송가능건수 예제 ******************/
System.out.println("상세발송이력");

View File

@ -89,7 +89,7 @@
</div>
<div class="input_list_item">
<div class="input_left">*api key
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
</div>
</div>

View File

@ -152,7 +152,7 @@
</div>
<div class="input_list_item">
<div class="input_left">*api key
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
</div>
</div>

View File

@ -42,8 +42,8 @@
//String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // 전송요청 URL
//String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // 전송요청 URL
// final String apiUrl = "http://localhost:8088/api/api/send/sendMsg";
final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg";
final String apiUrl = "http://localhost:8088/api/send/sendMsg";
// final String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsg";
Map<String, String> params = new HashMap<String, String>();
/******************** 인증정보 ********************/

View File

@ -47,12 +47,14 @@
success: function (returnData, status) {
console.log('returnData : ', returnData);
if (returnData.resultCode=="0"){
$("span#mgi").text(returnData.data.msgGroupId);
$("span#mgi").text(returnData.data.msgGroupIdList);
$("span#sc").text(returnData.data.successCnt);
$("span#fc").text(returnData.data.failCnt);
$("span#bc").text(returnData.data.blockCnt);
$("span#mt").text(returnData.data.msgType);
$("span#mt").text(returnData.data.msgTypeList);
} else{
alert(returnData.resultCode+" : "+returnData.data);
@ -130,7 +132,7 @@
</div>
<div class="input_list_item">
<div class="input_left">*api key
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="12e749877379aa7426275414050694b953" size="100"/>
<input type="text" class="list_inputType1" id="apiKey" maxlength="100" value="24cb8ec4ed7c16969d2ab2988dd2406ee2820" size="100"/>
</div>
</div>

View File

@ -41,9 +41,9 @@
//String sms_url = "https://apis.aligo.in/send/"; // 전송요청 URL
//String sms_url = "https://api.munjaon.co.kr:9998/api/accessTest/Test"; // 전송요청 URL
//String sms_url = "https://api.munjaon.co.kr:9998/api/accessKey/SendMsg"; // 전송요청 URL
// String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // 전송요청 URL
String apiUrl = "http://localhost:8088/api/send/sendMsgs"; // 전송요청 URL
String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL
// String apiUrl = "https://apidev.munjaon.co.kr:9998/api/send/sendMsgs"; // 전송요청 URL
Map<String, String> params = new HashMap<String, String>();
params.put("mberId", mberId); // SMS 아이디
@ -72,6 +72,7 @@
//String p_msgKind = request.getParameter("p_msgKind"); //N-일반,A-광고,C-선거
//String p_msgKind = "N"; //N-일반,A-광고,C-선거 - 초기 지원안함
String p_smsTxt_1 = request.getParameter("p_smsTxt_1"); //SMS용 메시지본문
String p_testYn = request.getParameter("p_testYn"); //테스트데이터여부 '', 'YF', 'YS'
//String p_nameStr_1 = request.getParameter("p_nameStr_1"); //치환문자
//선택값
@ -88,6 +89,7 @@
//추가 전송 데이터
params.put("callFrom" , p_callFrom); //발신번호
params.put("test_yn" , p_testYn); //테스트 여부
//params.put("callTo_1" , p_callTo_1); //수신번호
//params.put("eachPrice" , p_eachPrice); //전송문자 개별가격