Compare commits

..

No commits in common. "master" and "5255_DB트리거개선_대체문자_스케줄러" have entirely different histories.

270 changed files with 7869 additions and 39651 deletions

2
.claude/.gitignore vendored
View File

@ -1,2 +0,0 @@
/settings.local.json
/mcp_settings.json

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

9
.gitignore vendored
View File

@ -201,13 +201,4 @@ fabric.properties
rebel.xml
/mvnw
/mvnw.cmd
/.gemini
/.gemini.zip
/CLAUDE.md
<<<<<<< HEAD
# Mac OS
=======
### Mac OS ###
>>>>>>> refs/heads/5419_전화번호거짓표시50건이상
.DS_Store

11
pom.xml
View File

@ -146,7 +146,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.49</version>
<version>5.1.31</version>
</dependency>
<!-- oracle 10g driver -->
@ -477,19 +477,12 @@
</dependency>
<!-- kmc 본인인증 -->
<!-- <dependency>
<dependency>
<groupId>kmc</groupId>
<artifactId>ICERTSecu_JDK18</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/ICERTSecu_JDK18.jar</systemPath>
</dependency> -->
<!-- kmc 본인인증 ver 2 암호화 모듈 추가 버전 -->
<dependency>
<groupId>kmc</groupId>
<artifactId>ICERTSecu</artifactId>
<version>JDK18_v2</version>
</dependency>

View File

@ -1,130 +0,0 @@
package itn.com.cmm;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
public class MjonFTSendVO{
/**
* @description : 수신자번호
*/
private String phone;
/**
* @description : [*이름*] - 치환문자
*/
private String name;
/**
* @description : [*1*] - 치환문자
*/
private String rep1;
/**
* @description : [*2*] - 치환문자
*/
private String rep2;
/**
* @description : [*3*] - 치환문자
*/
private String rep3;
/**
* @description : [*4*] - 치환문자
*/
private String rep4;
/**
* @description : 문자ID
*/
private String msgId;
/**
* @description : 전송그룹ID (대량문자의 경우 하나의 그룹으로 세팅)
*/
private String msgGroupId;
/**
* @description : 문자온 일반회원ID
*/
private String userId;
/**
* @description : 발신번호 (하이픈 등의 문자를 제외한 12byte이하의 숫자로 입력한다.)
*/
private String callFrom;
/**
* @description : 수신번호 (하이픈 등의 문자를 제외한 12byte이하의 숫자로 입력한다.)
*/
private String callTo;
/**
* @description : 예약 발송일시
*/
private String reqDate;
/**
* @description :전송사(04:다우, 05:JJ, 07:IVT, 01:아이하트 , 02:현대퓨처넷, 03:아이엠오)
*/
private String agentCode;
/**
* @description : MMS용 메시지제목
*/
private String subject;
/**
* @description : SMS용 메시지본문
*/
private String smsTxt;
/**
* @description : 메세지타입(4: SMS 전송, 5: URL 전송, 6: MMS전송, 7: BARCODE전송, 8: 카카오 알림톡 전송)
*/
private String msgType;
/**
* @description : 첨부파일 갯수
*/
private String fileCnt;
/**
* @description : 파일이름1
*/
private String filePath1;
/**
* @description : 파일이름2
*/
private String filePath2;
/**
* @description : 파일이름3
*/
private String filePath3;
/**
* @description : event 여부 / group tb에 넣는 용도 / 기본값 N
*/
private String eventYn="N";
/**
* @description : 개별단가
*/
private String eachPrice;
}

View File

@ -61,7 +61,6 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
v_ret = false;
}
// lettnloginlog 테이블에 insert 패턴 추가 (/web/user/login/usrIdCheckAjax.do)
}else if(request.getRequestURI().indexOf("ListAjax.do")>-1
|| request.getRequestURI().indexOf("ViewAjax.do")>-1
|| request.getRequestURI().indexOf("DataAjax.do")>-1
@ -75,7 +74,6 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
|| request.getRequestURI().indexOf("MapUrl")>-1
|| request.getRequestURI().indexOf("uss/ion/fms/FmsFileInsertAjax")>-1
|| request.getRequestURI().indexOf("web/mjon/addr/sendExelFilePhoneNumAjax")>-1
|| request.getRequestURI().indexOf("/web/user/login/usrIdCheckAjax.do")>-1

View File

@ -318,17 +318,4 @@ public final class MJUtil {
return dupliBlockList;
}
/**
* 사업자등록번호 대시('-') 추가
* 대시 유무 상관없음
* 유효성 맞지 않을시 변환안됨.
*/
public static String bizNoAddDash(String str) {
if(str == null) {
return str;
}
String regExp = "(\\d{3})(\\d{2})(\\d{5})$";
String chgf = "$1-$2-$3";
return str.replaceFirst(regExp, chgf);
}
}

View File

@ -229,8 +229,8 @@ public final class MsgSendUtils {
placeholders.put("[*4*]", MjonMsgSendVO::getRep4);
boolean hasPerformedSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 번만 수행되도록 제어
boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 메세지 타입 체크 한번
boolean hasPerformedDelayYn = false; // 치환 문자가 없는 경우,
boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 번만 수행되도록 제어
boolean hasPerformedDelayYn = false; // 치환 문자가 없는 경우, 스팸 체크가 번만 수행되도록 제어
String msgKind = mjonMsgVO.getMsgKind();
String smsTxtTemp = mjonMsgVO.getSmsTxt();
@ -257,10 +257,13 @@ public final class MsgSendUtils {
for (Map.Entry<String, Function<MjonMsgSendVO, String>> entry : placeholders.entrySet()) {
String placeholder = entry.getKey();
String value = entry.getValue().apply(sendVO);
// log.info(" + smsTxtTemp [{}]", smsTxtTemp);
// log.info(" + placeholder [{}]", placeholder);
// log.info(" + value [{}]", value);
// log.info(" + smsTxtTemp.contains(placeholder) [{}]", smsTxtTemp.contains(placeholder));
if (smsTxt.contains(placeholder)) {
if (StringUtils.isEmpty(value)) {
// statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.", "STAT_1040");
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
return false;
}
smsTxt = smsTxt.replace(placeholder, value);
@ -290,8 +293,7 @@ public final class MsgSendUtils {
if (!hasPerformedMsgType) {
msgTypeResult = getMsgTypeWithByteValidation(sendVO, smsTxt);
if ("INVALID".equals(msgTypeResult)) {
// statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.");
StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.", "STAT_1050");
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.");
return false;
}
hasPerformedMsgType = true;
@ -308,8 +310,7 @@ public final class MsgSendUtils {
// 메시지 타입 체크는 매번 수행
msgTypeResult = getMsgTypeWithByteValidation(sendVO, smsTxt);
if ("INVALID".equals(msgTypeResult)) {
// statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.");
StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.", "STAT_1050");
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "문자 치환 후 전송 문자 길이를 초과하였습니다.");
return false;
}
}
@ -462,7 +463,7 @@ public final class MsgSendUtils {
}
}
public static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴
private static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴
if (smsTxtTemplate == null) {
return false; // null일 경우 false 반환
@ -542,7 +543,6 @@ public final class MsgSendUtils {
statusResponse.setMessage(msg);
}
public static StatusResponse validateFilesForMessageSending(int fileCount, MjonMsgVO mjonMsgVO) {
if (fileCount > 0) {

View File

@ -34,11 +34,12 @@ public class CertPhoneWebController {
@RequestMapping(value = {"/web/cert/log/insertCertLog.do"})
public ResponseEntity<StatusResponse> insertCertLog(HttpServletRequest request) throws Exception {
return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, certPhoneService.insertCertLog(request), LocalDateTime.now()));
}
@RequestMapping(value = {"/web/cert/log/kmcErrorPage.do"})
public String kmcErrorPage() throws Exception {
return "web/cop/kmc/certResultError";
}
}
}

View File

@ -796,16 +796,9 @@ public class MjonKakaoATController {
String lastUpdtPnttm = resultChannelList.get(i).getLastUpdtPnttm();
kakaoProfileVO.setSenderKey(senderKey);
kakaoProfileVO.setProfileId(profileId);
KakaoReturnVO tmpProfileVO = null;
// try {
//
// tmpProfileVO = kakaoApiProfile.kakaoApiProfileList(kakaoProfileVO);
// } catch (Exception e) {
// e.printStackTrace();
// // TODO: handle exception
// }
tmpProfileVO = kakaoApiProfile.kakaoApiProfileList(kakaoProfileVO);
KakaoReturnVO tmpProfileVO = kakaoApiProfile.kakaoApiProfileList(kakaoProfileVO);
ChannelIDVO returnChannelVO = new ChannelIDVO();
returnChannelVO.setSenderKey(tmpProfileVO.getSenderKey());

View File

@ -1,34 +0,0 @@
package itn.let.kakao.kakaoComm;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @ BIZ_KAKAO_PRICE 테이블 관련
*/
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class BizKakaoPriceVO {
private Long bizKakaoPriceId;
private String bizKakaoAtPrice; // 알림톡 단가
private String bizKakaoFtPrice; // 친구톡 단가
private String bizKakaoFtImgPrice; // 친구톡 이미지 단가
private String bizKakaoFtWideImgPrice; // 친구톡 와이드 이미지 단가
private String bizSmsPrice; // SMS 단가
private String bizMmsPrice; // MMS 단가
private String msgGroupId; // 메시지 그룹 ID
// getters and setters 생략
}

View File

@ -45,37 +45,23 @@ public class KakaoSendAdvcVO implements Serializable {
private String subMsgType; // 대체문자 타입
private String reqDate; // 예약일시
private String msgKind; // 예약일시
private String jsonStr; // jsonStr
private String adFlag; //친구톡 광고성 정보 사용 유무(Y:사용 , N:미사용)
private String sendKind; //문자전송 타입(H:홈페이지, A:API)
// =====
// =====
private String eachPrice; // sms 단가
private String smsPrice; // sms 단가
private String mmsPrice; // mms 단가
private String picturePrice; // mms 단가
private String totPrice; // mms 단가
private String befCash; // mms 단가
private String befPoint; // mms 단가
private String kakaoAtPrice; // 카카오 알림톡 단가
private String bizJsonName; // 카카오 알림톡 단가
private String reserveYn; // 카카오 알림톡 단가
private String atDelayYn; // 지연 문자 발송
private String atDelayYn; // 카카오 알림톡 단가
private String bizKakaoResendOrgnlTxt; // 카카오 알림톡 단가
private String bizKakaoResendType; // 카카오 알림톡 단가
private String filePath1; // 대체문자 이미지
private String fileCnt; // 파일 카운트
private String bizKakaoImageType; // 파일 카운트
private String spamStatus;
@ -97,13 +83,12 @@ public class KakaoSendAdvcVO implements Serializable {
"\n , msgType=[" + msgType + "]" +
"\n , templateContent=[" + templateContent + "]" +
"\n , templateTitle=[" + templateTitle + "]" +
"\n , buttonList=[" + (buttonList != null ? buttonList.toString() : "") + "]" +
"\n , buttonList=[" + buttonList.toString() + "]" +
"\n , subMsgSendYn=[" + subMsgSendYn + "]" +
"\n , subMsgTxt=[" + subMsgTxt + "]" +
"\n , subMsgType=[" + subMsgType + "]" +
"\n , reqDate=[" + reqDate + "]" +
"\n , jsonStr=[" + jsonStr + "]" +
"\n , sendKind=[" + sendKind + "]" +
"\n , ==== MJ_MSG_DATA INSERT DATA END =======" +
"\n " +
"\n , eachPrice=[" + eachPrice + "]" +
@ -118,8 +103,6 @@ public class KakaoSendAdvcVO implements Serializable {
"\n , atDelayYn=[" + atDelayYn + "]" +
"\n , bizKakaoResendOrgnlTxt=[" + bizKakaoResendOrgnlTxt + "]" +
"\n , bizKakaoResendType=[" + bizKakaoResendType + "]" +
"\n , filePath1=[" + filePath1 + "]" +
"\n , bizKakaoImageType=[" + bizKakaoImageType + "]" +
"\n ]";
}

View File

@ -1,17 +1,12 @@
package itn.let.kakao.kakaoComm;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -24,23 +19,17 @@ import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import itn.com.cmm.MjonFTSendVO;
import itn.com.cmm.MjonMsgSendVO;
import itn.com.cmm.util.MsgSendUtils;
import itn.com.cmm.util.StringUtil;
import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiJsonSave;
import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate;
import itn.let.kakao.user.kakaoAt.service.impl.KakaoAlimTalkDAO;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.mjocommon.MjonCommon;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msg.service.impl.MjonMsgDAO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.spammsg.web.ComGetSpamStringParser;
import itn.let.module.base.PriceAndPoint;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uss.umt.service.MberManageVO;
import itn.let.uss.umt.service.UserManageVO;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@ -49,15 +38,9 @@ public class KakaoSendUtil {
@Autowired
KakaoApiJsonSave kakaoApiJsonSave;
@Resource(name="kakaoAlimTalkDAO")
private KakaoAlimTalkDAO kakaoAlimTalkDAO;
@Resource(name = "MjonMsgDataService")
private MjonMsgDataService mjonMsgDataService;
@Resource(name = "mjonMsgDAO")
private MjonMsgDAO mjonMsgDAO;
@Autowired
KakaoApiTemplate kakaoApiTemplate;
@ -68,7 +51,6 @@ public class KakaoSendUtil {
@Autowired
private MjonCommon mjonCommon;
// 클래스 수준에서 정적 Pattern 정의 (성능 최적화)
private static final Pattern REPLACEMENT_PATTERN = Pattern.compile("#\\{[^}]+\\}");
@ -112,9 +94,6 @@ public class KakaoSendUtil {
// log.info(" + templateDetail :: [{}]", templateDetail);
// templateDetail.getButtonList().forEach(t->log.info(" + ButtonList :: [{}]", t.toString()));
// API인지 확인하는 Boolean
Boolean isApiData = "A".equals(kakaoVO.getSendKind());
Boolean hasContentReplacement = this.replBooleanStrChecker(templateContent);
Boolean hasTitleReplacement = this.replBooleanStrChecker(templateTitle);
Boolean hasButtonReplacement = this.needsButtonReplacement(templateDetail.getButtonList());
@ -135,17 +114,8 @@ public class KakaoSendUtil {
// 사용자 개인 단가 정보 불러오기
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(kakaoVO.getUserId());
kakaoVO.setAtSmishingYn(mberManageVO.getAtSmishingYn());
float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice());
float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
String shortPStr = Float.toString(shortPrice);
String mmsPStr = Float.toString(longPrice);
String kakaoAtPStr = Float.toString(kakaoAtPrice);
/** @MSGID KEY값 */
List<String> idList = mjonCommon.getNextCustomMsgCId(kakaoVO.getVarListMap().size());
@ -161,7 +131,6 @@ public class KakaoSendUtil {
int counter = 0;
/** @Map에 총 갯수가 수신자 갯수와 동일함 */
List<Map<String, String>> varList = kakaoVO.getVarListMap();
for (int i = 0; i < varList.size(); i++) {
// for(Map<String, String> variables : kakaoVO.getVarListMap()) {
// 치환 데이터
@ -169,13 +138,7 @@ public class KakaoSendUtil {
log.info("");
/** @공통 기본값 */
KakaoSendAdvcVO sendVO = createATSendVO(kakaoVO);
// 공통 가격 설정
sendVO.setSmsPrice(shortPStr);
sendVO.setMmsPrice(mmsPStr);
sendVO.setKakaoAtPrice(kakaoAtPStr);
KakaoSendAdvcVO sendVO = createSendVO(kakaoVO);
String msgId = idList.get(i);
sendVO.setMsgId(msgId);
@ -190,21 +153,12 @@ public class KakaoSendUtil {
/** @Step1-3: 템플릿 치환데이터 설정 */
String templateContentTemp = templateContent;
String templateTitleTemp = templateTitle;
// api가 아니면
if(!isApiData) {
if (hasContentReplacement) {
templateContentTemp = mjonCommon.ATReplaceTemplateVariables(templateContent, variables);
if(hasTitleReplacement) {
templateTitleTemp = mjonCommon.ATReplaceTemplateVariables(templateTitle, variables);
}
if (hasContentReplacement) {
templateContentTemp = mjonCommon.ATReplaceTemplateVariables(templateContent, variables);
if(hasTitleReplacement) {
templateTitleTemp = mjonCommon.ATReplaceTemplateVariables(templateTitle, variables);
}
}else {
templateContentTemp = variables.get("templateContent");
templateTitleTemp = variables.get("templateTitle");
}
/** @버튼 치환 */ // 버튼 리스트가 있으면 치환 수행, 항상 sendVO에 설정
List<KakaoButtonVO> buttonList = templateDetail.getButtonList();
if(hasButtonReplacement) {
@ -219,19 +173,44 @@ public class KakaoSendUtil {
String subMsgTxtTemp = subMsgTxt;
// Step 1-4: 실패 대체 문자 치환데이터 설정
if("Y".equals(kakaoVO.getSubMsgSendYn())) { // 대체문자가 있나?
// api가 아니면
if(!isApiData) {
if ("Y".equals(kakaoVO.getSubMsgTxtReplYn())) { // 치환데이터가 있나?
subMsgTxtTemp = mjonCommon.ATReplaceTemplateVariables(subMsgTxt, variables);
}
}else {
subMsgTxtTemp = variables.get("subMsgTxt");
if ("Y".equals(kakaoVO.getSubMsgTxtReplYn())) { // 치환데이터가 있나?
subMsgTxtTemp = mjonCommon.ATReplaceTemplateVariables(subMsgTxt, variables);
}
sendVO.setSubMsgTxt(subMsgTxtTemp);// 실패
}
sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn());
/*
log.info("kakaoSendAdvcVO Details: [callTo={}\n, templateContent=\n{}\n, subMsgTxt=\n{}]\n\n\n\n",
kakaoSendAdvcVO.getCallTo(),
kakaoSendAdvcVO.getTemplateContent(),
kakaoSendAdvcVO.getSubMsgTxt()
);
*/
// Step1 END
// step3
// 바이트 체크 금액설정
// 유효한 단가 계산
float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice());
float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
String shortPStr = Float.toString(shortPrice);
String mmsPStr = Float.toString(longPrice);
String kakaoAtPStr = Float.toString(kakaoAtPrice);
// 공통 가격 설정
sendVO.setSmsPrice(shortPStr);
sendVO.setMmsPrice(mmsPStr);
sendVO.setKakaoAtPrice(kakaoAtPStr);
if("Y".equals(kakaoVO.getSubMsgSendYn())) {
int smsTxtByte = mjonCommon.getSmsTxtBytes(sendVO.getSubMsgTxt());
@ -239,8 +218,7 @@ public class KakaoSendUtil {
sendVO.setSubMsgType(sendType);
if ("INVALID".equals(sendType)) {
// statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "전송 문자 길이를 초과하였습니다.");return kakaoSendAdvcListVO;
StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "전송 문자 길이를 초과하였습니다.", "STAT_1080");return kakaoSendAdvcListVO;
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "전송 문자 길이를 초과하였습니다.");return kakaoSendAdvcListVO;
}
boolean isMms = "MMS".equals(sendType);
@ -295,465 +273,19 @@ public class KakaoSendUtil {
return kakaoSendAdvcListVO;
}
/**
* @methodName : populateSendListsFT
* @author : 이호영
* @date : 2025. 4. 18.
* @description :
* @return : List<KakaoSendAdvcVO>
* @param kakaoVO
* @param isHolidayNotified
* @param statusResponse
* @return
* @throws Exception
*
*/
public List<KakaoSendAdvcVO> populateSendListsFT(KakaoVO kakaoVO
, boolean isHolidayNotified
, StatusResponse statusResponse
, UserManageVO userManageVO
, List<String> resultSpamTxt
) throws Exception {
//사용자 현재 보유 금액 불러오기(문자 발송 금액 차감 이전 금액)
// String befCash = kakaoVO.getBefCash();
log.info("kakaoVO.ftToString() :: [{}]", kakaoVO.ftToString());
private Calendar setupBaseDate(KakaoVO kakaoVO, boolean isNotified) throws ParseException {
// 예약 시간 기본값 설정
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String atSmishingYn = userManageVO.getAtSmishingYn();
String exceptSpamYn = userManageVO.getExceptSpamYn();
List<KakaoSendAdvcVO> kakaoSendAdvcListVO = new ArrayList<>();
Calendar calendar = setupBaseDateFT(kakaoVO);
// 친구톡 내용
String templateContent = kakaoVO.getTemplateContent();
// 실패 대체 문자
String subMsgTxt = kakaoVO.getSubMsgTxt();
log.info(" + StringUtils.isNotEmpty(subMsgTxt) :: [{}]", StringUtils.isNotEmpty(subMsgTxt));
if(StringUtils.isNotEmpty(subMsgTxt)) {
kakaoVO.setSubMsgSendYn("Y");
// 광고문자면 처리 - 광고 Y
if ("Y".equals(kakaoVO.getAdFlag())) {
subMsgTxt = "(광고)" + subMsgTxt + "\n" + "무료거부 0808800858";
}
}
// 사용자 개인 단가 정보 불러오기
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(kakaoVO.getUserId());
// 시스템 기본 단가 정보 불러오기
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
kakaoVO.setAtSmishingYn(mberManageVO.getAtSmishingYn());
// 치환 문구가 있는지 확인
Boolean replaceYN = MsgSendUtils.getReplaceYN(templateContent);
Boolean replaceSubYN = MsgSendUtils.getReplaceYN(subMsgTxt);
/** @MSGID KEY값 */
List<String> idList = mjonCommon.getNextCustomMsgCId(kakaoVO.getMjonFTSendVOList().size());
Map<String, Function<MjonFTSendVO, String>> placeholders = new HashMap<>();
placeholders.put("[*이름*]", MjonFTSendVO::getName);
placeholders.put("[*1*]", MjonFTSendVO::getRep1);
placeholders.put("[*2*]", MjonFTSendVO::getRep2);
placeholders.put("[*3*]", MjonFTSendVO::getRep3);
placeholders.put("[*4*]", MjonFTSendVO::getRep4);
String imageType = kakaoVO.getImageType();
// 개인단가
Float kakaoMemberFtPrice =
imageType == null ? mberManageVO.getKakaoFtPrice() :
"I".equals(imageType) ? mberManageVO.getKakaoFtImgPrice() :
"W".equals(imageType) ? mberManageVO.getKakaoFtWideImgPrice() :
mberManageVO.getKakaoFtPrice();
// 시스템단가
Float kakaoSysJoinFtPrice =
imageType == null ? sysJoinSetVO.getKakaoFtPrice() :
"I".equals(imageType) ? sysJoinSetVO.getKakaoFtImgPrice() :
"W".equals(imageType) ? sysJoinSetVO.getKakaoFtWideImgPrice() :
sysJoinSetVO.getKakaoFtPrice();
Float kakaoFtPrice =
getValidPrice(kakaoMemberFtPrice, kakaoSysJoinFtPrice);
// 대체문자가 있을경우 사용
float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice());
float picturePrice = getValidPrice(mberManageVO.getPicturePrice(), sysJoinSetVO.getPicturePrice());
boolean hasPerformedSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 번만 수행되도록 제어
boolean hasPerformedSubSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 번만 수행되도록 제어
boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 메세지 타입 체크 한번
boolean hasPerformedDelayYn = false; // 치환 문자가 없는 경우,
String imgFilePath = "";
if(StringUtils.isNotEmpty(kakaoVO.getAtchFileId()) &&
("I".equals(imageType) || "W".equals(imageType))) {
imgFilePath = mjonMsgDAO.selectPhotoImgFileRealPath(kakaoVO.getAtchFileId());
}
/** @jsonStr 필요유무 */
boolean hasButtons = CollectionUtils.isNotEmpty(kakaoVO.getButtonVOList());
String sharedJsonStr = null;
// 치환데이터가 없는 경우 번만 계산하기 위한 캐시 변수 추가
Map<String, Object> sharedPricingResult = null;
// 치환데이터가 없는 경우 for문 전에 번만 계산
if (!replaceSubYN && StringUtils.isNotEmpty(subMsgTxt)) {
sharedPricingResult = calculateSubMsgPricing(subMsgTxt, imgFilePath, shortPrice, longPrice, picturePrice, kakaoFtPrice);
// 사전계산에서 INVALID인 경우 즉시 리턴
String preSendType = (String) sharedPricingResult.get("sendType");
if ("INVALID".equals(preSendType)) {
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "전송 문자 길이를 초과하였습니다.");
return kakaoSendAdvcListVO;
}
}
List<MjonFTSendVO> mjonFTSendVOList = kakaoVO.getMjonFTSendVOList();
for (int i = 0; i < mjonFTSendVOList.size(); i++) {
MjonFTSendVO mjonFTSendVO = mjonFTSendVOList.get(i);
KakaoSendAdvcVO sendVO = createFTSendVO(kakaoVO, calendar);
// 공통 가격 설정
sendVO.setSmsPrice(Float.toString(shortPrice));
sendVO.setMmsPrice(Float.toString(longPrice));
sendVO.setPicturePrice(Float.toString(picturePrice));
sendVO.setCallTo(mjonFTSendVO.getPhone());
sendVO.setMsgId(idList.get(i));
// 친구톡 문자
String templateContentTemp = templateContent;
// 치환 문자면
if(replaceYN) {
// 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
String placeholder = entry.getKey();
String value = entry.getValue().apply(mjonFTSendVO);
if (templateContentTemp.contains(placeholder)) {
if (StringUtils.isEmpty(value)) {
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
return null;
}
templateContentTemp = templateContentTemp.replace(placeholder, value);
}
}
}
sendVO.setTemplateContent(templateContentTemp);
// 실패 대체 문자
String subMsgTxtTemp = null;
if(StringUtils.isNotEmpty(subMsgTxt)) {
subMsgTxtTemp = subMsgTxt;
if(replaceSubYN) {
// 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
String placeholder = entry.getKey();
String value = entry.getValue().apply(mjonFTSendVO);
if (subMsgTxtTemp.contains(placeholder)) {
if (StringUtils.isEmpty(value)) {
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
return null;
}
subMsgTxtTemp = subMsgTxtTemp.replace(placeholder, value);
}
}
}
}
sendVO.setSubMsgTxt(subMsgTxtTemp);
//대체문자가 있으면
// Step 1-4: 실패 대체 문자 치환데이터 설정
if(StringUtils.isNotEmpty(subMsgTxtTemp)) { // 대체문자가 있나?
// 최적화된 계산 로직
Map<String, Object> pricingResult;
if (replaceSubYN) {
// 치환데이터 있음 매번 새로 계산
pricingResult = calculateSubMsgPricing(subMsgTxtTemp, imgFilePath,
shortPrice, longPrice, picturePrice, kakaoFtPrice);
// INVALID 체크
String resultSendType = (String) pricingResult.get("sendType");
if ("INVALID".equals(resultSendType)) {
statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "전송 문자 길이를 초과하였습니다.");
return kakaoSendAdvcListVO;
}
} else {
// 치환데이터 없음 미리 계산된 결과 재사용
pricingResult = sharedPricingResult;
}
// 결과 적용
applyPricingResult(sendVO, pricingResult);
}else {
// 대체문자가 없으면 카카오톡 단가 그대로 사용
sendVO.setEachPrice( Float.toString(kakaoFtPrice) );
}
// 스팸 단어 체크
// exceptSpam는 사용자 스팸 단어 체크할건지에 대한 여부 N : 체크
if("N".equals(exceptSpamYn)) {
// 친구톡 내용
if(replaceYN) {
checkSpamAndSetStatus(kakaoVO
, templateContentTemp
, resultSpamTxt, isHolidayNotified);
}else if(!hasPerformedSpamCheck) {
checkSpamAndSetStatus(kakaoVO
, templateContentTemp
, resultSpamTxt, isHolidayNotified);
hasPerformedSpamCheck = true;
}
// 대체문자 내용
if(StringUtils.isNotEmpty(subMsgTxtTemp)) {
if(replaceSubYN) {
checkSpamAndSetStatus(kakaoVO
, subMsgTxtTemp
, resultSpamTxt, isHolidayNotified);
}else if(!hasPerformedSubSpamCheck) {
checkSpamAndSetStatus(kakaoVO
, subMsgTxtTemp
, resultSpamTxt, isHolidayNotified);
hasPerformedSubSpamCheck = true;
}
}
}
log.info(" kakaoVO.toString() :: [{}]",kakaoVO.ftToString());
/* @isHolidayNotified
* - 관리자 알림 설정으로 인해
* - 해당 시간이면 지연 미처리
* @smishingYn
* - 회원 '스미싱 ' 상태값
* - Y면 알림, 지연 처리해야
* */
if("Y".equalsIgnoreCase(atSmishingYn) && isHolidayNotified) {
kakaoVO.setSpamStatus("Y");
kakaoVO.setSmishingYn("Y");
kakaoVO.setAtDelayYn("Y");
}
// 지연 여부 처리
if (( "Y".equalsIgnoreCase(atSmishingYn) || "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn()))
&& !hasPerformedDelayYn && isHolidayNotified) {
calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸
// TEST
// calendar.add(Calendar.MINUTE, 5); // 모든 시간을 30분 뒤로 미룸
hasPerformedDelayYn = true;
}
sendVO.setReqDate(sdf.format(calendar.getTime())); // 분할된 시간 설정 또는 기본 예약 시간 사용
// 타이틀이나 버튼이 있고
if(hasButtons || StringUtils.isNotEmpty(kakaoVO.getTemplateImageUrl())) {
//
if (StringUtils.isEmpty(sharedJsonStr)) {
// 치환 데이터가 없고 아직 생성되지 않았으면 번만 생성
sharedJsonStr = kakaoApiJsonSave.kakaoApiFTJsonSave_advc(kakaoVO);
sendVO.setJsonStr(sharedJsonStr);
}
sendVO.setBizJsonName(idList.get(0));
}
kakaoSendAdvcListVO.add(sendVO);
log.info(" sendVO.toString() :: [{}]",sendVO.toString());
}
return kakaoSendAdvcListVO;
}
private void checkSpamAndSetStatus(KakaoVO kakaoVO
, String chkText
, List<String> resultSpamTxt, boolean isHolidayNotified) throws Exception {
// TODO Auto-generated method stub
kakaoVO.setSpamStatus("N");
kakaoVO.setAtDelayYn("N");
if(StringUtils.isNotEmpty(chkText)) {
String resultParser = ComGetSpamStringParser.getSpamTextParse(chkText).trim();
int spmCnt = 0;
String spmFilterTxt = "";
for (String spmTxt : resultSpamTxt) {
String parserStr = ComGetSpamStringParser.getSpamTextParse(spmTxt).trim();
if (resultParser.contains(parserStr) || chkText.contains(parserStr)) {
spmCnt++;
spmFilterTxt += spmTxt + ",";
}
}
if (spmCnt > 0) { // 스팸 문자가 포함된 경우
if (StringUtil.getWordRight(spmFilterTxt.trim(), 1).equals(",")) {
// 처음부터 idx 만큼 잘라낸 나머지 글자
spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
}
/* @isHolidayNotified
* - 관리자 알림 설정으로 인해
* - 해당 시간이면 지연 미처리
* */
kakaoVO.setSpamStatus("Y");
if(isHolidayNotified) {
kakaoVO.setAtDelayYn("Y");
}
}
}
}
// TODO(human): 아래에 새로운 메소드 구현
/**
* 대체문자 가격 계산 최적화 메소드
* @param subMsgTxt 대체문자 내용
* @param imgFilePath 이미지 파일 경로
* @param shortPrice 단문 가격
* @param longPrice 장문 가격
* @param picturePrice 사진 가격
* @param kakaoFtPrice 카카오 친구톡 가격
* @return 계산 결과 Map (sendType, chosenPrice, filePath 포함)
* @throws UnsupportedEncodingException
*/
private Map<String, Object> calculateSubMsgPricing(String subMsgTxt, String imgFilePath,
float shortPrice, float longPrice,
float picturePrice, float kakaoFtPrice) throws UnsupportedEncodingException {
Map<String, Object> result = new HashMap<>();
String sendType = "MMS";
if(StringUtils.isEmpty(imgFilePath)) {
int smsTxtByte = mjonCommon.getSmsTxtBytes(subMsgTxt);
sendType = getMsgType(smsTxtByte);
}
result.put("sendType", sendType);
// INVALID인 경우 추가 처리 없이 반환
if ("INVALID".equals(sendType)) {
return result;
}
float chosenPrice = 0f;
if(StringUtils.isNotEmpty(imgFilePath)) {
chosenPrice = Math.max(picturePrice, kakaoFtPrice);
result.put("filePath", imgFilePath);
} else if ("MMS".equals(sendType)) {
chosenPrice = Math.max(longPrice, kakaoFtPrice);
// ReqDate가 비어 있으면 현재 시간으로 설정, 그렇지 않으면 ReqDate로 설정
// 화면에서 예약문자면 예약시간을 regDate로 설정한다.
Date baseDate;
if (StringUtils.isEmpty(kakaoVO.getReqDate())) {
kakaoVO.setReqDate(DATE_FORMATTER.format(now)); // ReqDate에 현재 시간 설정
baseDate = now;
} else {
chosenPrice = Math.max(shortPrice, kakaoFtPrice);
baseDate = DATE_FORMATTER.parse(kakaoVO.getReqDate()); // ReqDate를 baseDate로 설정
}
result.put("sendType", sendType);
result.put("chosenPrice", Float.toString(chosenPrice));
return result;
}
/**
* 가격 계산 결과를 sendVO에 적용하는 헬퍼 메소드
* @param sendVO 적용할 KakaoSendAdvcVO 객체
* @param pricingResult 가격 계산 결과 Map
*/
private void applyPricingResult(KakaoSendAdvcVO sendVO, Map<String, Object> pricingResult) {
sendVO.setSubMsgType((String) pricingResult.get("sendType"));
sendVO.setEachPrice((String) pricingResult.get("chosenPrice"));
if (pricingResult.get("filePath") != null) {
sendVO.setFilePath1((String) pricingResult.get("filePath"));
sendVO.setFileCnt("1");
}
}
public static String getMsgTypeWithByteValidation(MjonFTSendVO sendVO, String p_smsTxt) throws UnsupportedEncodingException {
// // 내문자저장함에 저장 문자를 발송하는 경우 문자 타입이 숫자가 아닌 문자로 넘어와서 변경 처리함
// if ("P".equals(msgType) || "L".equals(msgType)) {
// msgType = "6";
// } else if ("S".equals(msgType)) {
// msgType = "4";
// }
int smsTxtByte = MjonCommon.getSmsTxtBytes(p_smsTxt);
String msgType = SHORT_MSG_TYPE;
// 1. 2000 Byte 초과는 에러 처리
if (smsTxtByte > 2000) {
return "INVALID";
}
// 2. 첨부파일 여부 확인 (첨부파일이 있으면 장문으로 설정)
if (StringUtils.isNotEmpty(sendVO.getFilePath1())) {
msgType = LONG_MSG_TYPE;
}
// 3. 문자 길이에 따라 메시지 타입 설정 (90 Byte 초과는 장문)
else if (smsTxtByte > 90) {
msgType = LONG_MSG_TYPE;
}
return msgType;
}
private Calendar setupBaseDateFT(KakaoVO kakaoVO) throws ParseException {
// baseDate 추출
Date baseDate = resolveBaseDate(kakaoVO);
// 시간 성정
Calendar calendar = Calendar.getInstance();
calendar.setTime(baseDate); // calendar에 baseDate 설정
return calendar;
}
private Calendar setupBaseDate(KakaoVO kakaoVO, boolean isHolidayNotified) throws ParseException {
// baseDate 추출
Date baseDate = resolveBaseDate(kakaoVO);
// 시간 성정
Calendar calendar = Calendar.getInstance();
calendar.setTime(baseDate); // calendar에 baseDate 설정
@ -761,37 +293,12 @@ public class KakaoSendUtil {
// 지연 여부 처리
// 알림톡 스미싱의심 + 공휴일알림 조건이 맞으면 30분 delay
if ( "Y".equalsIgnoreCase(kakaoVO.getAtSmishingYn())
&& isHolidayNotified) {
&& isNotified) {
calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸
}
return calendar;
}
public Date resolveBaseDate(KakaoVO kakaoVO) throws ParseException {
Date now = new Date();
if (StringUtils.isEmpty(kakaoVO.getReqDate())) {
kakaoVO.setReqDate(DATE_FORMATTER.format(now));
return now;
}
return DATE_FORMATTER.parse(kakaoVO.getReqDate());
}
// 2. 친구톡 발송 제한 시간인지 확인
public boolean isRestrictedFriendTalkTime(Date baseDate) {
Calendar cal = Calendar.getInstance();
cal.setTime(baseDate);
int hour = cal.get(Calendar.HOUR_OF_DAY);
int minute = cal.get(Calendar.MINUTE);
// 20:50 이후 ~ 익일 08:00 이전은 제한
if ((hour == 20 && minute >= 50) || hour > 20 || hour < 8) {
return true;
}
return false;
}
/**
* @methodName : createSendVO
* @author : 이호영
@ -802,45 +309,14 @@ public class KakaoSendUtil {
* @return
*
*/
private KakaoSendAdvcVO createATSendVO(KakaoVO kakaoVO) {
private KakaoSendAdvcVO createSendVO(KakaoVO kakaoVO) {
KakaoSendAdvcVO sendVO = new KakaoSendAdvcVO();
sendVO.setMsgType("8");
sendVO.setAgentCode("04");
sendVO.setSenderKey(kakaoVO.getSenderKey());
sendVO.setTemplateCode(kakaoVO.getTemplateCode());
sendVO.setUserId(kakaoVO.getUserId());
sendVO.setCallFrom(kakaoVO.getCallFrom());
return sendVO;
}
/**
* @methodName : createFTSendVO
* @author : 이호영
* @date : 2025. 4. 23.
* @description :
* @return : KakaoSendAdvcVO
* @param kakaoVO
* @return
*
*/
private KakaoSendAdvcVO createFTSendVO(KakaoVO kakaoVO, Calendar calendar) {
KakaoSendAdvcVO sendVO = new KakaoSendAdvcVO();
sendVO.setMsgType("9"); // 알림톡 8 친구톡 9
sendVO.setAgentCode("04");
// 발송시간 : 친구톡은 분할 발송이 없어 처음 vo 생성 입력
sendVO.setReqDate(DATE_FORMATTER.format(calendar.getTime()));
sendVO.setSenderKey(kakaoVO.getSenderKey());
// sendVO.setTemplateCode(kakaoVO.getTemplateCode());
sendVO.setUserId(kakaoVO.getUserId());
sendVO.setCallFrom(kakaoVO.getCallFrom());
sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn());
sendVO.setAdFlag(kakaoVO.getAdFlag());
return sendVO;
}
@ -902,7 +378,7 @@ public class KakaoSendUtil {
}
public static Float getValidPrice(Float personalPrice, Float defaultPrice) {
public Float getValidPrice(Float personalPrice, Float defaultPrice) {
return (personalPrice != null && personalPrice > 0) ? personalPrice : defaultPrice;
}
@ -1216,10 +692,6 @@ public class KakaoSendUtil {
//카카오 친구톡 개인 단가가 없는 경우 시스템 단가로
if(mberManageVO.getKakaoFtPrice() == 0.0f)
mberManageVO.setKakaoFtPrice(sysJoinSetVO.getKakaoFtPrice());
if(mberManageVO.getKakaoFtImgPrice() == 0.0f)
mberManageVO.setKakaoFtImgPrice(sysJoinSetVO.getKakaoFtImgPrice());
if(mberManageVO.getKakaoFtWideImgPrice() == 0.0f)
mberManageVO.setKakaoFtWideImgPrice(sysJoinSetVO.getKakaoFtWideImgPrice());
// SMS 인경우
@ -1231,9 +703,7 @@ public class KakaoSendUtil {
// 사용자 개인 단가가 없으면 시스템 단가로
if(mberManageVO.getLongPrice() == 0.0f)
mberManageVO.setLongPrice(sysJoinSetVO.getLongPrice());
if(mberManageVO.getPicturePrice() == 0.0f)
mberManageVO.setPicturePrice(sysJoinSetVO.getPicturePrice());
return mberManageVO;
}
@ -1732,178 +1202,4 @@ public class KakaoSendUtil {
statusResponse.setMessage(msg);
}
// 보유 금액이 충분한지 확인하는 메서드
public boolean isCashSufficient(String userId, List<KakaoSendAdvcVO> kakaoSendAdvcListVO) throws Exception {
String userMoney = priceAndPoint.getBefCash(userId);
// 쉼표 제거
userMoney = userMoney.replace(",", "");
// 사용자 보유 금액 BigDecimal 변환 (HALF_EVEN 적용)
BigDecimal befCash = new BigDecimal(userMoney).setScale(2, RoundingMode.HALF_EVEN);
log.info(" + userMoney :: [{}]", userMoney);
log.info(" + befCash :: [{}]", befCash);
// 메시지 금액 계산 (HALF_EVEN 적용)
BigDecimal totalEachPrice = kakaoSendAdvcListVO.stream()
.map(msg -> new BigDecimal(String.valueOf(msg.getEachPrice()))) // 변환 오류 방지
.reduce(BigDecimal.ZERO, BigDecimal::add)
.setScale(2, RoundingMode.HALF_EVEN); // 일관성 유지
log.info(" + totalEachPrice :: [{}]", totalEachPrice);
// 비교 수행
return befCash.compareTo(totalEachPrice) >= 0;
}
/**
* @methodName : insertKakaoAtDataJsonInfo_advc
* @author : 이호영
* @date : 2025. 4. 24.
* @description : INSERT INTO BIZ_ATTACHMENTS
* @return : void
* @param kakaoSendAdvcListVO
*
*/
public void insertKakaoAtDataJsonInfo_advc(List<KakaoSendAdvcVO> kakaoSendAdvcListVO) {
List<KakaoSendAdvcVO> jsonInfoData = new ArrayList<>(kakaoSendAdvcListVO);
jsonInfoData.removeIf(t -> StringUtils.isBlank(t.getJsonStr()));
log.info(" + jsonInfoData Insert :: [{}]", jsonInfoData.size());
if(jsonInfoData.size() > 0) {
kakaoAlimTalkDAO.insertKakaoAtDataJsonInfo_advc(jsonInfoData);
}
}
/**
* @methodName : insertKakaoData_advc
* @author : 이호영
* @date : 2025. 3. 20.
* @description : 카카오 batch 발송 => mj_msg_data
* @return : int
* @param kakaoSendAdvcVOList
* @param parentLoopCount
* @param isJsonNotEmpty
* @param isJsonNameAllSame
* @return
*
*/
public int insertKakaoData_advc(List<KakaoSendAdvcVO> kakaoSendAdvcVOList) {
// 시작 시간 측정
long totalStartTime = System.currentTimeMillis();
int totalSize = kakaoSendAdvcVOList.size(); // 데이터 개수
// Batch 크기 설정 (고정값)
// int batchSize = 10000; 465
int batchSize = 50000; // 9분 18초
log.info("총 데이터 개수 :: [{}] ", totalSize);
log.info("설정된 Batch 크기 :: [{}] ", batchSize);
// insert 카운트
int instCnt = 0;
int batchCount = 0;
// 배치별 실행 시간 기록
List<Double> batchExecutionTimes = new ArrayList<>();
// 번째 배치에서만 삽입했는지 추적하는 플래그
for (int i = 0; i < totalSize; i += batchSize) {
// Batch 시작 시간 측정
long batchStartTime = System.currentTimeMillis();
// Batch 리스트 생성
List<KakaoSendAdvcVO> batchList = kakaoSendAdvcVOList.subList(i, Math.min(i + batchSize, totalSize));
System.out.println("Batch 시작 인덱스: " + i);
// mj_msg_data 테이블 insert
int insertedCount = kakaoAlimTalkDAO.insertKakaoAtDataInfo_advc(batchList);
/** @kakaoSendUtil.populateSendLists
* 하단에서
* getJsonStr 데이터 처리 활용
* */
instCnt += insertedCount;
// Batch 종료 시간 측정 실행 시간 계산
long batchEndTime = System.currentTimeMillis();
double batchExecutionTimeInSeconds = (batchEndTime - batchStartTime) / 1000.0;
// 실행 시간 기록
batchExecutionTimes.add(batchExecutionTimeInSeconds);
batchCount++;
}
// 종료 시간 측정
long totalEndTime = System.currentTimeMillis();
// 실행 시간 계산 (밀리초 -> 초로 변환)
double totalExecutionTimeInSeconds = (totalEndTime - totalStartTime) / 1000.0;
// 실행 시간 출력
log.info("총 배치 실행 횟수 :: [{}] ", batchCount);
log.info("batchSize :: [{}] ", batchSize);
log.info("총 실행 시간 :: [{}] ", totalExecutionTimeInSeconds + "");
log.info("총 삽입 건수 :: [{}] ", instCnt);
// 배치별 실행 시간 출력
for (int k = 0; k < batchExecutionTimes.size(); k++) {
System.out.println("배치 " + (k + 1) + " 실행 시간 :: " + batchExecutionTimes.get(k) + "");
}
return instCnt;
}
public void insertKakaoGroupDataTb_advc(int instCnt, KakaoVO kakaoVO, KakaoSendAdvcVO sendVO) throws Exception {
// TODO Auto-generated method stub
// log.info(" + insertKakaoGroupDataTb_advc kakaoVO :: \n[{}]", kakaoVO.toString());;
// log.info(" + insertKakaoGroupDataTb_advc kakaoSendAdvcVOList :: \n[{}]", sendVO.toString());
sendVO.setTemplateContent(kakaoVO.getTemplateContent());
sendVO.setMsgGroupCnt(Integer.toString(instCnt));
sendVO.setReserveYn(kakaoVO.getReserveYn());
sendVO.setBefCash(priceAndPoint.getBefCash(sendVO.getUserId()));
sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId()));
sendVO.setAdFlag(kakaoVO.getAdFlag());
sendVO.setSendKind(kakaoVO.getSendKind());
Float eachPrice = Float.parseFloat(sendVO.getEachPrice());
Float totPrice = eachPrice * instCnt;
sendVO.setTotPrice(String.format("%.1f", totPrice));
// sendVO.setAtDelayYn(kakaoVO.getAtDelayYn());
sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
sendVO.setBizKakaoImageType(kakaoVO.getImageType());
kakaoAlimTalkDAO.insertKakaoGroupDataTb_advc(sendVO);
}
}

View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import itn.com.cmm.MjonFTSendVO;
import itn.let.mjo.msg.service.MjonMsgVO;
import lombok.Getter;
import lombok.Setter;
@ -260,14 +259,9 @@ public class KakaoVO extends MjonMsgVO{
private String msgResendAllGroupId;
private String msgResendAllTmpKey;
private String msgResendAllYellowId;
private String bizKakaoResendType;
private String fileCnt;
private List<Map<String, String>> varListMap;
private List<MjonFTSendVO> mjonFTSendVOList = new ArrayList<>();
@Override
public String toString() {
String varListMapString = "[";
@ -292,18 +286,6 @@ public class KakaoVO extends MjonMsgVO{
}
varListMapString += "]";
StringBuilder mjonFTListSb = new StringBuilder("[");
if (mjonFTSendVOList != null && !mjonFTSendVOList.isEmpty()) {
String prefix = "";
for (MjonFTSendVO vo : mjonFTSendVOList) {
mjonFTListSb.append(prefix).append(vo == null ? "null" : vo.toString());
prefix = ", ";
}
}
mjonFTListSb.append("]");
return "KakaoSendAdvcVO[" +
"\n senderKey=[" + senderKey + "]" +
"\n , subMsgTxtReplYn=[" + subMsgTxtReplYn + "]" +
@ -330,69 +312,8 @@ public class KakaoVO extends MjonMsgVO{
"\n , varListMap=[" + varListMapString + "]" +
"\n , befCash=[" + getBefCash() + "]" +
"\n , befPoint=[" + getBefPoint() + "]" +
"\n , mjonFTSendVOList=" + mjonFTListSb.toString() +
"\n ]";
}
public String ftToString() {
StringBuilder sb = new StringBuilder("KakaoFTSendVO[");
sb.append("\n sendKind=[").append(getSendKind()).append("]");
sb.append("\n , senderKey=[").append(senderKey).append("]");
sb.append("\n , imageFileName=[").append(imageFileName).append("]");
sb.append("\n , imageType=[").append(imageType).append("]");
sb.append("\n , atchFileId=[").append(atchFileId).append("]");
// sb.append("\n , imgTitle=[").append(imgTitle).append("]");
// sb.append("\n , imgLink=[").append(imgLink).append("]");
sb.append("\n , templateContent=[").append(templateContent).append("]");
sb.append("\n , templateImageUrl=[").append(templateImageUrl).append("]");
// sb.append("\n , imgLink=[").append(imgLink).append("]");
// sb.append("\n , smsTxtArea=[").append(getSubMsgTxt()).append("]");
// sb.append("\n , subMsgSendYn=[").append(subMsgSendYn).append("]");
// sb.append("\n , subMsgTxtReplYn=[").append(subMsgTxtReplYn).append("]");
// sb.append("\n , subMsgType=[").append(subMsgType).append("]");
sb.append("\n , subMsgTxt=[").append(subMsgTxt).append("]");
sb.append("\n , subMsgSendYn=[").append(subMsgSendYn).append("]");
sb.append("\n , reserveYn=[").append(getReserveYn()).append("]");
// sb.append("\n , menuTopTab=[").append(menuTopTab).append("]");
// sb.append("\n , bizJsonYn=[").append(bizJsonYn).append("]");
sb.append("\n , callFrom=[").append(getCallFrom()).append("]");
// sb.append("\n , kakaoFtPrice=[").append(getEachPrice()).append("]");
sb.append("\n , reqDate=[").append(getReqDate()).append("]");
// sb.append("\n , spamStatus=[").append(getSpamStatus()).append("]");
// sb.append("\n , txtReplYn=[").append(getTxtReplYn()).append("]");
// sb.append("\n , atSmishingYn=[").append(getAtSmishingYn()).append("]");
// sb.append("\n , atDelayYn=[").append(getAtDelayYn()).append("]");
// sb.append("\n , filePath1=[").append(getFilePath1()).append("]");
// sb.append("\n , tmpBtnSelect=[").append(getTmpBtnSelect()).append("]");
StringBuilder btnListSb = new StringBuilder("[");
if (buttonVOList != null && !buttonVOList.isEmpty()) {
String prefix = "";
for (KakaoButtonVO btn : buttonVOList) {
btnListSb.append(prefix).append(btn == null ? "null" : btn.toString());
prefix = ", ";
}
}
btnListSb.append("]");
sb.append("\n , buttonVOList=").append(btnListSb);
// mjonFTSendVOList 내용
StringBuilder ftList = new StringBuilder("[");
if (mjonFTSendVOList != null && !mjonFTSendVOList.isEmpty()) {
String prefix = "";
for (MjonFTSendVO vo : mjonFTSendVOList) {
ftList.append(prefix).append(vo == null ? "null" : vo.toString());
prefix = ", ";
}
}
ftList.append("]");
sb.append("\n , mjonFTSendVOList=").append(ftList);
sb.append("\n]");
return sb.toString();
}
}

View File

@ -5,10 +5,7 @@ import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
@ -18,9 +15,6 @@ import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -36,21 +30,16 @@ import org.apache.http.util.EntityUtils;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import egovframework.rte.fdl.property.EgovPropertyService;
import itn.com.cmm.service.EgovFileMngService;
import itn.com.cmm.service.EgovFileMngUtil;
import itn.com.cmm.service.FileVO;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.mail.service.StatusResponse;
import itn.let.utl.fcc.service.EgovStringUtil;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Component("kakaoApiImageUpload")
public class KakaoApiImageUpload {
@ -68,17 +57,7 @@ public class KakaoApiImageUpload {
@Resource(name = "propertiesService")
protected EgovPropertyService propertyService;
/** 첨부파일 저장경로 */
@Value("#{globalSettings['Globals.file.saveDir']}")
private String fileSaveDir;
@Resource(name="EgovFileMngUtil")
private EgovFileMngUtil fileUtil;
@Resource(name="EgovFileMngService")
private EgovFileMngService fileMngService;
/**
* @Method Name : kakaoApiImageUpload
@ -240,13 +219,13 @@ public class KakaoApiImageUpload {
.addTextBody("bizId", mjonBizId)
.addTextBody("apiKey", mjonBizKakaoApiKey)
.addTextBody("imageType", kakaoVO.getImageType())
.addTextBody("title", "test")
.addTextBody("link", "https://maaa.com")
.addTextBody("title", kakaoVO.getImgTitle())
.addTextBody("link", kakaoVO.getImgLink())
.addTextBody("senderKey", kakaoVO.getSenderKey())
.addBinaryBody("image", new File(filePath),ContentType.MULTIPART_FORM_DATA,fullFileName)
.build();
httpPost.setEntity(httpEntity);
httpPost.setEntity(httpEntity);
CloseableHttpResponse response = httpClient.execute(httpPost);
@ -266,7 +245,6 @@ public class KakaoApiImageUpload {
String msg = object.get("message").toString();
String imgUrl = "";
log.info(" : code :: [{}]", code);
if(code.equals("200")) {
imgUrl = object.get("image").toString();
}
@ -295,176 +273,6 @@ public class KakaoApiImageUpload {
}
/**
* @methodName : kakaoApiImageUpload_advc
* @author : 이호영
* @date : 2025. 6. 4.
* @description : kakaoApiImageUpload 수정
* @return : StatusResponse
* @param kakaoVO
* @param files
* @param i
* @return
* @throws Exception
*
*/
public StatusResponse kakaoApiImageUpload_advc(KakaoVO kakaoVO, Map<String, MultipartFile> files, int fileKeyParam) throws Exception {
// try {
String storePathString = propertyService.getString("Globals.fileStorePath");
File saveFolder = new File(storePathString);
if (!saveFolder.exists()) saveFolder.mkdirs();
// for (MultipartFile file : files.values()) {
MultipartFile file = files.values().stream().findFirst().orElse(null);
if (file == null || file.isEmpty()) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "유효한 이미지 파일이 없습니다.", LocalDateTime.now());
}
String originalName = file.getOriginalFilename();
if (originalName == null || originalName.isEmpty()) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "파일명이 비어 있습니다.", LocalDateTime.now());
}
String ext = FilenameUtils.getExtension(originalName).toLowerCase();
if (!ext.matches("jpg|jpeg|png")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "지원하지 않는 이미지 형식입니다.");
}
long size = file.getSize();
if (size > 5 * 1024 * 1024) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "이미지 용량은 5MB 이내여야 합니다.");
}
BufferedImage image = ImageIO.read(file.getInputStream());
if (image == null) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "이미지를 읽을 수 없습니다.");
}
int width = image.getWidth();
int height = image.getHeight();
String type = kakaoVO.getImageType();
if ("W".equals(type)) {
if (width != 800 || height != 600) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "와이드 이미지는 800x600 사이즈만 허용됩니다.");
}
} else {
float ratio = width / (float) height;
// log.info("width : [{}], ",width);
// log.info("height : [{}], ",height);
// log.info("ratio : [{}], ",ratio);
if (width < 500 || ratio < 0.75 || ratio > 2.0) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "일반 이미지는 가로 500px 이상, 비율 2:1 이상 또는 3:4 이하만 허용됩니다.");
}
}
String atchFileId = this.saveImgFile(files);
String newName = EgovStringUtil.getTimeStamp() + fileKeyParam;
String filePath = storePathString + File.separator + newName + "." + ext;
file.transferTo(new File(filePath));
// 카카오 API 호출
CloseableHttpClient httpClient = HttpClients.createDefault();
String apiUrl = mjonBizUrl + "/v3/kakao/image/upload";
HttpPost httpPost = new HttpPost(apiUrl);
/*HttpEntity httpEntity = MultipartEntityBuilder.create()
.addTextBody("bizId", mjonBizId)
.addTextBody("apiKey", mjonBizKakaoApiKey)
.addTextBody("imageType", kakaoVO.getImageType())
.addTextBody("title", kakaoVO.getImgTitle())
.addTextBody("link", kakaoVO.getImgLink())
.addTextBody("senderKey", kakaoVO.getSenderKey())
.addBinaryBody("image", new File(filePath), ContentType.MULTIPART_FORM_DATA, newName + "." + ext)
.build();
*/
HttpEntity httpEntity = MultipartEntityBuilder.create()
.addTextBody("bizId", mjonBizId)
.addTextBody("apiKey", mjonBizKakaoApiKey)
.addTextBody("imageType", kakaoVO.getImageType())
.addTextBody("title", originalName)
.addTextBody("link", StringUtils.isEmpty(kakaoVO.getImgLink()) ? "https://" : kakaoVO.getImgLink())
.addTextBody("senderKey", kakaoVO.getSenderKey())
.addBinaryBody("image", new File(filePath), ContentType.MULTIPART_FORM_DATA, newName + "." + ext)
.build();
;
httpPost.setEntity(httpEntity);
CloseableHttpResponse response = httpClient.execute(httpPost);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == 200) {
String result = EntityUtils.toString(response.getEntity(), "UTF-8");
JSONParser parser = new JSONParser();
JSONObject object = (JSONObject) parser.parse(result);
log.info("object + :: [{}]", object.toJSONString());
String code = object.get("code").toString();
if ("200".equals(code)) {
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("imgUrl", object.get("image").toString());
returnMap.put("fileName", originalName);
returnMap.put("atchFileId", atchFileId);
return new StatusResponse(HttpStatus.OK, "이미지 등록이 완료 되었습니다.", returnMap);
} else {
return new StatusResponse(HttpStatus.BAD_REQUEST, object.get("message").toString(), LocalDateTime.now());
}
} else {
return new StatusResponse(HttpStatus.BAD_REQUEST, "카카오 API 요청 실패", LocalDateTime.now());
}
// }
// } catch (Exception e) {
// log.error("kakaoApiImageUpload_advc API Error", e);
// return new StatusResponse(HttpStatus.BAD_REQUEST, "친구톡 이미지 등록에 실패했습니다.", LocalDateTime.now());
// }
}
private String saveImgFile(Map<String, MultipartFile> files) throws Exception {
String atchFileId = "";
String isThumbFile = "";
String imagePath = "";
String KeyStr = "CANVASIMG_";
Date now = new Date();
SimpleDateFormat formatDate = new SimpleDateFormat("yyyyMMdd");
String fdlDate = formatDate.format(now);
imagePath = fileSaveDir+"/file/MMS/" + fdlDate;
if (!files.isEmpty()) {
List<FileVO> result = fileUtil.parseImageFileInf(files, KeyStr, 0, atchFileId, imagePath, isThumbFile);
atchFileId = fileMngService.insertFileInfs(result);
}
return atchFileId;
}
/**
* @Method Name : kakaoApiTemplateImageUpload
* @작성일 : 2023. 2. 16.
@ -680,20 +488,17 @@ public class KakaoApiImageUpload {
jsonObject.put("apiKey", mjonBizKakaoApiKey);
jsonObject.put("imageUrl", kakaoVO.getTemplateImageUrl());
log.info("kakaoVO.getTemplateImageUrl() :: [{}]", kakaoVO.getTemplateImageUrl());
HttpClient httpClient = HttpClientBuilder.create().build();
HttpPost httpPost = new HttpPost(sendUrl);
httpPost.setEntity(new StringEntity(jsonObject.toString(), "UTF-8"));
httpPost.addHeader("Content-type", "application/json");
httpPost.addHeader("Accept", "application/json");
httpPost.addHeader("Accept", "application/json");
HttpResponse response = httpClient.execute(httpPost);
String result = "";
String statusCode = Integer.toString(response.getStatusLine().getStatusCode());
log.info(" + statusCode :: [{}]", statusCode);
if(statusCode.equals("200")) {
result = EntityUtils.toString(response.getEntity());
@ -723,7 +528,5 @@ public class KakaoApiImageUpload {
return kakaoReturnVO;
}
}

View File

@ -10,18 +10,12 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import itn.com.cmm.util.StringUtil;
import itn.let.kakao.kakaoComm.KakaoButtonVO;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
@ -214,139 +208,6 @@ public class KakaoApiJsonSave {
return jsonFileName;
}
/*
* 친구톡 발송시 이미지, 버튼 추가에 따른 Json 파일 생성
* 2025.04.18
* 우영두
* 파일은 하나만 생성해서 동일하게 사용함.
*
* */
public String kakaoApiFTJsonSave_advc(KakaoVO kakaoVO) throws JsonProcessingException {
// json파일 저장
ObjectMapper mapper = new ObjectMapper();
ObjectNode jo = mapper.createObjectNode();
// 버튼
if (kakaoVO.getButtonVOList() != null && !kakaoVO.getButtonVOList().isEmpty()) {
ArrayNode buttonList = mapper.createArrayNode();
for (KakaoButtonVO buttonInfoVO : kakaoVO.getButtonVOList()) {
ObjectNode button = mapper.createObjectNode();
button.put("name", buttonInfoVO.getName());
button.put("type", buttonInfoVO.getLinkType());
switch (buttonInfoVO.getLinkType()) {
case "WL":
button.put("url_mobile", buttonInfoVO.getLinkMo());
button.put("url_pc", buttonInfoVO.getLinkPc());
break;
case "AL":
button.put("scheme_ios", buttonInfoVO.getLinkIos());
button.put("scheme_android", buttonInfoVO.getLinkAnd());
break;
case "BC":
// 상담톡
break;
case "BT":
// 전환
break;
}
buttonList.add(button);
}
jo.set("button", buttonList);
}
// 이미지
String imageType = kakaoVO.getImageType();
if (StringUtils.isNotEmpty(imageType)) {
ObjectNode image = mapper.createObjectNode();
image.put("img_url", kakaoVO.getTemplateImageUrl());
image.put("img_link", StringUtils.isNotEmpty(kakaoVO.getImgLink()) ? kakaoVO.getImgLink() : kakaoVO.getTemplateImageUrl());
jo.set("image", image);
// wide 여부
if ("W".equals(imageType)) {
ObjectNode extra = mapper.createObjectNode();
extra.put("wide", "Y");
jo.set("extra", extra);
}
}
// 문자열로 변환 (이스케이프 없음)
return mapper.writeValueAsString(jo);
/*
// 버튼리스트 JSON 생성
JSONArray buttonList = new JSONArray();
for(KakaoButtonVO buttonInfoVO : kakaoVO.getButtonVOList()) {
JSONObject buttonInfo = new JSONObject();
buttonInfo.put("name", buttonInfoVO.getName());
buttonInfo.put("type", buttonInfoVO.getLinkType());
if(buttonInfoVO.getLinkType().equals("WL")) {
buttonInfo.put("url_mobile", buttonInfoVO.getLinkMo());
buttonInfo.put("url_pc", buttonInfoVO.getLinkPc());
}else if(buttonInfoVO.getLinkType().equals("AL")) {
buttonInfo.put("scheme_ios", buttonInfoVO.getLinkIos());
buttonInfo.put("scheme_android", buttonInfoVO.getLinkAnd());
}else if(buttonInfoVO.getLinkType().equals("BC")) {
// 상담톡 진행시 등록해야함
}else if(buttonInfoVO.getLinkType().equals("BT")) {
// 전환 전달
}
buttonList.add(buttonInfo);
}
// 강조유형 JSON 생성
JSONObject templateImageInfo = new JSONObject();
JSONObject templateImageExtInfo = new JSONObject();
String imageType = kakaoVO.getImageType();
if(StringUtils.isNotEmpty(imageType)) {
templateImageInfo.put("img_url", kakaoVO.getTemplateImageUrl());
templateImageInfo.put("img_link", StringUtils.isNotEmpty(kakaoVO.getImgLink()) ? kakaoVO.getImgLink() : kakaoVO.getTemplateImageUrl() );
}
// wide 여부
if ("W".equals(imageType)) {
ObjectNode extra = mapper.createObjectNode();
extra.put("wide", "Y");
jo.set("extra", extra);
}
JSONObject jo = new JSONObject();
if(buttonList.size() != 0) {
jo.put("button", buttonList);
}
if(templateImageInfo.size() != 0) {
jo.put("image", templateImageInfo);
}
if(templateImageExtInfo.size() != 0) {
jo.put("extra", templateImageExtInfo);
}
// 입력 json 데이터를 파일로 변경
String jsonStr = jo.toString();
return jsonStr;*/
}
/*
* 친구톡 발송시 이미지, 버튼 추가에 따른 Json 파일 생성
* 2024.01.17
@ -437,7 +298,7 @@ public class KakaoApiJsonSave {
// 입력 json 데이터를 파일로 변경
String jsonStr = jo.toString();
System.out.println("jsonFileName : "+jsonFileName);
File outPut = new File(jsonFileName);
outPut.createNewFile();

View File

@ -148,8 +148,24 @@ public class KakaoApiProfile {
kakaoReturnVO.setBizReturnMsg(msg);
if(code.equals("200")) {
kakaoReturnVO.setSenderKey((String) ((JSONObject) object.get("data")).get("senderKey"));
JSONObject tempCate = (JSONObject) object.get("data");
String senderKey = tempCate.get("senderKey").toString();
kakaoVO.setSenderKey(senderKey);
int profileCnt = kakaoApiService.selectKakaoProfileCnt(kakaoVO);
//중복된 발신프로필이 없으면 추가 입력
if(profileCnt == 0) {
kakaoApiService.insertKakaoProfileInfo(kakaoVO);
}else {//중복이 있는 경우 처리
kakaoReturnVO.setBizReturnCode("310");
kakaoReturnVO.setBizReturnMsg("이미 등록되어 있는 발신프로필 입니다");
return kakaoReturnVO;
}
}
}else {
kakaoReturnVO.setBizReturnCode(statusCode);
@ -214,8 +230,7 @@ public class KakaoApiProfile {
if(code.equals("200")) {
JSONObject templateProfile = (JSONObject) object.get("data");
System.out.println("templateProfile = " + templateProfile.toJSONString());
String senderKey = getStringValue(templateProfile, "senderKey"); //발신프로필키
String uuid = getStringValue(templateProfile, "uuid"); //카카오톡 채널
String name = getStringValue(templateProfile, "name"); //카카오톡 채널 발신프로필

View File

@ -30,6 +30,115 @@ public class KakaoFTJsonSave {
static String json;
@SuppressWarnings("unchecked")
public String kakaoApiJsonSave(KakaoVO kakaoVO, String[] varValInfo) {
// json파일 저장
Date nowDate = new Date();
SimpleDateFormat todayFrom = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat timeFrom = new SimpleDateFormat("HHmmss");
String jsonFileName = mjonBizJsonDir+"/"+kakaoVO.getUserId()+"/"+todayFrom.format(nowDate)+"/"+kakaoVO.getSendType(); // 아이디/날짜/타입
String fileName = timeFrom.format(nowDate)+"_"+kakaoVO.getDestPhone()+".json";
try {
File userIdFile = new File(jsonFileName);
if(!userIdFile.exists()) {
userIdFile.mkdirs(); // 없으면 하위 디렉토리 까지 생성
jsonFileName = jsonFileName +"/"+fileName;
}else {
jsonFileName = jsonFileName +"/"+fileName;
System.out.println("jsonFileName : "+jsonFileName);
File file1 = new File(jsonFileName);
if (file1.isFile()) {
return jsonFileName;
}
}
KakaoReturnVO templateDetail = kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
// 버튼리스트 JSON 생성
JSONArray buttonList = new JSONArray();
// 버튼 수량 체크 진행
for(KakaoButtonVO buttonInfoVO : templateDetail.getButtonList()) {
JSONObject buttonInfo = new JSONObject();
buttonInfo.put("name", buttonInfoVO.getName());
buttonInfo.put("type", buttonInfoVO.getLinkType());
if(buttonInfoVO.getLinkType().equals("WL")) {
buttonInfo.put("url_mobile", buttonInfoVO.getLinkMo());
buttonInfo.put("url_pc", buttonInfoVO.getLinkPc());
}else if(buttonInfoVO.getLinkType().equals("AL")) {
buttonInfo.put("scheme_ios", buttonInfoVO.getLinkIos());
buttonInfo.put("scheme_android", buttonInfoVO.getLinkAnd());
}else if(buttonInfoVO.getLinkType().equals("BC")) {
// 상담톡 진행시 등록해야함
}else if(buttonInfoVO.getLinkType().equals("BT")) {
// 전환 전달
}
buttonList.add(buttonInfo);
}
// Image JSON 생성
JSONObject imageJson = new JSONObject();
// img형과 wide 형인경우만 등록 (if문으로 제어)
imageJson.put("img_url", "등록된 이미지 URL");
imageJson.put("img_link", "이동 페이지 URL");
// Wide JSON 생성
JSONObject wideJson = new JSONObject();
// wide 형인경우만 등록(if문으로 제어)
wideJson.put("wide", "Y");
JSONObject jo = new JSONObject();
if(imageJson.size() != 0) {
jo.put("image", imageJson);
}
if(wideJson.size() != 0) {
jo.put("extra", wideJson);
}
if(buttonList.size() != 0) {
jo.put("button", buttonList);
}
// 입력 json 데이터를 파일로 변경
String jsonStr = jo.toString();
System.out.println("jsonFileName : "+jsonFileName);
File outPut = new File(jsonFileName);
outPut.createNewFile();
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outPut), "euc-kr"));
bw.write(jsonStr);
bw.close();
} catch (IOException e) {
System.out.println("json 생성 실패");
e.printStackTrace();
}
return jsonFileName;
}
@SuppressWarnings("unchecked")
public String kakaoApiJsonSave(KakaoVO kakaoVO) {

View File

@ -4,7 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
@ -23,13 +23,12 @@ public interface KakaoAlimTalkService {
//카카오 친구톡 발신
public MjonMsgReturnVO insertKakaoFtSendAjax(KakaoVO kakaoVO) throws Exception;
//카카오 알림톡 전송 실패 환불리스트 조회
public void selectKakaoAtSentRefundList() throws Exception;
//카카오 친구톡 전송 실패 환불리스트 조회
public void selectKakaoFtSentRefundList() throws Exception;
StatusResponse insertKakaoAtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception;
//카카오(알림톡, 친구톡 통합) 전송 실패 환불리스트 조회
public List<KakaoVO> selectKakaoSentRefundListForSingle() throws Exception;
public void kakaoSingleRefund(KakaoVO kakaoVO) throws Exception;
//발신 프로필 등록 처리
public KakaoReturnVO createKaKaoProfile(KakaoVO kakaoVO) throws Exception;
}

View File

@ -49,8 +49,13 @@ public class KakaoAlimTalkDAO extends EgovAbstractDAO {
}
@SuppressWarnings("unchecked")
public List<KakaoVO> selectKakaoSentRefundList() throws Exception{
return (List<KakaoVO>) list("kakaoAlimTalkDAO.selectKakaoSentRefundList");
public List<KakaoVO> selectKakaoAtSentRefundList() throws Exception{
return (List<KakaoVO>) list("kakaoAlimTalkDAO.selectKakaoAtSentRefundList");
}
@SuppressWarnings("unchecked")
public List<KakaoVO> selectKakaoFtSentRefundList() throws Exception{
return (List<KakaoVO>) list("kakaoAlimTalkDAO.selectKakaoFtSentRefundList");
}
public KakaoVO selectKakaoAtUmid(KakaoVO kakaoVO) throws Exception{
@ -103,9 +108,4 @@ public class KakaoAlimTalkDAO extends EgovAbstractDAO {
public void insertKakaoGroupDataTb_advc(KakaoSendAdvcVO sendVO) {
insert("kakaoAlimTalkDAO.insertKakaoGroupDataTb_advc", sendVO);
}
public KakaoVO selectBizLog(String bizUmid) {
return (KakaoVO) select("kakaoAlimTalkDAO.selectBizLog", bizUmid);
// return (KakaoVO) select("kakaoAlimTalkDAO.selectKakaoAtUmid", bizUmid);
}
}

View File

@ -11,6 +11,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -25,13 +27,11 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import itn.com.cmm.LoginVO;
import itn.com.cmm.MjonMsgSendVO;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.kakao.kakaoComm.BizKakaoPriceVO;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoSendUtil;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.mjocommon.MjonCommon;
@ -45,11 +45,11 @@ import itn.let.mjo.msgholiday.service.MsgHolidayVO;
import itn.let.mjo.msgholiday.service.impl.MsgHolidayDAO;
import itn.let.mjo.pay.service.MjonPayService;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.mjo.pay.service.impl.MjonPayDAO;
import itn.let.module.base.PriceAndPoint;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.sym.site.service.impl.SiteManagerDAO;
import itn.let.uss.umt.service.EgovUserManageService;
import itn.let.uss.umt.service.UserManageVO;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@ -87,12 +87,6 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
@Resource(name = "userManageService")
private EgovUserManageService userManageService;
@Resource(name = "kakaoApiService")
private KakaoApiService kakaoApiService;
@Autowired
private MjonPayDAO mjonPayDAO;
@Autowired
KakaoSendUtil kakaoSendUtil;
@ -101,13 +95,6 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
@Autowired
private PriceAndPoint priceAndPoint;
final String KAKAO_SUCCESS_CODE = "7000";
final String RESEND_YN_YES = "Y";
final String SMS_SUCCESS_CODE = "4100"; // SMS 성공 코드
final String MMS_SUCCESS_CODE = "6600"; // MMS 성공 코드
final String AT_MSG_TYPE = "8"; // MSG 타입 알림톡
final String FT_MSG_TYPE = "9"; // MSG 타입 친구톡
//발신프로필 상태값 변경(삭제/복구 기능)
@Override
@ -796,82 +783,86 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
return returnVO;
}
private void processKakaoSendCharge(KakaoVO kakaoVO) throws Exception {
/*
* 카카오 알림톡 발송 실패에 따른 금액 환불 처리
*
* */
@Override
public void selectKakaoAtSentRefundList() throws Exception {
//1-1.카카오톡 발송 성공 + 대체문자 신청 O : 대체문자 금액 환불
if(RESEND_YN_YES.equals(kakaoVO.getSubMsgSendYn())) {
BizKakaoPriceVO bizKakaoPriceVO = mjonPayDAO.selectBizKakaoPrice(kakaoVO.getMsgGroupId());
BigDecimal sendPrice = null;
if(AT_MSG_TYPE.equals(kakaoVO.getMsgType())){
sendPrice = new BigDecimal(bizKakaoPriceVO.getBizKakaoAtPrice());
}else {
if(StringUtils.isEmpty(kakaoVO.getBizKakaoImageType())){
sendPrice = new BigDecimal(bizKakaoPriceVO.getBizKakaoFtPrice());
}else if("I".equals(kakaoVO.getBizKakaoImageType())){
sendPrice = new BigDecimal(bizKakaoPriceVO.getBizKakaoFtImgPrice());
}else if("W".equals(kakaoVO.getBizKakaoImageType())){
sendPrice = new BigDecimal(bizKakaoPriceVO.getBizKakaoFtWideImgPrice());
/**
* 1. 카카오 AT 전송성공 확인
* 2. 카카오 AT 전송실패, 대채문자 전송확인
* 3. 카카오 AT 전송 실패 확인
*/
List<KakaoVO> kakaoAtSentRefundList = kakaoAlimTalkDAO.selectKakaoAtSentRefundList();
for(KakaoVO vo : kakaoAtSentRefundList) {
System.out.println(vo.getMsgGroupId() +"________결과 : " +vo.getRsltCode() +" 대체문자 전송 : "+vo.getSubMsgSendYn());
if(vo.getRsltCode().equals("7000")) {
kakaoAlimTalkDAO.updateKakaoAtSend(vo);
}else if(vo.getSubMsgSendYn().equals("Y")) {
KakaoVO info = kakaoAlimTalkDAO.selectKakaoAtUmid(vo);
System.out.println("대체문자 전송 : " + info.getBizUmid());
if (info.getBizUmid() != null) {
kakaoAlimTalkDAO.updateKakaoAtSubMsgSend(vo);
}else {
kakaoAlimTalkDAO.updateKakaoAtNotSend(vo);
}
}else {
kakaoAlimTalkDAO.updateKakaoAtNotSend(vo);
}
// 예시: 건당 가격이 이미 String 형태라면 변환
BigDecimal eachPrice = new BigDecimal(kakaoVO.getEachPrice());
// 차이 계산
BigDecimal diffPrice = eachPrice.subtract(sendPrice);
//대체문자 비용(eachPrace - sendPrice)
if (diffPrice.compareTo(BigDecimal.ZERO) > 0) {
String result = diffPrice.toString();
kakaoVO.setEachPrice(result);
handleRefund(kakaoVO, "카카오 " + kakaoVO.getMsgTypeTxt() + " 발송 성공 후 대체문자 금액 환불");
}
}
//1-2.카카오톡 발송 성공 + 대체문자 신청 X : 금액 환불 X
}
private void handleAlternativeMessageScenario(KakaoVO kakaoVO) throws Exception {
KakaoVO bizLogVO = kakaoAlimTalkDAO.selectBizLog(kakaoVO.getBizUmid());
log.info("대체문자 전송 UMID: {}", kakaoVO.getBizUmid());
//2-1.카카오톡 발송 실패 + 대체문자 발송 성공 : 금액 환불 X
boolean isAlternativeMessageSuccessful = false;
if (bizLogVO != null && StringUtils.isNotEmpty(bizLogVO.getBizLogCallStatus())) {
if (SMS_SUCCESS_CODE.equals(bizLogVO.getBizLogCallStatus())
|| MMS_SUCCESS_CODE.equals(bizLogVO.getBizLogCallStatus())) {
isAlternativeMessageSuccessful = true;
}
log.info("bizLogVO.getBizLogCallStatus() :: [{}]", bizLogVO.getBizLogCallStatus());
log.info("isAlternativeMessageSuccessful :: [{}]", isAlternativeMessageSuccessful);
}
//2-2.카카오톡 발송 실패 + 대체문자 발송 실패 : 전액 환불
if (!isAlternativeMessageSuccessful) {
handleRefund(kakaoVO, "카카오 " + kakaoVO.getMsgTypeTxt() + " 전송 실패로 인한 결제 금액 환불");
}
}
private void handleRefund(KakaoVO vo, String msg) throws Exception {
// mj_cash 테이블에 환불 내역 추가 회원 금액 업데이트
// eachPrice는 환불될 금액이므로 양수여야 합니다.
priceAndPoint.insertCashAndPointNoUpdate(
vo.getUserId(),
Float.parseFloat(vo.getEachPrice()), // 환불 금액은 양수
msg,
vo.getMsgGroupId(),
vo.getUserData()
);
/*
* 카카오 친구톡 발송 실패에 따른 금액 환불 처리
* 카카오 친구톡 대체문자 선택에 대해 성공시 친구톡과 문자 금액 차액의 환불도 처리 .
* */
@Override
public void selectKakaoFtSentRefundList() throws Exception {
/**
* 1. 카카오 FT 전송성공 확인
* 2. 카카오 FT 전송실패, 대채문자 전송확인
* 3. 카카오 FT 전송 실패 확인
*/
List<KakaoVO> kakaoFtSentRefundList = kakaoAlimTalkDAO.selectKakaoFtSentRefundList();
for(KakaoVO vo : kakaoFtSentRefundList) {
System.out.println(vo.getMsgGroupId() +"________결과 : " +vo.getRsltCode() +" 대체문자 전송 : "+vo.getSubMsgSendYn());
if(vo.getRsltCode().equals("7000")) {//친구톡 발송 성공시
kakaoAlimTalkDAO.updateKakaoFtSend(vo);
}else if(vo.getSubMsgSendYn().equals("Y")) {//친구톡 발송 실패 했을 경우
//대체문자 발송 UMID 번호 조회 - 알림톡 쿼리 동일하게 사용
KakaoVO info = kakaoAlimTalkDAO.selectKakaoAtUmid(vo);
System.out.println("대체문자 전송 : " + info.getBizUmid());
if (info.getBizUmid() != null) {//대체문자 발송 완료인 경우
kakaoAlimTalkDAO.updateKakaoAtSubMsgSend(vo);
}else {
kakaoAlimTalkDAO.updateKakaoFtNotSend(vo);
}
}else {
kakaoAlimTalkDAO.updateKakaoFtNotSend(vo);
}
}
}
@Override
public StatusResponse insertKakaoAtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception {
log.info(" :: [{}]", kakaoVO.toString());
// log.info(" :: [{}]", kakaoVO.toString());
// 측정할 메소드 호출 시간 기록
@ -879,25 +870,17 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
// KakaoSendAdvcVO
Map<String, Object> returnMap = new HashMap<>();
Map<String, Object> apiReturnMap = new HashMap<>();
String userId = "";
if("A".equals(kakaoVO.getSendKind()))
{
userId = kakaoVO.getMberId();
}else {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
: null;
userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if (userId.equals("")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용이 가능합니다.");
}
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
: null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if (userId.equals("")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용이 가능합니다.");
}
kakaoVO.setUserId(userId);
kakaoVO.setUserId(userId);
/**
* 회원 정지된 상태이면 문자 발송이 안되도록 처리함 현재 로그인 세션도 만료 처리함
@ -907,7 +890,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
request.getSession().invalidate();
// UNAUTHORIZED : 인증되지 않은 사용자가 접근하려고
return new StatusResponse(HttpStatus.UNAUTHORIZED,
"현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 알림톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.", "STAT_1070");
"현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 알림톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.");
}
@ -930,16 +913,15 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
/** @전송금액 확인 --------------------------------------------------*/
if (!kakaoSendUtil.isCashSufficient(userId, kakaoSendAdvcListVO)) {
if (!isCashSufficient(userId, kakaoSendAdvcListVO)) {
log.error("Insufficient balance for message sending.");
return new StatusResponse(HttpStatus.BAD_REQUEST, "문자 발송에 필요한 보유 잔액이 부족 합니다.", "STAT_1060");
return new StatusResponse(HttpStatus.BAD_REQUEST, "문자 발송에 필요한 보유 잔액이 부족 합니다.");
}
/** @json파일이 있을 떄 biz_attachments insert */
kakaoSendUtil.insertKakaoAtDataJsonInfo_advc(kakaoSendAdvcListVO);
// this.insertKakaoAtDataJsonInfo_advc(kakaoSendAdvcListVO);
this.insertKakaoAtDataJsonInfo_advc(kakaoSendAdvcListVO);
Map<String, List<KakaoSendAdvcVO>> priceGroupedMessages = kakaoSendAdvcListVO.stream()
@ -949,8 +931,6 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
// 임시
List<String> nextMsgGroupIdA = new ArrayList<>();
// 대안: entrySet() 직접 사용
String apiMsgGroupId = "";
String apiMsgType = "";
for (Map.Entry<String, List<KakaoSendAdvcVO>> entry : priceGroupedMessages.entrySet()) {
// entry 사용
@ -960,31 +940,8 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
groupedMsgList.forEach(t -> t.setMsgGroupId(nextMsgGroupId));
// api 전달
apiMsgGroupId = StringUtils.isNotEmpty(apiMsgGroupId)
? apiMsgGroupId + "," + nextMsgGroupId
: nextMsgGroupId;
apiMsgType = StringUtils.isNotEmpty(apiMsgType)
? apiMsgType + "," + kakaoSendAdvcListVO.get(0).getMsgType()
: kakaoSendAdvcListVO.get(0).getMsgType();
groupedMsgList.stream().forEach(t-> log.info("t.toString() [{}]", t.toString()));
//
// if(1==1) {
//
// // 강제로 예외 발생
// throw new RuntimeException("강제 예외 발생 테스트");
// }
//
//
// 발송 데이터 삽입
int instCnt = kakaoSendUtil.insertKakaoData_advc(groupedMsgList);
int instCnt = this.insertKakaoData_advc(groupedMsgList);
// int instCnt = 6;
if(instCnt > 0) {
@ -993,10 +950,8 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
KakaoSendAdvcVO sendVO = groupedMsgList.get(0);
// log.info(" ++ kakaoVO.getAtSmishingYn() :: [{}]", kakaoVO.getAtSmishingYn());
// log.info(" ++ kakaoVO.getAtDelayYn() :: [{}]", kakaoVO.getAtDelayYn());
/** @groupData 테이블 insert */
kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
this.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
@ -1040,14 +995,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
}
apiReturnMap.put("resultSts", instTotalCnt);
// 그룹 ID
apiReturnMap.put("msgGroupId", apiMsgGroupId);
// 메세지 타입
apiReturnMap.put("msgType", apiMsgType);
returnMap.put("resultSts", instTotalCnt);
returnMap.put("reserYn", kakaoVO.getReserveYn());
returnMap.put("groupIds", nextMsgGroupIdA);
@ -1077,39 +1025,12 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
statusResponse.setStatus(HttpStatus.OK);
statusResponse.setObject(returnMap);
apiReturnMap.put("result", HttpStatus.OK);
apiReturnMap.put("message", "전송이 완료되었습니다.");
statusResponse.setApiReturn(apiReturnMap);
return statusResponse;
}
@Override
public List<KakaoVO> selectKakaoSentRefundListForSingle() throws Exception{
return kakaoAlimTalkDAO.selectKakaoSentRefundList();
}
@Override
public void kakaoSingleRefund(KakaoVO kakaoVO) throws Exception {
System.out.println(kakaoVO.getMsgGroupId() +"________결과 : " +kakaoVO.getRsltCode() +" 대체문자 전송 : "+kakaoVO.getSubMsgSendYn());
kakaoVO.setMsgTypeTxt(AT_MSG_TYPE.equals(kakaoVO.getMsgType()) ? "알림톡" : "친구톡");
if(KAKAO_SUCCESS_CODE.equals(kakaoVO.getRsltCode())) {
//1.카카오톡 발송 성공
processKakaoSendCharge(kakaoVO);
}else if(RESEND_YN_YES.equals(kakaoVO.getSubMsgSendYn())) {//카카오톡 발송 실패, 대체문자 발송 신청 O
//2.카카오톡 발송 실패 + 대체문자 신청 O
handleAlternativeMessageScenario(kakaoVO);
}else {
//3.카카오톡 발송 실패 + 대체문자 신청 X : 전액 환불
handleRefund(kakaoVO, "카카오 " + kakaoVO.getMsgTypeTxt() + " 전송 실패로 인한 결제 금액 환불");
}
//모든 유형 환불 완료 처리
mjonMsgDAO.updateRefundY(kakaoVO);
}
private void insertKakaoAtDataJsonInfo_advc(List<KakaoSendAdvcVO> kakaoSendAdvcListVO) {
// TODO Auto-generated method stub
@ -1140,8 +1061,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
Float totPrice = eachPrice * instCnt;
sendVO.setTotPrice(String.format("%.1f", totPrice));
sendVO.setAtDelayYn(StringUtils.isEmpty(kakaoVO.getAtSmishingYn()) ? "N" : kakaoVO.getAtSmishingYn());
sendVO.setSendKind(StringUtils.isEmpty(kakaoVO.getSendKind()) ? "H" : kakaoVO.getSendKind());
sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
@ -1256,31 +1176,31 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
@Override
public KakaoReturnVO createKaKaoProfile(KakaoVO kakaoVO) throws Exception {
KakaoReturnVO returnVO = new KakaoReturnVO();
/* senderKey 사용 우무 */
int profileCnt = kakaoApiService.selectKakaoProfileCnt(kakaoVO);
if(profileCnt > 0) {
returnVO.setBizReturnMsg("이미 등록된 발신프로필입니다. 동일 채널ID는 중복 등록이 불가합니다.");
}else {
List<KakaoVO> delProfileList = new ArrayList<KakaoVO>();
delProfileList = selectDeleteProfileInfo(kakaoVO);
if(delProfileList.size() != 0) {
kakaoVO.setProfileId(delProfileList.get(0).getProfileId());
kakaoVO.setDeleteYn("N");
updateKakaoProfileStatus(kakaoVO);
returnVO.setBizReturnMsg("삭제 발신프로필의 복구가 완료 되었습니다.");
}else {
kakaoApiService.insertKakaoProfileInfo(kakaoVO);
returnVO.setBizReturnMsg("발신프로필의 등록이 완료 되었습니다.");
}
}
return returnVO;
}
}

View File

@ -96,10 +96,7 @@ public class KakaoAlimTalkController {
KakaoReturnVO tmpProfileVO = kakaoApiProfile.kakaoApiProfileList(kakaoProfileVO);
/* API를 통하여 정상적으로 조회된 프로필만 add 처리 */
if("200".equals(tmpProfileVO.getBizReturnCode())) {
resultApiProfileList.add(tmpProfileVO);
}
resultApiProfileList.add(tmpProfileVO);
}
@ -140,8 +137,21 @@ public class KakaoAlimTalkController {
KakaoReturnVO kakaoInfo = kakaoApiProfile.kakaoApiProfileToken(kakaoVO); //발신프로필 인증 토큰 요청하기
String bizReturnCd = kakaoInfo.getBizReturnCode();
String bizReturnMsg = kakaoInfo.getBizReturnMsg();
List<KakaoVO> delProfileList = new ArrayList<KakaoVO>();
if(bizReturnCd.equals("310") && bizReturnMsg.equals("이미 등록되어 있는 발신프로필 입니다")) {
kakaoVO.setUserId(userId);
delProfileList = kakaoAlimTalkService.selectDeleteProfileInfo(kakaoVO);
}
int listSize = delProfileList.size();
modelAndView.addObject("kakaoInfo", kakaoInfo);
modelAndView.addObject("result", "success");
modelAndView.addObject("delInfoCnt", listSize);
}catch(Exception ex){
ex.printStackTrace();
@ -259,14 +269,68 @@ public class KakaoAlimTalkController {
kakaoVO.setLastUpdusrId(userId);
KakaoReturnVO kakaoInfo = kakaoApiProfile.kakaoApiProfileCreate(kakaoVO);
if("200".equals(kakaoInfo.getBizReturnCode())) {
kakaoVO.setSenderKey(kakaoInfo.getSenderKey());
KakaoReturnVO internalReuslt = kakaoAlimTalkService.createKaKaoProfile(kakaoVO);
kakaoInfo.setBizReturnMsg(internalReuslt.getBizReturnMsg());
String bizReturnCd = kakaoInfo.getBizReturnCode();
String bizReturnMsg = kakaoInfo.getBizReturnMsg();
System.out.println(bizReturnCd);
System.out.println(bizReturnMsg);
/*
* 기존에 등록된 발신프로필이라고 결과가 오는 경우 데이터베이스에서 삭제 기록을 조회해 본다.
* 삭제 기록이 있는 경우 복구를 해주고(deleteYn 값을 'N'으로 변경)
* 기록이 없는 경우 사이트에 등록되었을 있음.
*
* */
List<KakaoVO> delProfileList = new ArrayList<KakaoVO>();
if((bizReturnCd.equals("509") && bizReturnMsg.equals("이미 사용중인 카카오톡 채널입니다.")) || (bizReturnCd.equals("310") && bizReturnMsg.equals("이미 등록되어 있는 발신프로필 입니다"))) {
delProfileList = kakaoAlimTalkService.selectDeleteProfileInfo(kakaoVO);
}
//삭제처리된 발신프로필이 있는 경우
if(delProfileList != null && delProfileList.size() > 0) {
int resultCnt = 0;
for(int i=0; i< delProfileList.size(); i++) {
KakaoVO tmpKakaoVO = new KakaoVO();
tmpKakaoVO.setUserId(userId);
tmpKakaoVO.setProfileId(delProfileList.get(i).getProfileId());
tmpKakaoVO.setDeleteYn("N");
int count = kakaoAlimTalkService.updateKakaoProfileStatus(tmpKakaoVO);
resultCnt = resultCnt + count;
}
KakaoReturnVO kakaoReturnVO = new KakaoReturnVO();
if(resultCnt > 0) {
kakaoReturnVO.setBizReturnCode("200");
kakaoReturnVO.setBizReturnMsg("삭제 발신프로필의 복구가 완료 되었습니다.");
modelAndView.addObject("kakaoInfo", kakaoReturnVO);
modelAndView.addObject("result", "success");
}else {
kakaoReturnVO.setBizReturnCode("200");
kakaoReturnVO.setBizReturnMsg("삭제 발신프로필의 복구에 오류가 발생하였습니다.");
modelAndView.addObject("kakaoInfo", kakaoReturnVO);
modelAndView.addObject("result", "zeroUpdate");
}
}else {//삭제된 내역이 없는 경우 사이트에 발신프로필이 등록되어 있을 있다.
modelAndView.addObject("kakaoInfo", kakaoInfo);
modelAndView.addObject("result", "success");
}
modelAndView.addObject("kakaoInfo", kakaoInfo);
modelAndView.addObject("result", "success");
}
}catch(Exception ex){

View File

@ -9,11 +9,9 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -63,6 +61,7 @@ import itn.com.cmm.util.MJUtil;
import itn.com.cmm.util.StringUtil;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoSendUtil;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiJsonSave;
@ -80,9 +79,6 @@ import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
import itn.let.mjo.msgholiday.service.MsgAlarmSetVO;
import itn.let.mjo.msgholiday.service.MsgHolidayService;
import itn.let.mjo.msgholiday.service.MsgHolidayVO;
import itn.let.mjo.pay.service.MjonPayService;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.org.web.OrgChartManageController;
import itn.let.sym.site.service.EgovSiteManagerService;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uss.umt.service.EgovUserManageService;
@ -106,8 +102,6 @@ import itn.let.uss.umt.service.UserManageVO;
@Controller
public class KakaoAlimTalkSendController {
private final OrgChartManageController orgChartManageController;
@Resource(name = "egovMjonMsgGroupIdGnrService")
private EgovIdGnrService idgenMjonMsgGroupId;
@ -155,13 +149,6 @@ public class KakaoAlimTalkSendController {
@Autowired
private MjonCommon mjonCommon;
@Resource(name = "mjonPayService")
private MjonPayService mjonPayService;
KakaoAlimTalkSendController(OrgChartManageController orgChartManageController) {
this.orgChartManageController = orgChartManageController;
}
@RequestMapping(value= {"/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do"})
public String KakaoAlimtalkMsgDataView(ModelMap model
@ -841,13 +828,13 @@ public class KakaoAlimTalkSendController {
modelAndView.setViewName("jsonView");
try {
// LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
// String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
// if(userId == "") {
// modelAndView.addObject("result", "notLogin");
// return modelAndView;
// }else {
if(userId == "") {
modelAndView.addObject("result", "notLogin");
return modelAndView;
}else {
KakaoReturnVO kakaoTemplateTempList = kakaoApiTemplate.selectKakaoApiTemplate(kakaoVO);
@ -863,7 +850,7 @@ public class KakaoAlimTalkSendController {
modelAndView.addObject("kakaoTemplateList", kakaoTemplateTempList);
modelAndView.addObject("result", "success");
// }
}
}catch(Exception ex){
ex.printStackTrace();
modelAndView.addObject("message", egovMessageSource.getMessage("fail.common.select"));
@ -1553,55 +1540,4 @@ public class KakaoAlimTalkSendController {
return "web/kakao/msgdata/at/KakaoAlimtalkMsgDataView_tmp";
}
public void kakaoRefundSingleTransaction() throws Exception{
System.out.println("=============카카오 환불 싱글 트랜잭션 수행 =============");
/* 회원 money 업데이트 처리 트랜잭션 분리를 위하여 impl이 아닌 현재 위치에서 반복문 실행 */
System.out.println("=============SchedulerUtil=====runKakaoOneTime =============>");
List<KakaoVO> kakaoRefundList = kakaoAlimTalkService.selectKakaoSentRefundListForSingle();
Set<String> targetIdSet = new HashSet<>();
for(KakaoVO kakaoVO : kakaoRefundList) {
try {
kakaoAlimTalkService.kakaoSingleRefund(kakaoVO);
targetIdSet.add(kakaoVO.getUserId());
} catch (Exception e) {
String msg = "[문자온] 환불 실패 - " + kakaoVO.getMsgId() +"("+ kakaoVO.getUserId() + ")";
mjonCommon.sendSimpleSlackMsg(msg);;
}
}
MjonPayVO mjonPayVO = new MjonPayVO();
for(String userId : targetIdSet) {
try {
mjonPayVO.setUserId(userId);
mjonPayService.updateMemberCash(mjonPayVO); //회원정보 업데이트
} catch(Exception e) {
String msg = "[문자온] 환불 후 잔액 갱신 실패 - " + userId;
mjonCommon.sendSimpleSlackMsg(msg);;
}
}
}
/**
* @Method Name : kakaoMsgSendRefundTestAjax
* @작성일 : 2025. 8. 6.
* @작성자 : 이지우
* @Method 설명 : 카카오 친구톡 전송 환불 스케줄러 서비스 테스트
*/
@RequestMapping(value= {"/web/mjon/kakao/alimtalk/kakaoMsgSendRefundTestAjax.do"})
public ModelAndView kakaoMsgSendRefundTestAjax(ModelMap model
, HttpServletRequest request
, @ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
this.kakaoRefundSingleTransaction();
modelAndView.addObject("result", "success");
return modelAndView;
}
}

View File

@ -305,9 +305,6 @@ public class KakaoAlimTalkTemplateController {
KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
System.out.println("kakaoTemplateInfo :; "+ kakaoTemplateInfo);
String kakaoButtonTypeDs = "";
for(int i=0; i < kakaoTemplateInfo.getButtonList().size(); i++) {
String buttonType = kakaoTemplateInfo.getButtonList().get(i).getLinkType();

View File

@ -1,12 +0,0 @@
package itn.let.kakao.user.kakaoFt.service;
import javax.servlet.http.HttpServletRequest;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.mail.service.StatusResponse;
public interface KakaoFriendsTalkService {
StatusResponse insertKakaoFtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception;
}

View File

@ -1,292 +0,0 @@
package itn.let.kakao.user.kakaoFt.service.impl;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import itn.com.cmm.LoginVO;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoSendUtil;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.user.kakaoAt.service.impl.KakaoAlimTalkDAO;
import itn.let.kakao.user.kakaoFt.service.KakaoFriendsTalkService;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.mjocommon.MjonCommon;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msg.service.impl.MjonMsgDAO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.module.base.PriceAndPoint;
import itn.let.uss.umt.service.EgovUserManageService;
import itn.let.uss.umt.service.UserManageVO;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service("KakaoFriendsTalkService")
public class KakaoFriendsTalkServiceImpl extends EgovAbstractServiceImpl implements KakaoFriendsTalkService{
@Resource(name = "egovFriendstalkTemplateIdService")
private EgovIdGnrService idgenFriendTalkTmpId;
@Resource(name="kakaoFriendsTalkTemplateDAO")
private KakaoFriendsTalkTemplateDAO kakaoFriendsTalkTemplateDAO;
@Resource(name="mjonMsgDAO")
private MjonMsgDAO mjonMsgDAO;
/** userManageService */
@Resource(name = "userManageService")
private EgovUserManageService userManageService;
@Resource(name = "egovMjonMsgGroupIdGnrService")
private EgovIdGnrService idgenMjonMsgGroupId;
@Resource(name="kakaoAlimTalkDAO")
private KakaoAlimTalkDAO kakaoAlimTalkDAO;
@Resource(name = "MjonMsgDataService")
private MjonMsgDataService mjonMsgDataService;
@Autowired
KakaoSendUtil kakaoSendUtil;
@Autowired
private MjonCommon mjonCommon;
@Autowired
private PriceAndPoint priceAndPoint;
@Override
public StatusResponse insertKakaoFtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception {
StatusResponse statusResponse = new StatusResponse();
log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString());
log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString());
// if(1==1) {
// throw new RuntimeException("강제로 발생시킨 예외");
// }
// 측정할 메소드 호출 시간 기록
Instant start = Instant.now();
// KakaoSendAdvcVO
Map<String, Object> returnMap = new HashMap<>();
Map<String, Object> apiReturnMap = new HashMap<>();
String userId = "";
if("A".equals(kakaoVO.getSendKind()))
{
userId = kakaoVO.getMberId();
}else {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
: null;
userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if (userId.equals("")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용이 가능합니다.");
}
}
kakaoVO.setUserId(userId);
/**
* 회원 정지된 상태이면 문자 발송이 안되도록 처리함 현재 로그인 세션도 만료 처리함
*/
boolean mberSttus = userManageService.selectUserStatusInfo(userId);
if (!mberSttus) {
request.getSession().invalidate();
// UNAUTHORIZED : 인증되지 않은 사용자가 접근하려고
return new StatusResponse(HttpStatus.UNAUTHORIZED,
"현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 친구톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.", "STAT_1070");
}
/**
* 친구톡은 발송 시간 제약이 있음
*/
if(kakaoSendUtil.isRestrictedFriendTalkTime(kakaoSendUtil.resolveBaseDate(kakaoVO))) {
// UNAUTHORIZED : 인증되지 않은 사용자가 접근하려고
return new StatusResponse(HttpStatus.BAD_REQUEST,
"친구톡은 20시 50분부터 익일 08시까지 발송이 제한됩니다.","STAT_2080");
}
/** @isHolidayNotified
* @false : 알림 X
* @true : 알림 O */
boolean isHolidayNotified = mjonCommon.processUserAndCheckFT(kakaoVO);
UserManageVO userManageVO = mjonCommon.getUserManageInfo(userId);
// 스팸관련 키워드 select
List<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
/** @카카오톡 전송 list 셋팅 -------------------------------------------*/
List<KakaoSendAdvcVO> kakaoSendAdvcListVO = kakaoSendUtil.populateSendListsFT(kakaoVO, isHolidayNotified, statusResponse, userManageVO, resultSpamTxt);
if (statusResponse.getStatus() != null && !statusResponse.getStatus().equals(HttpStatus.OK)) {
log.error(" + populateSendLists 처리 중 오류 발생: {}", statusResponse.getMessage());
return statusResponse;
}
/** @전송금액 확인 --------------------------------------------------*/
if (!kakaoSendUtil.isCashSufficient(userId, kakaoSendAdvcListVO)) {
log.error("Insufficient balance for message sending.");
return new StatusResponse(HttpStatus.BAD_REQUEST, "문자 발송에 필요한 보유 잔액이 부족 합니다.", "STAT_1060");
}
/** @json파일이 있을 떄 biz_attachments insert */
kakaoSendUtil.insertKakaoAtDataJsonInfo_advc(kakaoSendAdvcListVO);
Map<String, List<KakaoSendAdvcVO>> priceGroupedMessages = kakaoSendAdvcListVO.stream()
.collect(Collectors.groupingBy(KakaoSendAdvcVO::getEachPrice));
// instTotalCnt : 화면에서 보여줄 발송건수
int instTotalCnt = 0;
// 임시
List<String> nextMsgGroupIdA = new ArrayList<>();
// 대안: entrySet() 직접 사용
String apiMsgGroupId = "";
String apiMsgType = "";
for (Map.Entry<String, List<KakaoSendAdvcVO>> entry : priceGroupedMessages.entrySet()) {
// entry 사용
List<KakaoSendAdvcVO> groupedMsgList = entry.getValue(); // 해당 가격의 메시지 리스트
String nextMsgGroupId = idgenMjonMsgGroupId.getNextStringId();
groupedMsgList.forEach(t -> t.setMsgGroupId(nextMsgGroupId));
// api 전달
apiMsgGroupId = StringUtils.isNotEmpty(apiMsgGroupId)
? apiMsgGroupId + "," + nextMsgGroupId
: nextMsgGroupId;
apiMsgType = StringUtils.isNotEmpty(apiMsgType)
? apiMsgType + "," + kakaoSendAdvcListVO.get(0).getMsgType()
: kakaoSendAdvcListVO.get(0).getMsgType();
// 발송 데이터 삽입
int instCnt = kakaoSendUtil.insertKakaoData_advc(groupedMsgList);
// int instCnt = 6;
if(instCnt > 0) {
instTotalCnt += instCnt;
KakaoSendAdvcVO sendVO = groupedMsgList.get(0);
/** @groupData 테이블 insert */
kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
priceAndPoint.insertBizFtKakaoPrice(kakaoVO.getUserId(), sendVO.getMsgGroupId());
priceAndPoint.insertCashAndPoint(kakaoVO.getUserId()
, -Float.parseFloat(sendVO.getTotPrice())
, "카카오 친구톡 총 "+groupedMsgList.size()+"건 중 " + instCnt + "건 발송"
, nextMsgGroupId
);
/** @SLACK발송 */
/** @발송조건이되면 발송 */
if(isHolidayNotified
&& ("Y".equals(userManageVO.getAtSmishingYn()) || "Y".equals(kakaoVO.getAtDelayYn()))
) {
mjonCommon.getAdminKakaoAtSendSlack(sendVO);
}else if("Y".equals(kakaoVO.getAtSmishingYn())){
/** @발송조건이 안되면 DB INSERT */
mjonMsgDAO.insertSpamPassMsgData(MjonMsgVO.builder()
.msgGroupId(nextMsgGroupId)
.userId(kakaoVO.getUserId())
.reqDate(kakaoVO.getReqDate())
.smsTxt(groupedMsgList.get(0).getTemplateContent())
.totalCallCnt(instCnt)
.callFrom(kakaoVO.getCallFrom())
.msgType("8")
.reserveYn(kakaoVO.getReserveYn())
.build()
);
}
nextMsgGroupIdA.add(nextMsgGroupId);
}
}
apiReturnMap.put("resultSts", instTotalCnt);
// 그룹 ID
apiReturnMap.put("msgGroupId", apiMsgGroupId);
// 메세지 타입
apiReturnMap.put("msgType", apiMsgType);
returnMap.put("resultSts", instTotalCnt);
returnMap.put("reserYn", kakaoVO.getReserveYn());
returnMap.put("groupIds", nextMsgGroupIdA);
// 측정할 메소드 호출 시간 기록
Instant end = Instant.now();
log.info(" + start :: [{}]", start);
// 실행 시간 계산 (나노초, 밀리초, )
long seconds = Duration.between(start, end).getSeconds();
log.info("메소드 실행 시간 (초): {} s", seconds);
double minutes = seconds / 60.0; // 소수점 포함을 위해 60.0으로 나눔
returnMap.put("second", seconds+" s");
returnMap.put("minutes", minutes+" min");
// System.out.println("메소드 실행 시간 (분): " + minutes + " min");
// priceAndPoint.getBefCash(userId);
statusResponse.setStatus(HttpStatus.OK);
statusResponse.setObject(returnMap);
apiReturnMap.put("result", HttpStatus.OK);
apiReturnMap.put("message", "전송이 완료되었습니다.");
statusResponse.setApiReturn(apiReturnMap);
return statusResponse;
}
}

View File

@ -13,11 +13,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
@ -31,9 +29,7 @@ import itn.let.kakao.kakaoComm.KakaoSendUtil;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
import itn.let.kakao.user.kakaoFt.service.KakaoFriendsTalkService;
import itn.let.kakao.user.kakaoFt.service.KakaoFriendsTalkTemplateService;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.mjocommon.MjonCommon;
import itn.let.mjo.mjocommon.MjonHolidayApi;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
@ -72,9 +68,6 @@ public class KakaoFriendsTalkSendController {
@Resource(name = "kakaoFriendsTalkTemplateService")
private KakaoFriendsTalkTemplateService kakaoFtTemplateService;
@Resource(name = "KakaoFriendsTalkService")
private KakaoFriendsTalkService kakaoFriendsTalkService;
/** userManageService */
@Resource(name = "userManageService")
private EgovUserManageService userManageService;
@ -120,109 +113,114 @@ public class KakaoFriendsTalkSendController {
model.addAttribute("loginVO", loginVO);
try {
if(!"".equals(userId) && !"ROLE_ADMIN".equals(author)) {
//사용자 등록 발신프로필 정보 조회해오기
kakaoVO.setUserId(userId);
List<KakaoVO> resultProfileList = kakaoApiService.selectKakaoProfileList(kakaoVO);
model.addAttribute("resultProfileList", resultProfileList);
if(!userId.equals("") && !author.equals("ROLE_ADMIN")) {
// 특수문자 리스트 불러오기
MjonSymbolVO symbolVO = new MjonSymbolVO();
List<MjonSymbolVO> symbolList = mjonSymbolService.selectMjonSymbolList(symbolVO);
model.addAttribute("symbolList", symbolList);
//아이디 발신번호 리스트 불러오기.
List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
List<String> resultPhonList = new ArrayList<String>();
MJUtil mjUtil = new MJUtil();
for(String phone : resultSendPhonList) {
resultPhonList.add(mjUtil.addDash(phone));
}
model.addAttribute("resultPhonList", resultPhonList);
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
model.addAttribute("atSmishingYn", mberManageVO.getAtSmishingYn());
//3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용
/*Float shortPrice = mberManageVO.getShortPrice();
Float longPrice = mberManageVO.getLongPrice();
Float picturePrice = mberManageVO.getPicturePrice();
Float picture2Price = mberManageVO.getPicture2Price();
Float picture3Price = mberManageVO.getPicture3Price();*/
BigDecimal userMoney = new BigDecimal(mberManageVO.getUserMoney()).setScale(2, RoundingMode.HALF_EVEN);
model.addAttribute("userMoney", userMoney);
//////////////////////////////////////////////////////////////////
//최근 전송 내역
MjonMsgDataVO searchVO = new MjonMsgDataVO();
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
cal.setTime(now);
cal.add(Calendar.DATE, -3);
String chkDate = format.format(cal.getTime());
searchVO.setUserId(userId);
searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작
// model.addAttribute("resultLatestMsgList", mjonMsgDataService.selectLatestMsgList(searchVO));
//자주보내는 번호
// model.addAttribute("resultBookMarkMsgList", mjonMsgDataService.selectBookMarkMsgList(searchVO));
// 사용자 정의 단가 정보 불러오기(시스템 단가 혹은 협의 단가)
model.addAttribute("sendPrice", kakaoSendUtil.selectSendPriceOfKakaoAtAndSmsAndMms(userId));
//사용자 템플릿 정보 조회
String friendId = kakaoVO.getFriendId();
KakaoVO resultTemplateVO = new KakaoVO();
if(friendId != null) {
resultTemplateVO = kakaoFtTemplateService.selectKakaoFriendsTemplateDetail(kakaoVO);
}
model.addAttribute("resultTemplateVO", resultTemplateVO);
//친구톡 발송시간 체크 하기 - 20:50 ~ 익일 08:00 사이에는 발송 금지
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date nows = new Date();
String nowDate = sdf1.format(nows);
cal.setTime(nows);
int hours = cal.get(Calendar.HOUR_OF_DAY);
int minuts = cal.get(Calendar.MINUTE);
boolean sendStatus = true;
if(hours >= 20) {
//사용자 등록 발신프로필 정보 조회해오기
kakaoVO.setUserId(userId);
List<KakaoVO> resultProfileList = kakaoApiService.selectKakaoProfileList(kakaoVO);
model.addAttribute("resultProfileList", resultProfileList);
if(minuts >= 50) {
// 특수문자 리스트 불러오기
MjonSymbolVO symbolVO = new MjonSymbolVO();
List<MjonSymbolVO> symbolList = mjonSymbolService.selectMjonSymbolList(symbolVO);
model.addAttribute("symbolList", symbolList);
//아이디 발신번호 리스트 불러오기.
List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
List<String> resultPhonList = new ArrayList<String>();
MJUtil mjUtil = new MJUtil();
for(String phone : resultSendPhonList) {
resultPhonList.add(mjUtil.addDash(phone));
}
model.addAttribute("resultPhonList", resultPhonList);
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
model.addAttribute("atSmishingYn", mberManageVO.getAtSmishingYn());
//3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용
/*Float shortPrice = mberManageVO.getShortPrice();
Float longPrice = mberManageVO.getLongPrice();
Float picturePrice = mberManageVO.getPicturePrice();
Float picture2Price = mberManageVO.getPicture2Price();
Float picture3Price = mberManageVO.getPicture3Price();*/
BigDecimal userMoney = new BigDecimal(mberManageVO.getUserMoney()).setScale(2, RoundingMode.HALF_EVEN);
model.addAttribute("userMoney", userMoney);
//////////////////////////////////////////////////////////////////
//최근 전송 내역
MjonMsgDataVO searchVO = new MjonMsgDataVO();
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
cal.setTime(now);
cal.add(Calendar.DATE, -3);
String chkDate = format.format(cal.getTime());
searchVO.setUserId(userId);
searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작
model.addAttribute("resultLatestMsgList", mjonMsgDataService.selectLatestMsgList(searchVO));
//자주보내는 번호
model.addAttribute("resultBookMarkMsgList", mjonMsgDataService.selectBookMarkMsgList(searchVO));
// 사용자 정의 단가 정보 불러오기(시스템 단가 혹은 협의 단가)
model.addAttribute("sendPrice", kakaoSendUtil.selectSendPriceOfKakaoAtAndSmsAndMms(userId));
//사용자 템플릿 정보 조회
String friendId = kakaoVO.getFriendId();
KakaoVO resultTemplateVO = new KakaoVO();
if(friendId != null) {
resultTemplateVO = kakaoFtTemplateService.selectKakaoFriendsTemplateDetail(kakaoVO);
}
model.addAttribute("resultTemplateVO", resultTemplateVO);
//친구톡 발송시간 체크 하기 - 20:50 ~ 익일 08:00 사이에는 발송 금지
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date nows = new Date();
String nowDate = sdf1.format(nows);
cal.setTime(nows);
int hours = cal.get(Calendar.HOUR_OF_DAY);
int minuts = cal.get(Calendar.MINUTE);
boolean sendStatus = true;
if(hours >= 20) {
System.out.println("발송금지 시간" + hours + ":" + minuts);
if(minuts >= 50) {
System.out.println("발송금지 시간" + hours + ":" + minuts);
sendStatus = false;
}
}
if(hours < 8) {
System.out.println("발송금지 시간" + hours + ":" + minuts);
sendStatus = false;
}
System.out.println("발송상태는 ::: "+sendStatus);
model.addAttribute("sendStatus", sendStatus);
}
if(hours < 8) {
System.out.println("발송금지 시간" + hours + ":" + minuts);
sendStatus = false;
}
System.out.println("발송상태는 ::: "+sendStatus);
model.addAttribute("sendStatus", sendStatus);
} catch (Exception e) {
System.out.println(" kakaoFriendsTalkMsgDataViewDataRegist Error ::: " + e);
}
return "web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView";
@ -315,29 +313,7 @@ public class KakaoFriendsTalkSendController {
return modelAndView;
}
/**
* @methodName : sendMsgData_ft_advc
* @author : 이호영
* @date : 2025. 4. 17.
* @description : 친구톡 발송기능
* @return : ResponseEntity<StatusResponse>
* @param kakaoVO
* @param request
* @param model
* @return
* @throws Exception
*
*/
@RequestMapping(value = "/web/mjon/kakao/friendstalk/kakaoFriendsTalkMsgSendAjax_advc.do")
public ResponseEntity<StatusResponse> kakaoFriendsTalkMsgSendAjax_advc(
@RequestBody KakaoVO kakaoVO,
HttpServletRequest request
) throws Exception {
System.out.println(" :: sendMsgData_ft_advc :: ");
return ResponseEntity.ok().body(kakaoFriendsTalkService.insertKakaoFtSandAjax_advc(kakaoVO, request)) ;
}
/**
* @Method Name : kakaoFriendsTalkMsgSendAjax
@ -711,6 +687,27 @@ public class KakaoFriendsTalkSendController {
return modelAndView;
}
/**
* @Method Name : kakaoFriendsTalkMsgSendRefundTestAjax
* @작성일 : 2024. 1. 18.
* @작성자 : 우영두
* @Method 설명 : 카카오 친구톡 전송 환불 스케줄러 서비스 테스트
*/
@RequestMapping(value= {"/web/mjon/kakao/friendstalk/kakaoFriendsTalkMsgSendRefundTestAjax.do"})
public ModelAndView kakaoFriendsTalkMsgSendRefundTestAjax(ModelMap model
, HttpServletRequest request
, @ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
kakaoAlimTalkService.selectKakaoFtSentRefundList();
modelAndView.addObject("result", "success");
return modelAndView;
}
/**
* @Method Name : kakaoFriendsTalkMsgSendRefundTestAjax
* @작성일 : 2024. 1. 18.

View File

@ -1,6 +1,5 @@
package itn.let.kakao.user.kakaoFt.web;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -9,16 +8,11 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
@ -27,7 +21,6 @@ import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
import itn.com.cmm.EgovMessageSource;
import itn.com.cmm.LoginVO;
import itn.com.cmm.RestResponse;
import itn.com.cmm.service.EgovCmmUseService;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
@ -39,14 +32,10 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate;
import itn.let.kakao.kakaoComm.kakaoApi.KakaoFTJsonSave;
import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
import itn.let.kakao.user.kakaoFt.service.KakaoFriendsTalkTemplateService;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.symbol.service.MjonSymbolService;
import itn.let.mjo.symbol.service.MjonSymbolVO;
import itn.let.uss.ion.cnt.service.CntManageVO;
import itn.let.uss.umt.service.EgovUserManageService;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Controller
public class KakaoFriendsTalkTemplateController {
@ -181,67 +170,6 @@ public class KakaoFriendsTalkTemplateController {
return modelAndView;
}
@RequestMapping(value="/web/pop/ft/kakaoTemplatePop.do")
public String siteContentIntro(@ModelAttribute CntManageVO cntManageVO, HttpServletRequest request, Model model) throws Exception {
return "/web/pop/kakaoFtPop";
}
@ResponseBody
@RequestMapping(value= {"/web/mjon/kakao/template/sendKakaoFriendsTemplateImageUploadAjax_advc.do"})
public ResponseEntity<StatusResponse> sendKakaoFriendsTemplateImageUploadAjax_advc(
@ModelAttribute("kakaoVO") KakaoVO kakaoVO
, final MultipartHttpServletRequest multiRequest
) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
try {
if(!"A".equals(kakaoVO.getSendKind())) {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(StringUtils.isEmpty(userId)) {
return ResponseEntity.ok(
new StatusResponse(HttpStatus.UNAUTHORIZED
, "로그인을 하셔야 이용 가능합니다."
, LocalDateTime.now()
)
);
}
}
final Map<String, MultipartFile> files = multiRequest.getFileMap();
/* if (!files.isEmpty()){
Map<String, String> resultMap = kakaoApiImageUpload.kakaoApiImageUpload(kakaoVO, files, 0);
//테스트
modelAndView.addObject("code", resultMap.get("code"));
modelAndView.addObject("msg", resultMap.get("msg"));
modelAndView.addObject("imgUrl", resultMap.get("imgUrl"));
}
modelAndView.addObject("result", "success");*/
return ResponseEntity.ok().body(kakaoApiImageUpload.kakaoApiImageUpload_advc(kakaoVO, files, 0));
} catch (Exception e) {
e.printStackTrace();
// TODO: handle exception
return ResponseEntity.ok().body(new StatusResponse(
HttpStatus.BAD_REQUEST
, "오류가 발생하였습니다."
, ""
));
}
}
// 카카오 친구톡 템플릿 등록요청
@ -261,13 +189,9 @@ public class KakaoFriendsTalkTemplateController {
@ModelAttribute("kakaoVO") KakaoVO kakaoVO
, final MultipartHttpServletRequest multiRequest
) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
// log.info(" + kakaoVO.getAdFlag() :: [{}]", kakaoVO.getAdFlag());
log.info(" + ImgLink :: [{}]", kakaoVO.getImgLink());
try {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
@ -283,18 +207,16 @@ public class KakaoFriendsTalkTemplateController {
kakaoVO.setLastUpdusrId(userId);
kakaoVO.setSendType("FT");
/*
String imgUrl = kakaoVO.getTemplateImageUrl();
int buttonSize = kakaoVO.getButtonVOList().size();
if(!imgUrl.equals("") || buttonSize > 0) {
log.info(" + kakaoVO.getAdFlag() :: [{}]", kakaoVO.getAdFlag());
//json 파일 생성 처리
String resultJsonPath = kakaoFTJsonSave.kakaoApiJsonSave(kakaoVO);
kakaoVO.setBizJsonName(resultJsonPath);
}*/
}
int result = kakaoFtTemplateService.insertKakaoFriendsTemplateData(kakaoVO);

View File

@ -6,11 +6,9 @@ import java.util.List;
import itn.let.uss.umt.service.UserDefaultVO;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
public class KakaoSentVO extends UserDefaultVO{
private static final long serialVersionUID = 1L;
@ -92,7 +90,7 @@ public class KakaoSentVO extends UserDefaultVO{
private String bizKakaoFtPrice;
private String bizSmsPrice;
private String bizMmsPrice;
private int successCount;
private int waitCount;
private int failCount;
@ -114,7 +112,6 @@ public class KakaoSentVO extends UserDefaultVO{
private String successPrice;
private String kakaoResendSuccPrice;
private String bizKakaoImageType;
private String divideYn;
@ -122,6 +119,4 @@ public class KakaoSentVO extends UserDefaultVO{
private String yellowId;
private String adFlag;
}

View File

@ -34,15 +34,12 @@ import org.springframework.stereotype.Service;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import itn.com.cmm.util.StringUtil;
import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO;
import itn.let.kakao.user.sent.service.KakaoSentDetailVO;
import itn.let.kakao.user.sent.service.KakaoSentService;
import itn.let.kakao.user.sent.service.KakaoSentVO;
import itn.let.mjo.msgsent.service.MjonMsgSentVO;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service("KakaoSentService")
public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements KakaoSentService{
@ -142,16 +139,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
List<KakaoSentVO> resultList = new ArrayList<KakaoSentVO>();
//수신번호 검색 번호 포멧 통일
if("4".equals(kakaoSentVO.getSearchCondition()) && StringUtil.isNotEmpty(kakaoSentVO.getSearchKeyword())) {
kakaoSentVO.setSearchKeyword(kakaoSentVO.getSearchKeyword().trim().replace("-", ""));
}
resultList = kakaoSentDAO.selectAllKakaoSentList_advc(kakaoSentVO);
System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
//totPrice 계산 상태코드 set
resultList = resultList.stream().map(t -> setPriceNCode(t)).collect(Collectors.toList());
@ -299,27 +287,15 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
* */
private KakaoSentVO setPriceNCode(KakaoSentVO result) {
log.info("=============================== setPriceNCode ================================");
//성공 건수 세팅
KakaoSentVO eachCnt = new KakaoSentVO();
eachCnt.setMsgGroupId(result.getMsgGroupId());
eachCnt.setBizKakaoResendYn("Y".equals(result.getBizKakaoResendYn()) ? "Y" : "N");
eachCnt.setMsgType(result.getMsgType());
eachCnt.setBizKakaoImageType(result.getBizKakaoImageType());
eachCnt.setBizKakaoResendType(result.getBizKakaoResendType());
try {
log.info("eachCnt.getMsgType() :: [{}]", eachCnt.getMsgType());
log.info("eachCnt.getBizKakaoImageType() :: [{}]", eachCnt.getBizKakaoImageType());
log.info("eachCnt.getBizKakaoResendType() :: [{}]", eachCnt.getBizKakaoResendType());
eachCnt = kakaoSentDAO.selectKakaoSentCntEachCnt_advc(eachCnt);
} catch (Exception e) {
System.out.println("setPriceNCode error!!");
}
log.info(" + eachCnt.toString() :: [{}]", eachCnt.toString());
// log.info(" + eachCnt.getSuccessPrice() :: [{}]", eachCnt.getSuccessPrice());
result.setSuccessCount(eachCnt.getSuccessCount());
result.setWaitCount(eachCnt.getWaitCount());
@ -352,9 +328,9 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
//총금액 시작
//=======================================================
// TotPrice : 성공건수에 대한 금액 곱하기 ? : null 처리
BigDecimal atPrice = successPrice != null ? new BigDecimal(successPrice) : BigDecimal.ZERO;
BigDecimal kakaoResendPrice = kakaoResendSuccPrice != null ? new BigDecimal(kakaoResendSuccPrice) : BigDecimal.ZERO;
// TotPrice : 성공건수에 대한 금액 곱하기
BigDecimal atPrice = new BigDecimal(successPrice);
BigDecimal kakaoResendPrice = new BigDecimal(kakaoResendSuccPrice);
BigDecimal totalPrice = atPrice.add(kakaoResendPrice);
// 소수점 자리로 설정 (반올림)// totalPrice 값을 소수점 자리까지 반올림하여 roundedTotalPrice에 저장
// RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림
@ -660,7 +636,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
data[i][1] = sdf.format(vo.getReqdate());
//구분
data[i][2] = "A".equals(vo.getSendKind()) ? "API" : "WEB";
data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API";
//채널ID
data[i][3] = vo.getYellowId();

View File

@ -2,7 +2,6 @@ package itn.let.kakao.user.sent.web;
import java.io.FileReader;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import itn.com.cmm.util.DateUtils;
import java.text.SimpleDateFormat;
@ -39,7 +38,6 @@ import itn.com.cmm.LoginVO;
import itn.com.cmm.util.StringUtil;
import itn.com.cmm.util.StringUtil2;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.cmm.vo.FileInfoVO;
import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO;
import itn.let.kakao.kakaoComm.KakaoButtonVO;
import itn.let.kakao.kakaoComm.KakaoReturnVO;
@ -48,20 +46,13 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate;
import itn.let.kakao.user.sent.service.KakaoSentDetailVO;
import itn.let.kakao.user.sent.service.KakaoSentService;
import itn.let.kakao.user.sent.service.KakaoSentVO;
import itn.let.mjo.msgsent.service.MjonMsgSentVO;
import itn.let.mjo.msgsent.service.impl.MjonMsgSentDAO;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Controller
public class KakaoSentController {
@Resource(name = "KakaoSentService")
private KakaoSentService kakaoSentService;
@Resource(name="MjonMsgSentDAO")
private MjonMsgSentDAO mjonMsgSentDAO;
@Autowired
KakaoApiTemplate kakaoApiTemplate;
@ -191,7 +182,7 @@ public class KakaoSentController {
//전체 발송 리스트 불러오기
List<KakaoSentVO> resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO);
System.out.println("??");
model.addAttribute("resultAllSentList", resultAllSentList);
// model.addAttribute("resultAllSentCnt", resultAllSentList.size());
@ -272,25 +263,6 @@ public class KakaoSentController {
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
if(StringUtils.isNotEmpty( mjonKakaoATResultVO.getFilePath1() )) {
List<FileInfoVO> fileInfos = new ArrayList<>();
// 확장자 제외한 파일명
String fileId = FilenameUtils.getBaseName(mjonKakaoATResultVO.getFilePath1());
// 파일 정보 조회
MjonMsgSentVO info = mjonMsgSentDAO.selectFileInfo(fileId);
// FileInfo 객체 생성 추가
FileInfoVO fileInfo = new FileInfoVO();
fileInfo.setAtchFileId(info.getAtchFileId());
fileInfo.setFileSn(info.getFileSn());
fileInfos.add(fileInfo);
model.addAttribute("fileInfos", fileInfos);
}
}else {
model.addAttribute("kakaoTemplateInfo", "");
@ -918,21 +890,22 @@ public class KakaoSentController {
KakaoReturnVO returnVO = new KakaoReturnVO();
try {
String jsonContents = kakaoATVO.getContents();
String tmpContent = kakaoATVO.getSmsTxtTrans();
String jsonFilePath = kakaoATVO.getBizKakaoJsonFile();
//친구톡 이미지 또는 버튼 정보가 있다면 실행
if(jsonContents != null && jsonContents.length() > 0) {
if(jsonFilePath != null && jsonFilePath.length() > 0) {
/*FileReader reader = new FileReader(jsonFilePath);
FileReader reader = new FileReader(jsonFilePath);
int ch;
String resultStr = "";
while ((ch = reader.read()) != -1) {
resultStr = resultStr + (char)ch;
}
*/
JSONParser parser = new JSONParser();
Object obj = parser.parse(jsonContents);
Object obj = parser.parse(resultStr);
JSONObject object = (JSONObject) obj;
String image = (object.get("image") == null) ? null : object.get("image").toString();
@ -991,7 +964,7 @@ public class KakaoSentController {
}
//친구톡 내용 셋팅
returnVO.setTemplateContent(kakaoATVO.getSmsTxt());
returnVO.setTemplateContent(tmpContent);
} catch (Exception e) {
e.printStackTrace();
@ -1064,70 +1037,42 @@ public class KakaoSentController {
try {
//발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
// 대체문자 엔터키 치환
mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));
model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
//발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
// 대체문자 엔터키 치환
if(StringUtils.isNotEmpty(mjonKakaoATResultVO.getSmsTxt())) {
mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));
}
model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
String msgType = mjonKakaoATResultVO.getMsgType();
if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
// 템플릿 api 가져오기
KakaoVO kakaoVO = new KakaoVO();
kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
// //템플릿 api 가져오기
}else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
if(StringUtils.isNotEmpty( mjonKakaoATResultVO.getFilePath1() )) {
List<FileInfoVO> fileInfos = new ArrayList<>();
// 확장자 제외한 파일명
String fileId = FilenameUtils.getBaseName(mjonKakaoATResultVO.getFilePath1());
// 파일 정보 조회
MjonMsgSentVO info = mjonMsgSentDAO.selectFileInfo(fileId);
// FileInfo 객체 생성 추가
FileInfoVO fileInfo = new FileInfoVO();
fileInfo.setAtchFileId(info.getAtchFileId());
fileInfo.setFileSn(info.getFileSn());
fileInfos.add(fileInfo);
model.addAttribute("fileInfos", fileInfos);
}
//kakaoTemplateInfo.setTemplateContent(smsTxt);
}else {
model.addAttribute("kakaoTemplateInfo", "");
}
model.addAttribute("msgType", msgType);
String msgType = mjonKakaoATResultVO.getMsgType();
if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
// 템플릿 api 가져오기
KakaoVO kakaoVO = new KakaoVO();
kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
// //템플릿 api 가져오기
}else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
//kakaoTemplateInfo.setTemplateContent(smsTxt);
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
}else {
model.addAttribute("kakaoTemplateInfo", "");
} catch (Exception e) {
e.printStackTrace();
// TODO: handle exception
}
return "web/kakao/sent/KakaoSentDetailPhoneAjax";
model.addAttribute("msgType", msgType);
return "web/kakao/sent/KakaoSentDetailPopAjax";
}
}

View File

@ -188,29 +188,6 @@ public class KakaoStepInfoController {
return "/web/kakao/intrd/KakaoAllimtalkIntro";
}
/**
* @Method Name : kakaotalkIntrdView
* @Project : mjon
* @Date : 2025. 8. 21
* @작성자 : 원영현
* @프로그램 설명 :카카오 알림톡, 친구토 통합 소개페이지
*/
@RequestMapping(value= {"/web/mjon/kakao/alimtalk/kakaotalkIntrdView.do"})
public String kakaotalkIntrdView(HttpServletRequest request,
@ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , BoardVO boardVO ,
RedirectAttributes redirectAttributes) throws Exception {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(userId == "") {
return "redirect:/web/user/login/login.do";
}
model.addAttribute("loginVO", loginVO);
return "/web/kakao/intrd/KakaotalkIntro";
}
/**
* XSS 방지 처리.

View File

@ -1,13 +1,10 @@
package itn.let.mail.service;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
import org.springframework.http.HttpStatus;
import itn.let.mjo.pay.service.RefundVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
@ -60,8 +57,6 @@ public class StatusResponse {
private Object object;
private Object apiReturn;
private String messageTemp;
private LocalDateTime timestamp;
@ -96,47 +91,13 @@ public class StatusResponse {
this.message = message;
}
public StatusResponse(HttpStatus status, String message, Object object) {
this.status = status;
this.message = message;
this.object = object;
}
public StatusResponse(HttpStatus status, String message
, Object object
, Object apiReturn
) {
this.status = status;
this.message = message;
this.object = object;
this.apiReturn = apiReturn;
}
/**
* @methodName : statusResponseSet
* @author : 이호영
* @date : 2025. 6. 24.
* @description :
* @return : StatusResponse
* @param statusResponse
* @param httpStatus
* @param msg
* @param statCode - statCode는 API RETURN를 위한 코드
* @return
*
*/
public static StatusResponse statusResponseSet(StatusResponse statusResponse, HttpStatus httpStatus, String msg, String statCode ) {
statusResponse.setStatus(httpStatus);
statusResponse.setMessage(msg);
Map<String, Object> apiReturnMap = new HashMap<>();
apiReturnMap.put("statCode", statCode);
apiReturnMap.put("result", httpStatus.toString());
statusResponse.setApiReturn(apiReturnMap);
return statusResponse;
}

View File

@ -74,7 +74,7 @@ public class AddrGroupController {
private EgovMberManageService mberManageService;
@Resource(name = "KmcCertChecker")
private KmcCertChecker kmcCertChecker;
private KmcCertChecker kmcCertCheck;
/**
* 주소록 그룹 리스트
@ -954,7 +954,7 @@ public class AddrGroupController {
mberCertPhoneVO.setTrUrl("/web/cop/kmc/authRequestAddrSubmitAjax.do");
mberCertPhoneVO.setPlusInfo(mberManageVO.getMberId());
AuthCertVO certVO = kmcCertChecker.authCertCheck(mberCertPhoneVO, request);
AuthCertVO certVO = kmcCertCheck.authCertCheck(mberCertPhoneVO, request);
modelAndView.addObject("tr_cert", certVO.getTr_cert());
modelAndView.addObject("tr_url", certVO.getTr_url());
@ -979,16 +979,241 @@ public class AddrGroupController {
*/
@RequestMapping("/web/cop/kmc/authRequestAddrSubmitAjax.do")
public String authRequestFindIdPwAjax(
HttpServletRequest request
, HttpServletResponse response
, ModelMap model
, @RequestParam Map<String, Object> commandMap
, @ModelAttribute("searchVO") KmcVO kmcVO
, RedirectAttributes redirectAttributes
) throws Exception {
public String authRequestFindIdPwAjax(HttpServletRequest request, ModelMap model,
@RequestParam Map<String, Object> commandMap, @ModelAttribute("searchVO") KmcVO kmcVO,
RedirectAttributes redirectAttributes) throws Exception {
kmcVO = kmcCertChecker.authCertResult(request, response, model);
String errMessage = ""; // 에러메세지
String rec_cert = ""; // 결과값(암호화)
String certNum = ""; // certNum
rec_cert = request.getParameter("rec_cert").trim();
certNum = request.getParameter("certNum").trim();
kmcVO.setRecCert(rec_cert);
kmcVO.setCertNum(certNum);
// 파라미터 유효성 검증
if (rec_cert.length() == 0 || certNum.length() == 0) {
errMessage = "비정상";
return returnPage(model, errMessage, kmcVO);
}
// 변수선언
// --------------------------------------------------------------------------------------------------------
String k_certNum = ""; // 파라미터로 수신한 요청번호
k_certNum = certNum;
String date = ""; // 요청일시
String CI = ""; // 연계정보(CI)
String DI = ""; // 중복가입확인정보(DI)
String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사
String birthDay = ""; // 생년월일
String gender = ""; // 성별
String nation = ""; // 내국인
String name = ""; // 성명
String M_name = ""; // 미성년자 성명
String M_birthDay = ""; // 미성년자 생년월일
String M_Gender = ""; // 미성년자 성별
String M_nation = ""; // 미성년자 내외국인
String result = ""; // 결과값
String certMet = ""; // 인증방법
String ip = ""; // ip주소
String plusInfo = "";
String encPara = "";
String encMsg1 = "";
String encMsg2 = "";
String msgChk = "";
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
// 02. 1차 복호화
// 수신된 certNum를 이용하여 복호화
rec_cert = seed.getDec(rec_cert, k_certNum);
// 03. 1차 파싱
int inf1 = rec_cert.indexOf("/", 0);
int inf2 = rec_cert.indexOf("/", inf1 + 1);
encPara = rec_cert.substring(0, inf1); // 암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1 + 1, inf2); // 암호화된 통합 파라미터의 Hash값
// 04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
kmcVO.setEncMsg2(encMsg2);
if (encMsg2.equals(encMsg1)) {
msgChk = "Y";
}
if (!"Y".equals(msgChk)) {
errMessage = "비정상접근입니다.";
return returnPage(model, errMessage, kmcVO);
}
// 05. 2차 복호화
rec_cert = seed.getDec(encPara, k_certNum);
kmcVO.setRecCert(rec_cert);
// 06. 2차 파싱
int info1 = rec_cert.indexOf("/", 0);
int info2 = rec_cert.indexOf("/", info1 + 1);
int info3 = rec_cert.indexOf("/", info2 + 1);
int info4 = rec_cert.indexOf("/", info3 + 1);
int info5 = rec_cert.indexOf("/", info4 + 1);
int info6 = rec_cert.indexOf("/", info5 + 1);
int info7 = rec_cert.indexOf("/", info6 + 1);
int info8 = rec_cert.indexOf("/", info7 + 1);
int info9 = rec_cert.indexOf("/", info8 + 1);
int info10 = rec_cert.indexOf("/", info9 + 1);
int info11 = rec_cert.indexOf("/", info10 + 1);
int info12 = rec_cert.indexOf("/", info11 + 1);
int info13 = rec_cert.indexOf("/", info12 + 1);
int info14 = rec_cert.indexOf("/", info13 + 1);
int info15 = rec_cert.indexOf("/", info14 + 1);
int info16 = rec_cert.indexOf("/", info15 + 1);
int info17 = rec_cert.indexOf("/", info16 + 1);
int info18 = rec_cert.indexOf("/", info17 + 1);
certNum = rec_cert.substring(0, info1);
kmcVO.setCertNum(certNum);
date = rec_cert.substring(info1 + 1, info2);
kmcVO.setDate(date);
CI = rec_cert.substring(info2 + 1, info3);
kmcVO.setCI(CI);
phoneNo = rec_cert.substring(info3 + 1, info4);
kmcVO.setPhoneNo(phoneNo);
phoneCorp = rec_cert.substring(info4 + 1, info5);
kmcVO.setPhoneCorp(phoneCorp);
birthDay = rec_cert.substring(info5 + 1, info6);
kmcVO.setBirthDay(birthDay);
gender = rec_cert.substring(info6 + 1, info7);
kmcVO.setGender(gender);
nation = rec_cert.substring(info7 + 1, info8);
kmcVO.setNation(nation);
name = rec_cert.substring(info8 + 1, info9);
kmcVO.setName(name);
result = rec_cert.substring(info9 + 1, info10);
kmcVO.setResult(result);
certMet = rec_cert.substring(info10 + 1, info11);
kmcVO.setCertMet(certMet);
ip = rec_cert.substring(info11 + 1, info12);
kmcVO.setIp(ip);
M_name = rec_cert.substring(info12 + 1, info13);
kmcVO.setMName(M_name);
M_birthDay = rec_cert.substring(info13 + 1, info14);
kmcVO.setMBirthDay(M_birthDay);
M_Gender = rec_cert.substring(info14 + 1, info15);
kmcVO.setMGender(M_Gender);
M_nation = rec_cert.substring(info15 + 1, info16);
kmcVO.setMNation(M_nation);
plusInfo = rec_cert.substring(info16 + 1, info17);
kmcVO.setPlusInfo(plusInfo);
DI = rec_cert.substring(info17 + 1, info18);
kmcVO.setDI(DI);
// 07. CI, DI 복호화
CI = seed.getDec(CI, k_certNum);
kmcVO.setCI(CI);
DI = seed.getDec(DI, k_certNum);
kmcVO.setDI(DI);
if ("Y".equals(result)) {
}
// --------------------------------------------------------------
String regex = "";
if (certNum.length() == 0 || certNum.length() > 40) {
errMessage = "요청번호 비정상.";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (date.length() != 14 || !paramChk(regex, date)) {
errMessage = "요청일시";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (certMet.length() != 1 || !paramChk(regex, certMet)) {
errMessage = "본인인증방법 비정상" + certMet;
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if ((phoneNo.length() != 10 && phoneNo.length() != 11) || !paramChk(regex, phoneNo)) {
errMessage = "휴대폰번호 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (phoneCorp.length() != 3 || !paramChk(regex, phoneCorp)) {
errMessage = "이동통신사 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (birthDay.length() != 8 || !paramChk(regex, birthDay)) {
errMessage = "생년월일 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (gender.length() != 1 || !paramChk(regex, gender)) {
errMessage = "성별 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (nation.length() != 1 || !paramChk(regex, nation)) {
errMessage = "내/외국인 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[\\sA-Za-z가-<2D>R.,-]*";
if (name.length() > 60 || !paramChk(regex, name)) {
errMessage = "성명 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (result.length() != 1 || !paramChk(regex, result)) {
errMessage = "결과값 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[\\sA-Za-z가-?.,-]*";
if (M_name.length() != 0) {
if (M_name.length() > 60 || !paramChk(regex, M_name)) {
errMessage = "미성년자 성명 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_birthDay.length() != 0) {
if (M_birthDay.length() != 8 || !paramChk(regex, M_birthDay)) {
errMessage = "미성년자 생년월일 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_Gender.length() != 0) {
if (M_Gender.length() != 1 || !paramChk(regex, M_Gender)) {
errMessage = "미성년자 성별 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_nation.length() != 0) {
if (M_nation.length() != 1 || !paramChk(regex, M_nation)) {
errMessage = "미성년자 내/외국인 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
// KMC 본인인증 로그
AuthCertVO certVO = new AuthCertVO();

View File

@ -28,7 +28,5 @@ public interface ApiCallInfoMngService {
//api key & api info 모두 실제 삭제
void deleteApiKeyInfoReal(ApiKeyVO apiKeyVO) throws Exception;
void udpateApiKeyInfoReal(ApiKeyVO apiKeyVO) throws Exception;
}

View File

@ -43,8 +43,4 @@ public class ApiCallInfoMngDAO extends EgovComAbstractDAO{
public void deleteApiCallInfoAll(ApiKeyVO apiKeyVO) throws Exception{
update("ApiCallInfoMngDAO.deleteApiCallInfoAll", apiKeyVO);
}
public void updateApiCallInfoAll(ApiKeyVO apiKeyVO) throws Exception{
update("ApiCallInfoMngDAO.updateApiCallInfoAll", apiKeyVO);
}
}

View File

@ -65,15 +65,5 @@ public class ApiCallInfoMngServiceImpl extends EgovAbstractServiceImpl implement
apiKeyMngDAO.deleteApiKeyReal(apiKeyVO);
}
@Override
public void udpateApiKeyInfoReal(ApiKeyVO apiKeyVO) throws Exception {
apiKeyVO.setUseYn("N");
apiCallInfoMngDAO.updateApiCallInfoAll(apiKeyVO);
//api key 삭제
apiKeyMngDAO.deleteApiKey(apiKeyVO);
}
}

View File

@ -48,6 +48,10 @@ public class ApiKeyMngDAO extends EgovComAbstractDAO{
return update("ApiKeyMngDAO.insertApiKey", apiKeyVO);
}
public void deleteApiKeyReal(ApiKeyVO apiKeyVO) throws Exception{
update("ApiKeyMngDAO.deleteApiKeyReal", apiKeyVO);
}
public List<ApiKeyVO> selectApiKeyApplyStatus(ApiKeyVO apiKeyVO){
return (List<ApiKeyVO>) list("ApiKeyMngDAO.selectApiKeyApplyStatus", apiKeyVO);
}
@ -56,8 +60,4 @@ public class ApiKeyMngDAO extends EgovComAbstractDAO{
return (int) select("ApiKeyMngDAO.selectMberApiKeyChk", apiKeyVO);
}
public void deleteApiKeyReal(ApiKeyVO apiKeyVO) throws Exception{
update("ApiKeyMngDAO.deleteApiKeyReal", apiKeyVO);
}
}

View File

@ -471,10 +471,8 @@ public class ApiKeyMngController {
ApiKeyVO apiKeyVO = new ApiKeyVO();
apiKeyVO.setMberId(userId);
apiKeyVO.setAccessNo(p_accessNo);
// 2025.06.02 update로 수정
// apiCallInfoMngService.deleteApiKeyInfoReal(apiKeyVO);
apiCallInfoMngService.udpateApiKeyInfoReal(apiKeyVO);
apiCallInfoMngService.deleteApiKeyInfoReal(apiKeyVO);
modelAndView.addObject("message", "삭제 완료되었습니다.");
modelAndView.addObject("result", "success");

View File

@ -38,5 +38,5 @@ public class MjonEventVO {
private String point; //사용자 포인트 정보
private String userId; //사용자 아이디
private String frstRegisterId; //등록자 아이디
}

View File

@ -3,8 +3,6 @@ package itn.let.mjo.mjocommon;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -18,8 +16,10 @@ import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;
import org.json.simple.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.mysql.jdbc.StringUtils;
import egovframework.com.idgen.CustomIdGnrService;
import egovframework.rte.fdl.cmmn.exception.FdlException;
@ -27,22 +27,17 @@ import itn.com.cmm.MjonMsgSendVO;
import itn.com.cmm.OptimalMsgResultDTO;
import itn.com.cmm.util.MsgSendUtils;
import itn.com.cmm.util.SlackMessageFormatUtil;
import itn.com.cmm.util.StringUtil;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.mail.service.StatusResponse;
import itn.let.mjo.event.service.MjonEventService;
import itn.let.mjo.event.service.MjonEventVO;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msg.service.impl.MjonMsgDAO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
import itn.let.mjo.msgholiday.service.MsgAlarmSetVO;
import itn.let.mjo.msgholiday.service.MsgHolidayService;
import itn.let.mjo.msgholiday.service.MsgHolidayVO;
import itn.let.sym.site.service.EgovSiteManagerService;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uat.uia.web.SendLogVO;
import itn.let.uss.umt.service.EgovUserManageService;
import itn.let.uss.umt.service.UserManageVO;
import lombok.extern.slf4j.Slf4j;
@ -75,12 +70,6 @@ public class MjonCommon {
@Resource(name = "egovMjonMsgIdCGnrService")
private CustomIdGnrService idgenMsgCId;
@Resource(name = "mjonMsgDAO")
private MjonMsgDAO mjonMsgDAO;
@Resource(name = "MjonMsgDataService")
private MjonMsgDataService mjonMsgDataService;
@ -544,12 +533,12 @@ private int parseIntOrDefault(String value, int defaultValue) {
UserManageVO userManageVO = getUserManageInfo(kakaoVO.getUserId());
// 기본값 처리된 사용자 정보와 문자 상태
String adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn(); // 법인폰 알람 여부 - Y : ON
String atSmishingYn = userManageVO.getAtSmishingYn(); // 스미싱 의심 - Y : ON
String adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn();
String atSmishingYn = userManageVO.getAtSmishingYn();
// 조건 체크
if ("Y".equals(adminSmsNoticeYn) || "Y".equals(atSmishingYn)) {
kakaoVO.setAtSmishingYn("Y"); // MjonMsgVO에 스미싱 정보 설정 - Y면
kakaoVO.setAtSmishingYn("Y"); // MjonMsgVO에 스미싱 정보 설정
// 스미싱 알림 처리
return handleSmishingAlert(); // 알림 처리 결과 반환
@ -557,46 +546,6 @@ private int parseIntOrDefault(String value, int defaultValue) {
return false; // 알림 처리되지 않음
}
/**
* @methodName : processUserAndCheckFT
* @author : 이호영
* @date : 2025. 8. 21.
* @description :
* @return : boolean
* @param kakaoVO
* @return
* @throws Exception
*
* @isHolidayNotified
* @false : 알림 X
* @true : 알림 O
*
*/
public boolean processUserAndCheckFT(KakaoVO kakaoVO) throws Exception {
// UserManageVO userManageVO = getUserManageInfo(kakaoVO.getUserId());
// kakaoVO.setAtSmishingYn("N"); // MjonMsgVO에 스미싱 정보 설정 - Y면 딜레이 처리
// 기본값 처리된 사용자 정보와 문자 상태
// String adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn(); // 법인폰 알람 여부 - Y : ON
// String atSmishingYn = userManageVO.getAtSmishingYn(); // 스미싱 의심 - Y : ON !== mj_msg_group_data와 다른거임
// 조건 체크
// if ("Y".equals(adminSmsNoticeYn) || "Y".equals(atSmishingYn)) {
// if ("Y".equals(atSmishingYn)) {
// Boolean B_return = handleSmishingAlert();
// if(B_return) { // true면 알림ON이라서 스미싱Yn을 Y로 설정 아니면 N / 나머지는 로직에서 처리
// kakaoVO.setAtSmishingYn(atSmishingYn); // MjonMsgVO에 스미싱 정보 설정 - Y면 딜레이 처리
// }
// 스미싱 알림 처리
// return B_return; // 알림 처리 결과 반환
// }
return handleSmishingAlert(); // 알림 처리되지 않음
}
// 사용자 정보 조회 기본값 처리
public UserManageVO getUserManageInfo(String userId) throws Exception {
@ -795,120 +744,8 @@ private int parseIntOrDefault(String value, int defaultValue) {
return result;
}
public void sendMessagesIfOverFifty(int cnt, String callTo) throws Exception {
if(
cnt >= 50 //50건 이상일 경우만 발송
&& StringUtil.isNotEmpty(callTo) // null, "" 체크
&& callTo.startsWith("010") // 010으로 시작하는 휴대폰번호일 경우
&& "Y".equals(selectSmsNotiIfOverFiftySetting()) // 안내문자 발송 on 인경우만
&& !sysMsgTodaySendYn(callTo) // 금일 1회 이상 보낸 이력없을 경우만 발송
) {
//50건이상 발송 안내문자 구분값 = 01
String sendMsgType = "01";
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String contents = "[인터넷 대량문자발송안내] 문자온에서 "+ callTo + " 번호로 " + today + "에 인터넷 대량 문자(50통 이상)가 발송되었습니다."
+ "\n※ 번호도용이 의심되는 경우, 이용 중인 이동통신사의 휴대전화 번호도용 문자차단 부가서비스(무료)에 가입하여 피해를 예방할 수 있습니다.";
this.sendSysMsg(
"15518011"
, callTo
, contents
, sendMsgType
);
}
}
/**
* Method Name : sendSysMsg
* Description : 관리자 안내 문자 공통
*
* @param callFrom : 발신번호
* @param callTo : 수신번호
* @param contents : 내용
* @param sendMsgType : 발신내용 타입 - 01: 대량문자발송안내
* @return
* @throws Exception
* @return MjonMsgReturnVO 설명
*/
@Transactional(rollbackFor = Exception.class)
public MjonMsgReturnVO sendSysMsg(
String callFrom
, String callTo
, String contents
, String sendMsgType
) throws Exception {
//결과 vo
MjonMsgReturnVO returnVO = new MjonMsgReturnVO();
MjonMsgVO mjonMsgVO = new MjonMsgVO();
mjonMsgVO.setSmsTxt(contents);
mjonMsgVO.setReserveYn("N");
// 시스템 문자발송 번호
// mjonMsgVO.setCallFrom("15518011");
mjonMsgVO.setCallFrom(callFrom);
mjonMsgVO.setCallTo(callTo);
mjonMsgVO.setUserId("system");
/*
* 본문길이에 따른 단문/장문 구분
* 단문 4
* 장문 6
* 2000자 이상 invalid
*/
String msgType = MsgSendUtils.getMsgTypeWithByteValidation(new MjonMsgSendVO(), contents);//
mjonMsgVO.setMsgType(msgType);
// MsgDiv - S: 단문, L: 장문, P: 그림
if("4".equalsIgnoreCase(msgType)) {
mjonMsgVO.setMsgDiv("S");
}else if("6".equalsIgnoreCase(msgType)) {
mjonMsgVO.setMsgDiv("L");
}
else { // invalid
returnVO.setMsgGroupId("");
returnVO.setSendMsgCnt("0"); // 발송 건수 저장
returnVO.setSendMsgBlockCnt("0"); // 수신차단 건수 저장
return returnVO;
}
// 문자타입별 대표전송사 정보
MjonMsgVO mjonMsgVO2 = new MjonMsgVO();
mjonMsgVO2 = mjonMsgDAO.selectRepMsgAgetnInfo(mjonMsgVO);
// 전송사 구분 코드 - 01 : 아이하트, 02 : 현대 퓨쳐넷, 03 : 아이엠오, 04 : 다우기술
mjonMsgVO.setAgentCode(mjonMsgVO2.getAgentCode()); //전송사 선택
// 전송금액
mjonMsgVO.setTotPrice(mjonMsgVO2.getAgentPrice().toString()); //총금액
mjonMsgVO.setEachPrice(mjonMsgVO2.getAgentPrice().toString()); //한건 금액
returnVO = mjonMsgDataService.insertSysMsgDataInfo(mjonMsgVO);
// 시스템 발송 로그
SendLogVO sendLogVO = new SendLogVO();
// SendType 1:문자로 발송 2:이메일로 발송
sendLogVO.setSendId(returnVO.getMsgGroupId());
sendLogVO.setSendType("1");
sendLogVO.setFrstSendInfo(mjonMsgVO.getCallFrom());
sendLogVO.setReceive(mjonMsgVO.getCallTo());
sendLogVO.setContents(contents);
sendLogVO.setSendMsgType(sendMsgType);
mjonMsgDataService.insertSysMsgLog(sendLogVO);
return returnVO;
}
private Boolean sysMsgTodaySendYn(String callTo) throws Exception {
SendLogVO sendLogVO = new SendLogVO();
sendLogVO.setReceive(callTo);
return mjonMsgDataService.selectSysMsgTodaySendYn(sendLogVO);
}
private String selectSmsNotiIfOverFiftySetting() throws Exception {
JoinSettingVO joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
return joinSettingVO.getSmsNotiIfOverFifty();
}
}

View File

@ -12,7 +12,6 @@ import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@JsonIgnoreProperties(ignoreUnknown = true)
@Getter
@ -20,7 +19,6 @@ import lombok.ToString;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class MjonMsgVO extends ComDefaultVO{
private static final long serialVersionUID = 1L;
@ -168,7 +166,6 @@ public class MjonMsgVO extends ComDefaultVO{
private float smsPrice; // sms 단가
private float mmsPrice; // mms 단가
private float picturePrice; // mms 단가
private float kakaoAtPrice; // 카카오 알림톡 단가
private float kakaoFtPrice; // 카카오 친구톡 단가
private float kakaoFtImgPrice;// 카카오 이미지 단가
@ -305,8 +302,6 @@ public class MjonMsgVO extends ComDefaultVO{
private String bizLogCallStatusCode; //다우기술 biz_log 테이블의 발송결과 코드 성공/실패/대기 코드값 변환(성공:S, 대기:W, 실패:F).
private String bizLogCallStatusTxt; //다우기술 biz_log 테이블의 발송결과 내용 텍스트.
private String bizLogStatus; //다우기술 biz_log 테이블의 전송상태값
private String bizKakaoImageType; // 비즈 발송 img
private String accessKey; // 'API Key',

View File

@ -455,11 +455,6 @@ public class MjonMsgDAO extends EgovAbstractDAO {
update("mjonMsgDAO.updateKakaoAtDelayCancelMsgDataFlag", mjonMsgVO);
}
// mj_msg_data 테이블 지연 알림톡 취소 수정
public void updateRefundY(MjonMsgVO mjonMsgVO) {
update("mjonMsgDAO.updateRefundY", mjonMsgVO);
}
// mj_msg_group_data 테이블 지연 알림톡 취소 수정
public void updateKakaoAtDelayCancelMsgGroupDataFlag(MjonMsgVO mjonMsgVO) {
update("mjonMsgDAO.updateKakaoAtDelayCancelMsgGroupDataFlag", mjonMsgVO);

View File

@ -211,9 +211,9 @@ public class MjonMsgCampainDataController {
// 외부에서 선거발송 페이지로 들어오는걸 막음
// 20250102 이호영
/*if (!"localhost".equals(hostName) && !"119.193.215.98".equals(hostName)) {
if (!"localhost".equals(hostName) && !"119.193.215.98".equals(hostName)) {
return "redirect:/web/mjon/msgdata/selectMsgDataView.do";
}*/
}
String categoryType = cateCode.getCateType();

View File

@ -200,17 +200,9 @@ public class MjonMsgCampainTWDataController {
// 외부에서 선거발송 페이지로 들어오는걸 막음
// 20250102 이호영
System.out.println("hostName :: "+ hostName);
System.out.println("hostName :: "+ hostName);
System.out.println("hostName :: "+ hostName);
System.out.println("hhhhhhhh hostName :: "+ hostName);
System.out.println("hostName :: "+ hostName);
System.out.println("hostName :: "+ hostName);
// if (!"localhost".equals(hostName)
// && !"119.193.215.98".equals(hostName))
// {
// return "redirect:/web/mjon/msgdata/selectMsgDataView.do";
// }
if (!"localhost".equals(hostName)) {
return "redirect:/web/mjon/msgdata/selectMsgDataView.do";
}
String categoryType = cateCode.getCateType();

View File

@ -190,7 +190,7 @@ public interface MjonMsgDataService {
public MjonMsgReturnVO sendSysMsgData(MjonMsgVO mjonMsgVO, HttpServletRequest request) throws Exception;
public Boolean selectSysMsgTodaySendYn(SendLogVO sendLogVO) throws Exception;
}

View File

@ -403,10 +403,6 @@ public class MjonMsgDataDAO extends EgovAbstractDAO {
return result;
}
public Boolean selectSysMsgTodaySendYn(SendLogVO sendLogVO) throws Exception{
return (Boolean) select("mjonMsgDataDAO.selectSysMsgTodaySendYn",sendLogVO);
}
/**
* 다량 데이터를 Batch 처리로 MJ_MSG_DATA 테이블에 INSERT

View File

@ -3946,39 +3946,26 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
@Override
public StatusResponse sendMsgData_advc(MjonMsgVO mjonMsgVO, HttpServletRequest request) throws Exception {
// log.info("mjonMsgVO [{}]", mjonMsgVO.getMjonMsgSendVOList().get(0).getPhone());
log.info("mjonMsgVO [{}]", mjonMsgVO.getMjonMsgSendVOList().get(0).getPhone());
log.info(" :: sendMsgData_advc :: ");
log.info(" + mjonMsgVO.toString() :: [{}]", mjonMsgVO.toString());
StatusResponse statusResponse = new StatusResponse();
Map<String, Object> returnMap = new HashMap<>();
Map<String, Object> apiReturnMap = new HashMap<>();
String userId = "";
if("A".equals(mjonMsgVO.getSendKind()))
{
userId = mjonMsgVO.getMberId();
}else {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
: null;
userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if (userId.equals("")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용이 가능합니다.");
}
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
: null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if (userId.equals("")) {
return new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용이 가능합니다.");
}
mjonMsgVO.setUserId(userId);
mjonMsgVO.setUserId(userId);
// 발신번호가 등록된 유효한 번호인지 확인
int sendCallFromCnt = mjonMsgDAO.selectCallFromNumberChk(mjonMsgVO);
if (sendCallFromCnt < 1) {
// return new StatusResponse(HttpStatus.BAD_REQUEST, "등록된 발신번호를 찾을 수 없습니다.");
return StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "등록된 발신번호를 찾을 수 없습니다.", "STAT_1010");
return new StatusResponse(HttpStatus.BAD_REQUEST, "등록된 발신번호를 찾을 수 없습니다.");
}
/**
@ -3988,10 +3975,8 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
if (!mberSttus) {
request.getSession().invalidate();
// UNAUTHORIZED : 인증되지 않은 사용자가 접근하려고
// return new StatusResponse(HttpStatus.UNAUTHORIZED,
// "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 문자를 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.");
return StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 문자를 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다."
, "STAT_1070");
return new StatusResponse(HttpStatus.UNAUTHORIZED,
"현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 문자를 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.");
}
String smsTxt = mjonMsgVO.getSmsTxtArea();
@ -4005,9 +3990,9 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
log.debug(" :: smsTxt :: [{}]", smsTxt);
StatusResponse statusResponse = new StatusResponse();
// 화면에서 저장한 이미지 가져오기
// API는 이미지가 없어서 해당 없음
mjonMsgVO = setImagesSetting(mjonMsgVO, statusResponse);
if (mjonMsgVO == null) {
@ -4029,10 +4014,9 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
int deletedCount = initialSize - finalSize;
// 수신거부 목록
returnMap.put("resultBlockSts", deletedCount);
apiReturnMap.put("resultBlockSts", deletedCount);
if (mjonMsgSendVOList.size() < 1) {
return StatusResponse.statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "수신거부와 매칭되는 번호 제거 후 \n발송 가능한 수신목록이 존재하지 않습니다.", "STAT_1021");
return new StatusResponse(HttpStatus.BAD_REQUEST, "수신거부와 매칭되는 번호 제거 후 \n발송 가능한 수신목록이 존재하지 않습니다.");
}
// 전용 전송사 코드 대표 전송사 조회
@ -4139,7 +4123,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
* */
if (!isCashSufficient(mjonMsgVO, mjonMsgSendVOList)) {
log.error("Insufficient balance for message sending.");
return new StatusResponse(HttpStatus.BAD_REQUEST, "문자 발송에 필요한 보유 잔액이 부족 합니다.", "STAT_1060");
return new StatusResponse(HttpStatus.BAD_REQUEST, "문자 발송에 필요한 보유 잔액이 부족 합니다.");
}
System.out.println("==================== insert 시작 ====================");
@ -4154,24 +4138,13 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
// instTotalCnt : 화면에서 보여줄 발송건수
int instTotalCnt = 0;
// Step 2: 그룹화 데이터를 그룹별로 insert 처리
String apiMsgGroupId = "";
String apiMsgType = "";
for (Map.Entry<String, List<MjonMsgSendVO>> entry : priceGroupedMessages.entrySet()) {
List<MjonMsgSendVO> groupedMsgList = entry.getValue(); // 해당 가격의 메시지 리스트
// msgGroupId 생성
String nextMsgGroupId = idgenMjonMsgGroupId.getNextStringId();
groupedMsgList.forEach(t -> t.setMsgGroupId(nextMsgGroupId));
// api 전달
apiMsgGroupId = StringUtils.isNotEmpty(apiMsgGroupId)
? apiMsgGroupId + "," + nextMsgGroupId
: nextMsgGroupId;
apiMsgType = StringUtils.isNotEmpty(apiMsgType)
? apiMsgType + "," + mjonMsgSendVOList.get(0).getMsgType()
: mjonMsgSendVOList.get(0).getMsgType();
// 발송 데이터 삽입
int instCnt = this.insertMsgData_advc(groupedMsgList);
@ -4202,38 +4175,17 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
// returnMap.put("resultSts", instCnt);
log.debug("가격 [{}]의 총 갯수: [{}]", entry.getKey(), groupedMsgList.size());
}
// 그룹 ID
apiReturnMap.put("msgGroupId", apiMsgGroupId);
// 메세지 타입
apiReturnMap.put("msgType", apiMsgType);
// 발송 건수
returnMap.put("resultSts", instTotalCnt);
apiReturnMap.put("resultSts", instTotalCnt);
// db insert 성능 개선중 하나에 방법
// 분할 최대건수가 되면 디비에 입력하기
// 여러시도 했지만 일단 보류
// 무시해도
// int instCnt = mjonMsgDataDAO.insertMsgDataInfo_advc(mjonMsgSendVOList);
// int instCnt = mjonMsgDataDAO.insertMsgDataInfo_jdbc_advc(mjonMsgSendVOList);
//50건이상 문자발송 안내메시지 전송
try {
if(
"p".equals(userInfo.getDept()) // 개인회원일 경우에만 발송
) {
mjonCommon.sendMessagesIfOverFifty(instTotalCnt, mjonMsgVO.getCallFrom());
}
} catch (Exception e) {
System.out.println("sendMessagesIfOverFifty method exception.");
}
// 발송 건수
returnMap.put("resultSts", instTotalCnt);
// TEST발송 발송 캐시가 있어야함.
returnMap.put("afterCash", priceAndPoint.getBefCash(userId));
@ -4253,10 +4205,6 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
statusResponse.setStatus(HttpStatus.OK);
statusResponse.setObject(returnMap);
apiReturnMap.put("result", HttpStatus.OK);
apiReturnMap.put("message", "문자 전송이 완료되었습니다.");
statusResponse.setApiReturn(apiReturnMap);
return statusResponse;
}
@ -4404,9 +4352,7 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
int fileCount = 0;
// 장문 메시지일 경우 + 그림 이미지가 첨부된 경우
//
log.info(" + mjonMsgVO.getMsgType() :: [{}]", mjonMsgVO.getMsgType());
log.info(" + mjonMsgVO.getImgFilePathAdvc() :: [{}]", mjonMsgVO.getImgFilePathAdvc());
if ("6".equals(mjonMsgVO.getMsgType()) && mjonMsgVO.getImgFilePathAdvc() != null
if (mjonMsgVO.getMsgType().equals("6") && mjonMsgVO.getImgFilePathAdvc() != null
&& mjonMsgVO.getImgFileIdAdvc() != null) {
// 그림 이미지가 첨부된 경우
@ -5202,9 +5148,4 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
return returnVO;
}
@Override
public Boolean selectSysMsgTodaySendYn(SendLogVO sendLogVO) throws Exception{
return mjonMsgDataDAO.selectSysMsgTodaySendYn(sendLogVO);
}
}

View File

@ -1,22 +0,0 @@
package itn.let.mjo.msgsent.service;
import java.util.List;
import itn.let.cmm.vo.FileInfoVO;
import itn.let.uss.umt.service.UserDefaultVO;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class MjonMsgDetailSentDTO extends UserDefaultVO{
private static final long serialVersionUID = 1L;
private String userId;
private String callTo;
private String statusTxt;
}

View File

@ -65,7 +65,7 @@ public interface MjonMsgSentService {
public Map<String, Object> selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception;
public List<MjonMsgDetailSentDTO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO);
public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO);
public void msgSentExcelDownLoad(MjonMsgSentVO mjonMsgSentVO, HttpServletResponse response) throws IOException, Exception;

View File

@ -9,7 +9,6 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
import itn.let.fax.addr.service.FaxAddrGroupVO;
import itn.let.mjo.addr.service.AddrGroupVO;
import itn.let.mjo.block.service.MjonBlockVO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentDTO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO;
import itn.let.mjo.msgsent.service.MjonMsgSWFDTO;
import itn.let.mjo.msgsent.service.MjonMsgSentVO;
@ -183,9 +182,9 @@ public class MjonMsgSentDAO extends EgovAbstractDAO {
return (MjonMsgDetailSentVO) select("MjonMsgSentDAO.selectAllMsgSentDetailView", mjonMsgDetailSentVO);
}
public List<MjonMsgDetailSentDTO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) {
public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) {
return (List<MjonMsgDetailSentDTO>) list("MjonMsgSentDAO.findByMsgDetailListAjax", mjonMsgDetailSentVO);
return (List<MjonMsgDetailSentVO>) list("MjonMsgSentDAO.findByMsgDetailListAjax", mjonMsgDetailSentVO);
}
public List<String> findByReqDateWhereMsgGroupId(String msgGroupId) {

View File

@ -34,13 +34,11 @@ import org.springframework.stereotype.Service;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import itn.com.cmm.util.StringUtil;
import itn.com.cmm.util.StringUtil2;
import itn.let.cmm.vo.FileInfoVO;
import itn.let.fax.addr.service.FaxAddrGroupVO;
import itn.let.mjo.addr.service.AddrGroupVO;
import itn.let.mjo.block.service.MjonBlockVO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentDTO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO;
import itn.let.mjo.msgsent.service.MjonMsgSWFDTO;
import itn.let.mjo.msgsent.service.MjonMsgSentService;
@ -127,11 +125,6 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements
Map<String, Object> resultMap = new HashMap<String, Object>();
//수신번호 검색 번호 포멧 통일
if("4".equals(mjonMsgSentVO.getSearchCondition()) && StringUtil.isNotEmpty(mjonMsgSentVO.getSearchKeyword())) {
mjonMsgSentVO.setSearchKeyword(mjonMsgSentVO.getSearchKeyword().trim().replace("-", ""));
}
// 목록
List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
@ -481,9 +474,9 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements
}
@Override
public List<MjonMsgDetailSentDTO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) {
public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) {
List<MjonMsgDetailSentDTO> list = mjonMsgSentDAO.findByMsgDetailListAjax(mjonMsgDetailSentVO);
List<MjonMsgDetailSentVO> list = mjonMsgSentDAO.findByMsgDetailListAjax(mjonMsgDetailSentVO);
list.stream().forEach(t->{
t.setCallTo(StringUtil2.formatPhone(t.getCallTo()));
});
@ -644,7 +637,7 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements
// log.info("엑셀에 넣을 데이터: [{}]", data[i][1]);
data[i][2] = "A".equals(vo.getSendKind()) ? "API" : "WEB";
data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API";
String msgType="단문";
if ("6".equals(vo.getMsgType())) {

View File

@ -50,7 +50,6 @@ import itn.let.mjo.addr.service.AddrService;
import itn.let.mjo.addr.service.AddrVO;
import itn.let.mjo.apikey.service.ApiKeyMngService;
import itn.let.mjo.apikey.service.ApiKeyVO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentDTO;
import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO;
import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
import itn.let.mjo.msgsent.service.MjonMsgSentService;
@ -192,17 +191,7 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll
public ResponseEntity<StatusResponse> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception {
List<MjonMsgDetailSentDTO> resultList = new ArrayList<>();
try {
resultList = mjonMsgSentService.findByMsgDetailListAjax(mjonMsgDetailSentVO);
} catch (Exception e) {
e.printStackTrace();
// TODO: handle exception
}
log.info("resultList :: [{}]", resultList.size());
// resultList = resultList.subList(0, 275000);
// log.info("resultList :: [{}]", resultList.size());
List<MjonMsgDetailSentVO> resultList = mjonMsgSentService.findByMsgDetailListAjax(mjonMsgDetailSentVO);
return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, "", resultList));

View File

@ -18,10 +18,10 @@ public class KmcVO extends ComDefaultVO{
private String gender = ""; // 성별
private String nation = ""; // 내국인
private String name = ""; // 성명
// private String MName = ""; // 미성년자 성명
// private String MBirthDay = ""; // 미성년자 생년월일
// private String MGender = ""; // 미성년자 성별
// private String MNation = ""; // 미성년자 내외국인
private String MName = ""; // 미성년자 성명
private String MBirthDay = ""; // 미성년자 생년월일
private String MGender = ""; // 미성년자 성별
private String MNation = ""; // 미성년자 내외국인
private String result = ""; // 결과값
private String certMet = ""; // 인증방법
@ -41,11 +41,6 @@ public class KmcVO extends ComDefaultVO{
private String idx = ""; //본인인증 로그 idx
private String dnChk = ""; //본인명의 DN 체크
private String reserve1 = "";
private String reserve2 = "";
private String reserve3 = "";
private String reserve4 = "";
public String getUserId() {
return userId;
}
@ -182,6 +177,30 @@ public class KmcVO extends ComDefaultVO{
public void setCertNum(String certNum) {
this.certNum = certNum;
}
public String getMName() {
return MName;
}
public void setMName(String mName) {
MName = mName;
}
public String getMBirthDay() {
return MBirthDay;
}
public void setMBirthDay(String mBirthDay) {
MBirthDay = mBirthDay;
}
public String getMGender() {
return MGender;
}
public void setMGender(String mGender) {
MGender = mGender;
}
public String getMNation() {
return MNation;
}
public void setMNation(String mNation) {
MNation = mNation;
}
public String getRecCert() {
return recCert;
}
@ -206,30 +225,7 @@ public class KmcVO extends ComDefaultVO{
public void setCertType(String certType) {
this.certType = certType;
}
public String getReserve1() {
return reserve1;
}
public void setReserve1(String reserve1) {
this.reserve1 = reserve1;
}
public String getReserve2() {
return reserve2;
}
public void setReserve2(String reserve2) {
this.reserve2 = reserve2;
}
public String getReserve3() {
return reserve3;
}
public void setReserve3(String reserve3) {
this.reserve3 = reserve3;
}
public String getReserve4() {
return reserve4;
}
public void setReserve4(String reserve4) {
this.reserve4 = reserve4;
}
}

View File

@ -1,12 +1,9 @@
package itn.let.mjo.pay.service;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import itn.let.mjo.msg.service.MjonMsgVO;
public interface MjonPayService {
List<MjonPayVO> selectPayList(MjonPayVO mjonPayVO) throws Exception;
@ -143,11 +140,4 @@ public interface MjonPayService {
//누적 납부금액 조회 (후불회원이 사용금액을 납부한 금액 합산 - 미납 금액 제외한 합산 금액)
public String selectTotSumPaymentAfterPay(String userId) throws Exception;
Map<String, Object> payUserSWList(MjonPayVO mjonPayVO) throws Exception;
Map<String, Object> payUserSWListAjax(MjonMsgVO mjonMsgVO) throws Exception;
//거래명세서 상세 조회
MjonPayVO selectPayDetail(MjonPayVO mjonPayVO) throws Exception;
}

View File

@ -236,16 +236,8 @@ public class MjonPayVO extends ComDefaultVO{
private int remainPoint;
private String userData;
private String totChgPay; // 간편결제분류
// 거래명세서 내용
private String bizNo; // 사업자등록번호
private String managerNm; // 담당자명
private String prePaymentYn; // 선불결제여부 N:후불제고객
private String dept; // 회원종류 p:개인 c:기업
}

View File

@ -5,7 +5,6 @@ import java.util.List;
import org.springframework.stereotype.Repository;
import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
import itn.let.kakao.kakaoComm.BizKakaoPriceVO;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.mjo.pay.service.MjonVaMsgLogVO;
import itn.let.mjo.pay.service.RefundVO;
@ -46,10 +45,6 @@ public class MjonPayDAO extends EgovAbstractDAO {
public MjonPayVO selectCashVO(MjonPayVO mjonPayVO) throws Exception{
return (MjonPayVO)select("mjonPayDAO.selectCashVO", mjonPayVO);
}
public BizKakaoPriceVO selectBizKakaoPrice(String msgGroupId) throws Exception{
return (BizKakaoPriceVO)select("mjonPayDAO.selectBizKakaoPrice", msgGroupId);
}
public void insertCash(MjonPayVO mjonPayVO) throws Exception{
@ -358,8 +353,5 @@ public class MjonPayDAO extends EgovAbstractDAO {
return result;
}
public MjonPayVO selectPayDetail(MjonPayVO mjonPayVO) throws Exception{
return (MjonPayVO)select("mjonPayDAO.selectPayDetail", mjonPayVO);
}
}

View File

@ -7,16 +7,11 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.security.MessageDigest;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@ -30,15 +25,11 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import itn.com.cmm.LoginVO;
import itn.com.cmm.util.DateUtils;
import itn.com.cmm.util.MJUtil;
import itn.com.cmm.util.PayUtils;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.mjo.event.service.MjonEventVO;
import itn.let.mjo.event.service.impl.MjonEventDAO;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msgcampain.service.MjonCandidateVO;
import itn.let.mjo.msgcampain.service.impl.MjonCandidateDAO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
import itn.let.mjo.pay.service.MjonPayService;
@ -103,10 +94,6 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
@Resource(name = "mberGrdService")
MberGrdService mberGrdService;
@Resource(name="mjonCandidateDAO")
private MjonCandidateDAO mjonCandidateDAO;
@Override
public List<MjonPayVO> selectPayList(MjonPayVO mjonPayVO) throws Exception {
return mjonPayDAO.selectPayList(mjonPayVO);
@ -2852,144 +2839,6 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
}
@Override
public Map<String, Object> payUserSWList(MjonPayVO mjonPayVO) throws Exception{
String userId = mjonPayVO.getUserId();
// 사용금액
List<MjonPayVO> usedCashTotList = mjonPayDAO.selectUsedCashWithKakaoTotCnt(mjonPayVO);
// 사용가능한 금액
// mberManageVO.prePaymentYn 선불 후불 회원 구분으로 인해 select함
MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(userId);
// 선거 후보자 정보 조회
MjonCandidateVO mjonCandidateVO = new MjonCandidateVO();
if("p".equals(mberManageVO.getDept())) { //개인회원 선거 후보자 정보 불러오기
mjonCandidateVO = mjonCandidateDAO.selectCandidateDataInfo(userId);
if(mjonCandidateVO != null) {
mjonCandidateVO.setRegidentNo1(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo1()));
mjonCandidateVO.setRegidentNo2(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo2()));
}
}
/**
* 후불제 회원 관련 사용 요금 내역 정보 조회하기
* 20231228 우영두 추가
* 누적사용금액, 누적 납부금액, 당월 납부 예상금액 정보 조회
*
* */
//누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-" 사용된 금액만 합산)
String totSumCashAfterPay = mjonPayDAO.selectTotalSumCashForAfterPay(userId);
//누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용)
String totSumPointAfterPay = mjonPayDAO.selectTotalSumPointForAfterPay(userId);
//누적 납부금액 조회 (후불회원이 사용금액을 납부한 금액 합산 - 미납 금액 제외한 합산 금액)
String totSumPaymentAfterPay = mjonPayDAO.selectTotSumPaymentAfterPay(userId);
//누적 납부 포인트 조회 ( 누적 납부금액 합산에 대한 2% 포인트 정보 계산)
float p_i_re_point = 0;
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
if (sysJoinSetVO != null) {
p_i_re_point = sysJoinSetVO.getPointPer();
}
int paymentPointAfterPay = Math.round((Float.parseFloat(totSumPaymentAfterPay) * p_i_re_point / 100));
//당월 납부 예상금액 (누적 사용금액 합산 - 누적 납부금액 합산 정보 계산)
float unPaymentAfterPay = Float.parseFloat(totSumCashAfterPay) - Float.parseFloat(totSumPaymentAfterPay);
//당월 납부 예상 포인트 (당월 납부 예상 금액에 대한 2% 포인트 정보 계산)
int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100));
/*
* 2024.02.06 후불제 회원 협의단가를 사용하는 회원은 포인트 적립이 되지 않아야함.
* 후불제 협의 단가 여부 체크
* 모든 협의 단가 금액을 합산하여 0보다 크면 협의단가 있음.
* */
float shortPrice = mberManageVO.getShortPrice();
float longPrice = mberManageVO.getLongPrice();
float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
String negoPriceYn = "N";
if(totPrice > 0) {
negoPriceYn = "Y";
}
Map<String, Object> returnData = new HashMap<>();
returnData.put("usedCashTotList", usedCashTotList);
returnData.put("mberManageVO", mberManageVO);
returnData.put("mjonCandidateVO", mjonCandidateVO);
returnData.put("totSumCashAfterPay", totSumCashAfterPay);
returnData.put("totSumPointAfterPay", totSumPointAfterPay);
returnData.put("totSumPaymentAfterPay", totSumPaymentAfterPay);
returnData.put("sumPaymentPointAfterPay", paymentPointAfterPay);
returnData.put("unPaymentAfterPay", unPaymentAfterPay);
returnData.put("unPaymentPointAfterPay", unPaymentPointAfterPay);
returnData.put("negoPriceYn", negoPriceYn);
// 초기 날짜 셋팅
returnData.put("startDate", DateUtils.getDateMonthsAgo(1));
returnData.put("endDate", DateUtils.getCurrentDate());
// TODO Auto-generated method stub
return returnData;
}
@Override
public Map<String, Object> payUserSWListAjax(MjonMsgVO mjonMsgVO) throws Exception{
if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
mjonMsgVO.setSearchSortCnd("regDate");
mjonMsgVO.setSearchSortOrd("desc");
}
Map<String, Object> returnData = new HashMap<>();
// 검색 데이터가 없거나
// 시작일자가 종료일자보다 이후이거나
// 기간이 365일이 넘으면 현재일부터 365일 날짜를 넣어서 검색
if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 12 )) {
mjonMsgVO.setStartDate(DateUtils.getDateMonthsAgo(12));
mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
};
List<MjonMsgVO> payUserSWList = mjonMsgDataDAO.selectPayUserSWList(mjonMsgVO);
returnData.put("payUserSWList", payUserSWList);
returnData.put("totCnt", payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0);
returnData.put("totSuccSendPrice", payUserSWList.size() > 0 ? PayUtils.getTrimToFirstDecimal(payUserSWList.get(0).getTotSuccSendPrice()) : 0);
return returnData;
}
@Override
public MjonPayVO selectPayDetail(MjonPayVO mjonPayVO) throws Exception {
MjonPayVO result = mjonPayDAO.selectPayDetail(mjonPayVO);
/* 후불제 고객의 사용기한 조회(결제일의 전달 1일 ~ 말일) */
if("N".equals(result.getPrePaymentYn())) {
String regDateStr = result.getRegDate();
LocalDateTime regDate = Timestamp.valueOf(regDateStr).toLocalDateTime();
LocalDate lastMonth = regDate.toLocalDate().withDayOfMonth(1).minusMonths(1);
LocalDate startDate = lastMonth.withDayOfMonth(1);
LocalDate endDate = lastMonth.withDayOfMonth(lastMonth.lengthOfMonth());
result.setStartDate(startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
result.setEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
return result;
}
}

View File

@ -91,7 +91,6 @@ import itn.let.sym.grd.service.MberGrdVO;
import itn.let.sym.site.service.EgovSiteManagerService;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uat.uia.service.AuthCertVO;
import itn.let.uat.uia.web.KmcCertChecker;
import itn.let.uss.umt.service.EgovMberManageService;
import itn.let.uss.umt.service.EgovUserManageService;
import itn.let.uss.umt.service.MberManageVO;
@ -166,10 +165,7 @@ public class MjonPayController {
EgovSiteManagerService egovSiteManagerService;
@Resource(name = "mberGrdService")
MberGrdService mberGrdService;
@Resource(name = "KmcCertChecker")
KmcCertChecker kmcCertChecker;
MberGrdService mberGrdService;
//배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"}
private String[][] sendPayExcelValue ={
@ -934,7 +930,7 @@ public class MjonPayController {
}
/**
* 회원가입 본인인증
* 나이스페이(PG사 전송화면)
*
* @param
* @return
@ -945,10 +941,270 @@ public class MjonPayController {
ModelMap model , @RequestParam Map<String, Object> commandMap,
@ModelAttribute("searchVO") KmcVO kmcVO) throws Exception {
//kmc 본인인증 결과처리
kmcVO = kmcCertChecker.authCertResult(request, response, model);
//kmc 본인인증 로그 처리
AuthCertVO certVO = kmcCertChecker.insertCertLog(kmcVO, "KMC_회원가입 인증");
//크롬 SameSite정책 방지 - 도메인이 다른 타사로 이동 크롬 정책에 의해 세션 유실이 일어나는 경우가 있는데, 이를 방지하기 위해 samesite 보안을 none처리
response.setHeader("Set-Cookie", "mberSession=mberSession; Secure; SameSite=None");
System.out.println("++++++++++++ 세션체크 ::: "+ session.getAttribute("mberSession"));
String errMessage = ""; //에러메세지
String rec_cert = ""; // 결과값(암호화)
String certNum = ""; // certNum
rec_cert = request.getParameter("rec_cert").trim();
certNum = request.getParameter("certNum").trim();
kmcVO.setRecCert(rec_cert);
kmcVO.setCertNum(certNum);
// 파라미터 유효성 검증
if( rec_cert.length() == 0 || certNum.length() == 0 ){
errMessage = "비정상";
return returnPage(model , errMessage , kmcVO) ;
}
// 변수선언 --------------------------------------------------------------------------------------------------------
String k_certNum = ""; // 파라미터로 수신한 요청번호
k_certNum = certNum;
String date = ""; // 요청일시
String CI = ""; // 연계정보(CI)
String DI = ""; // 중복가입확인정보(DI)
String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사
String birthDay = ""; // 생년월일
String gender = ""; // 성별
String nation = ""; // 내국인
String name = ""; // 성명
String M_name = ""; // 미성년자 성명
String M_birthDay = ""; // 미성년자 생년월일
String M_Gender = ""; // 미성년자 성별
String M_nation = ""; // 미성년자 내외국인
String result = ""; // 결과값
String certMet = ""; // 인증방법
String ip = ""; // ip주소
String plusInfo = "";
String encPara = "";
String encMsg1 = "";
String encMsg2 = "";
String msgChk = "";
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
//02. 1차 복호화
//수신된 certNum를 이용하여 복호화
rec_cert = seed.getDec(rec_cert, k_certNum);
//03. 1차 파싱
int inf1 = rec_cert.indexOf("/",0);
int inf2 = rec_cert.indexOf("/",inf1+1);
encPara = rec_cert.substring(0,inf1); //암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1+1,inf2); //암호화된 통합 파라미터의 Hash값
//04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
kmcVO.setEncMsg2(encMsg2);
if(encMsg2.equals(encMsg1)){
msgChk="Y";
}
if(!"Y".equals(msgChk)) {
errMessage = "비정상접근입니다.";
return returnPage(model , errMessage , kmcVO) ;
}
//05. 2차 복호화
rec_cert = seed.getDec(encPara, k_certNum);
kmcVO.setRecCert(rec_cert);
//06. 2차 파싱
int info1 = rec_cert.indexOf("/",0);
int info2 = rec_cert.indexOf("/",info1+1);
int info3 = rec_cert.indexOf("/",info2+1);
int info4 = rec_cert.indexOf("/",info3+1);
int info5 = rec_cert.indexOf("/",info4+1);
int info6 = rec_cert.indexOf("/",info5+1);
int info7 = rec_cert.indexOf("/",info6+1);
int info8 = rec_cert.indexOf("/",info7+1);
int info9 = rec_cert.indexOf("/",info8+1);
int info10 = rec_cert.indexOf("/",info9+1);
int info11 = rec_cert.indexOf("/",info10+1);
int info12 = rec_cert.indexOf("/",info11+1);
int info13 = rec_cert.indexOf("/",info12+1);
int info14 = rec_cert.indexOf("/",info13+1);
int info15 = rec_cert.indexOf("/",info14+1);
int info16 = rec_cert.indexOf("/",info15+1);
int info17 = rec_cert.indexOf("/",info16+1);
int info18 = rec_cert.indexOf("/",info17+1);
certNum = rec_cert.substring(0,info1); kmcVO.setCertNum(certNum);
date = rec_cert.substring(info1+1,info2); kmcVO.setDate(date);
CI = rec_cert.substring(info2+1,info3); kmcVO.setCI(CI);
phoneNo = rec_cert.substring(info3+1,info4); kmcVO.setPhoneNo(phoneNo);
phoneCorp = rec_cert.substring(info4+1,info5); kmcVO.setPhoneCorp(phoneCorp);
birthDay = rec_cert.substring(info5+1,info6); kmcVO.setBirthDay(birthDay);
gender = rec_cert.substring(info6+1,info7); kmcVO.setGender(gender);
nation = rec_cert.substring(info7+1,info8); kmcVO.setNation(nation);
name = rec_cert.substring(info8+1,info9); kmcVO.setName(name);
result = rec_cert.substring(info9+1,info10); kmcVO.setResult(result);
certMet = rec_cert.substring(info10+1,info11); kmcVO.setCertMet(certMet);
ip = rec_cert.substring(info11+1,info12); kmcVO.setIp(ip);
M_name = rec_cert.substring(info12+1,info13); kmcVO.setMName(M_name);
M_birthDay = rec_cert.substring(info13+1,info14); kmcVO.setMBirthDay(M_birthDay);
M_Gender = rec_cert.substring(info14+1,info15); kmcVO.setMGender(M_Gender);
M_nation = rec_cert.substring(info15+1,info16); kmcVO.setMNation(M_nation);
plusInfo = rec_cert.substring(info16+1,info17); kmcVO.setPlusInfo(plusInfo);
DI = rec_cert.substring(info17+1,info18); kmcVO.setDI(DI);
//07. CI, DI 복호화
CI = seed.getDec(CI, k_certNum); kmcVO.setCI(CI);
DI = seed.getDec(DI, k_certNum); kmcVO.setDI(DI);
if("Y".equals(result)) {
}
//--------------------------------------------------------------
String regex = "";
if( certNum.length() == 0 || certNum.length() > 40){
errMessage = "요청번호 비정상.";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[0-9]*";
if( date.length() != 14 || !paramChk(regex, date) ){
errMessage = "요청일시";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[A-Z]*";
if( certMet.length() != 1 || !paramChk(regex, certMet) ){
errMessage = "본인인증방법 비정상" + certMet;
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[0-9]*";
if( (phoneNo.length() != 10 && phoneNo.length() != 11) || !paramChk(regex, phoneNo) ){
errMessage = "휴대폰번호 비정상" ;
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[A-Z]*";
if( phoneCorp.length() != 3 || !paramChk(regex, phoneCorp) ){
errMessage = "이동통신사 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[0-9]*";
if( birthDay.length() != 8 || !paramChk(regex, birthDay) ){
errMessage = "생년월일 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[0-9]*";
if( gender.length() != 1 || !paramChk(regex, gender) ){
errMessage = "성별 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[0-9]*";
if( nation.length() != 1 || !paramChk(regex, nation) ){
errMessage = "내/외국인 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[\\sA-Za-z가-<2D>R.,-]*";
if( name.length() > 60 || !paramChk(regex, name) ){
errMessage = "성명 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[A-Z]*";
if( result.length() != 1 || !paramChk(regex, result) ){
errMessage = "결과값 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
regex = "[\\sA-Za-z가-?.,-]*";
if( M_name.length() != 0 ){
if( M_name.length() > 60 || !paramChk(regex, M_name) ){
errMessage = "미성년자 성명 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
}
regex = "[0-9]*";
if( M_birthDay.length() != 0 ){
if( M_birthDay.length() != 8 || !paramChk(regex, M_birthDay) ){
errMessage = "미성년자 생년월일 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
}
regex = "[0-9]*";
if( M_Gender.length() != 0 ){
if( M_Gender.length() != 1 || !paramChk(regex, M_Gender) ){
errMessage = "미성년자 성별 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
}
regex = "[0-9]*";
if( M_nation.length() != 0 ){
if( M_nation.length() != 1 || !paramChk(regex, M_nation) ){
errMessage = "미성년자 내/외국인 비정상";
return returnPage(model , errMessage , kmcVO) ;
}
}
//본인인증 결과 내용 저장하기.
/*System.out.println("+++++++++++++ getCertNum ::: "+kmcVO.getCertNum());
System.out.println("+++++++++++++ getDate ::: "+kmcVO.getDate());
System.out.println("+++++++++++++ getDI ::: "+kmcVO.getDI());
System.out.println("+++++++++++++ getPhoneNo ::: "+kmcVO.getPhoneNo());
System.out.println("+++++++++++++ getNation ::: "+kmcVO.getNation());
System.out.println("+++++++++++++ getName ::: "+kmcVO.getName());
System.out.println("+++++++++++++ getResult ::: "+kmcVO.getResult());
System.out.println("+++++++++++++ getCertMet ::: "+kmcVO.getCertMet());
System.out.println("+++++++++++++ getIp ::: "+kmcVO.getIp());*/
//KMC 본인인증 정보를 세션에 담아준다.
/*AuthCertVO certVO = new AuthCertVO();
certVO.setCertNum(kmcVO.getCertNum());
certVO.setCertDate(kmcVO.getDate());
certVO.setCertDi(kmcVO.getDI());
certVO.setCertPhone(kmcVO.getPhoneNo());
certVO.setCertNation(kmcVO.getNation());
certVO.setCertName(kmcVO.getName());
certVO.setCertResult(kmcVO.getResult());
certVO.setCertType("KMC문자인증");
certVO.setCertIpaddr(kmcVO.getIp());
certVO.setBirthDay(kmcVO.getBirthDay());
certVO.setSexdstnCode(kmcVO.getGender());*/
/*request.getSession().setAttribute("AuthKmcCertVO", certVO);*/
/*System.out.println("++++++++++++ 세션체크22 ::: "+(MberManageVO) session.getAttribute("mberSession"));*/
//KMC 본인인증 로그 insert
AuthCertVO certVO = new AuthCertVO();
certVO.setMberId(kmcVO.getPlusInfo());
certVO.setCertNum(kmcVO.getCertNum());
certVO.setCertDate(kmcVO.getDate());
certVO.setCertDi(kmcVO.getDI());
certVO.setCertPhone(kmcVO.getPhoneNo());
certVO.setCertNation(kmcVO.getNation());
certVO.setCertName(kmcVO.getName());
certVO.setCertResult(kmcVO.getResult());
certVO.setCertType("KMC_회원가입 인증");
certVO.setCertIpaddr(kmcVO.getIp());
certVO.setBirthDay(kmcVO.getBirthDay());
certVO.setSexdstnCode(kmcVO.getGender());
//디비 테이블에 저장하기
mberManageService.insertCertInfoLog(certVO);
kmcVO.setIdx(certVO.getIdx()); //본인인증 로그 Idx - 로그 insert idx selectKey
model.addAttribute("kmcVO", kmcVO);
@ -2347,16 +2603,15 @@ public class MjonPayController {
* 2023.12.22 우영두
* @param mjonMsgVO
* @param model
* @return "/web/member/pay/payUserSWList.do"
* @return "/web/member/pay/PayUserSWList.do"
* @throws Exception
*/
@RequestMapping(value= {"/web/member/pay/payUserSWList.do"})
public String payUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO,
@RequestMapping(value= {"/web/member/pay/PayUserSWList.do"})
public String PayUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO,
MjonPayVO mjonPayVO,
MberManageVO mberManageVO, RedirectAttributes redirectAttributes,
HttpServletRequest request,
ModelMap model) throws Exception{
/*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();*/
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
@ -2366,26 +2621,117 @@ public class MjonPayController {
return "redirect:/web/user/login/login.do";
}
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
mjonPayVO.setUserId(userId);
mjonMsgVO.setUserId(userId);
/*
{ // 충전캐시
String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId);
model.addAttribute("sumPayMoney", sumPayMoney);
}
{ // 충전포인트
String sumPoint = mjonPayService.selectSumPoint(userId);
model.addAttribute("sumPoint", sumPoint);
}
*/
{ // 사용금액
mjonPayVO.setUserId(userId);
List<MjonPayVO> usedCashTotList = mjonPayService.selectUsedCashWithKakaoTotCnt(mjonPayVO);
model.addAttribute("usedCashTotList", usedCashTotList);
}
{ // 사용가능한 금액
// mberManageVO.prePaymentYn 선불 후불 회원 구분으로 인해 select함
mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
model.addAttribute("mberManageVO", mberManageVO);
}
/*
{ // 발송건수
mjonMsgVO.setReserveYn("N");
List<MjonMsgVO> sendTotList = mjonMsgService.selectWithKakaoSendTotCnt(mjonMsgVO);
model.addAttribute("sendTotList", sendTotList);
}
{ // 예약건수
mjonMsgVO.setReserveYn("Y");
List<MjonMsgVO> reservToList = mjonMsgService.selectWithKakaoSendTotCnt(mjonMsgVO);
model.addAttribute("reservToList", reservToList);
}
*/
{// 선거 후보자 정보 조회
MjonCandidateVO mjonCandidateVO = new MjonCandidateVO();
if("p".equals(mberManageVO.getDept())) { //개인회원 선거 후보자 정보 불러오기
mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId);
if(mjonCandidateVO != null) {
mjonCandidateVO.setRegidentNo1(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo1()));
mjonCandidateVO.setRegidentNo2(egovCryptoUtil.decrypt(mjonCandidateVO.getRegidentNo2()));
}
}
model.addAttribute("mjonCandidateVO", mjonCandidateVO);
}
{
/**
* 후불제 회원 관련 사용 요금 내역 정보 조회하기
* 20231228 우영두 추가
* 누적사용금액, 누적 납부금액, 당월 납부 예상금액 정보 조회
*
* */
//누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-" 사용된 금액만 합산)
String totSumCashAfterPay = mjonPayService.selectTotalSumCashForAfterPay(userId);
model.addAttribute("totSumCashAfterPay", totSumCashAfterPay);
//누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용)
String totSumPointAfterPay = mjonPayService.selectTotalSumPointForAfterPay(userId);
model.addAttribute("totSumPointAfterPay", totSumPointAfterPay);
//누적 납부금액 조회 (후불회원이 사용금액을 납부한 금액 합산 - 미납 금액 제외한 합산 금액)
String totSumPaymentAfterPay = mjonPayService.selectTotSumPaymentAfterPay(userId);
model.addAttribute("totSumPaymentAfterPay", totSumPaymentAfterPay);
//누적 납부 포인트 조회 ( 누적 납부금액 합산에 대한 2% 포인트 정보 계산)
float p_i_re_point = 0;
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
if (sysJoinSetVO != null) {
p_i_re_point = sysJoinSetVO.getPointPer();
}
int paymentPointAfterPay = Math.round((Float.parseFloat(totSumPaymentAfterPay) * p_i_re_point / 100));
model.addAttribute("sumPaymentPointAfterPay", paymentPointAfterPay);
//당월 납부 예상금액 (누적 사용금액 합산 - 누적 납부금액 합산 정보 계산)
float unPaymentAfterPay = Float.parseFloat(totSumCashAfterPay) - Float.parseFloat(totSumPaymentAfterPay);
model.addAttribute("unPaymentAfterPay", unPaymentAfterPay);
//당월 납부 예상 포인트 (당월 납부 예상 금액에 대한 2% 포인트 정보 계산)
int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100));
model.addAttribute("unPaymentPointAfterPay", unPaymentPointAfterPay);
/*
* 2024.02.06 후불제 회원 협의단가를 사용하는 회원은 포인트 적립이 되지 않아야함.
* 후불제 협의 단가 여부 체크
* 모든 협의 단가 금액을 합산하여 0보다 크면 협의단가 있음.
* */
float shortPrice = mberManageVO.getShortPrice();
float longPrice = mberManageVO.getLongPrice();
float picturePrice = mberManageVO.getPicturePrice() + mberManageVO.getPicture2Price() + mberManageVO.getPicture3Price();
float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
float totPrice = shortPrice + longPrice + picturePrice + kakaoAtPrice + kakaoFtPrice;
String negoPriceYn = "N";
// // 비즈니스 로직 부분
Map<String, Object> resultMap = mjonPayService.payUserSWList(mjonPayVO);
model.addAttribute("usedCashTotList", resultMap.get("usedCashTotList"));
model.addAttribute("mjonCandidateVO", resultMap.get("mjonCandidateVO"));
model.addAttribute("mberManageVO", resultMap.get("mberManageVO"));
model.addAttribute("totSumCashAfterPay", resultMap.get("totSumCashAfterPay"));
model.addAttribute("totSumPointAfterPay", resultMap.get("totSumPointAfterPay"));
model.addAttribute("totSumPaymentAfterPay", resultMap.get("totSumPaymentAfterPay"));
model.addAttribute("sumPaymentPointAfterPay", resultMap.get("sumPaymentPointAfterPay"));
model.addAttribute("unPaymentAfterPay", resultMap.get("unPaymentAfterPay"));
model.addAttribute("unPaymentPointAfterPay", resultMap.get("unPaymentPointAfterPay"));
model.addAttribute("negoPriceYn", resultMap.get("negoPriceYn"));
model.addAttribute("startDate", resultMap.get("startDate"));
model.addAttribute("endDate", resultMap.get("endDate"));
if(totPrice > 0) {
negoPriceYn = "Y";
}
model.addAttribute("negoPriceYn", negoPriceYn);
}
{
// 초기 날짜 셋팅
model.addAttribute("startDate", DateUtils.getDateMonthsAgo(12));
model.addAttribute("endDate", DateUtils.getCurrentDate());
}
return "/web/pay/PayUserSWList";
}
@ -2403,8 +2749,8 @@ public class MjonPayController {
* @return "/web/member/pay/PayUserSWListAjax.do"
* @throws Exception
*/
@RequestMapping(value= {"/web/member/pay/payUserSWListAjax.do"})
public String payUserSWListAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO,
@RequestMapping(value= {"/web/member/pay/PayUserSWListAjax.do"})
public String PayUserSWListAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO,
HttpServletRequest request,
ModelMap model) throws Exception{
@ -2428,12 +2774,29 @@ public class MjonPayController {
mjonMsgVO.setLastIndex(paginationInfo.getLastRecordIndex());
mjonMsgVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
Map<String, Object> resultMap = mjonPayService.payUserSWListAjax(mjonMsgVO);
if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
mjonMsgVO.setSearchSortCnd("regDate");
mjonMsgVO.setSearchSortOrd("desc");
}
paginationInfo.setTotalRecordCount((int)resultMap.get("totCnt"));
// 검색 데이터가 없거나
// 시작일자가 종료일자보다 이후이거나
// 기간이 365일이 넘으면 현재일부터 365일 날짜를 넣어서 검색
if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 12 )) {
mjonMsgVO.setStartDate(DateUtils.getDateMonthsAgo(12));
mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
};
List<MjonMsgVO> payUserSWList = mjonMsgDataService.selectPayUserSWList(mjonMsgVO);
paginationInfo.setTotalRecordCount(payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0);
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("payUserSWList", resultMap.get("payUserSWList"));
model.addAttribute("totSuccSendPrice", resultMap.get("totSuccSendPrice"));
model.addAttribute("payUserSWList", payUserSWList);
model.addAttribute("totSuccSendPrice", payUserSWList.size() > 0 ? PayUtils.getTrimToFirstDecimal(payUserSWList.get(0).getTotSuccSendPrice()) : 0);
model.addAttribute("mjonMsgVO", mjonMsgVO);
@ -2515,7 +2878,7 @@ public class MjonPayController {
font.setBoldweight(Font.BOLDWEIGHT_BOLD); //글씨 bold
sheet.setColumnWidth(1, 5000); // 칼럼의 조절
sheet.setColumnWidth(3, 10000); // 칼럼의 조절
sheet.setColumnWidth(4, 10000); // 칼럼의 조절
try{
@ -2540,7 +2903,6 @@ public class MjonPayController {
sheet.addMergedRegion(new CellRangeAddress(0,1,1,1)); //셀병합
sheet.addMergedRegion(new CellRangeAddress(0,1,2,2)); //셀병합
sheet.addMergedRegion(new CellRangeAddress(0,1,3,3)); //셀병합
sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); //셀병합
cell = row.createCell(0);
@ -2548,29 +2910,46 @@ public class MjonPayController {
cell.setCellStyle(style);
cell = row.createCell(1);
cell.setCellValue("발송일시");
cell.setCellValue("날짜");
cell.setCellStyle(style);
cell = row.createCell(2);
cell.setCellValue("");
cell.setCellValue("문자유");
cell.setCellStyle(style);
cell = row.createCell(3);
cell.setCellValue("내용");
cell.setCellValue("발송건수");
cell.setCellStyle(style);
cell = row.createCell(4);
cell.setCellValue("발송건수");
sheet.addMergedRegion(new CellRangeAddress(0,0,4,5)); //셀병합
cell.setCellValue("내용");
cell.setCellStyle(style);
cell = row.createCell(5);
/*cell = row.createCell(5);
cell.setCellValue("충전");
sheet.addMergedRegion(new CellRangeAddress(0,0,5,6)); //셀병합
cell.setCellStyle(style);
cell = row.createCell(6);
cell.setCellValue("금액(원)");
cell.setCellStyle(style);*/
cell = row.createCell(5);
cell.setCellValue("사용");
sheet.addMergedRegion(new CellRangeAddress(0,0,5,6)); //셀병합
cell.setCellStyle(style);
cell = row.createCell(6);
cell.setCellStyle(style);
/*cell = row.createCell(9);
cell.setCellValue("잔액");
sheet.addMergedRegion(new CellRangeAddress(0,0,9,10)); //셀병합
cell.setCellStyle(style);
cell = row.createCell(10);
cell.setCellStyle(style);*/
row = sheet.createRow(1);
cell = row.createCell(0);
@ -2586,16 +2965,32 @@ public class MjonPayController {
cell.setCellStyle(style);
cell = row.createCell(4);
cell.setCellValue("성공");
cell.setCellStyle(style);
cell = row.createCell(5);
cell.setCellValue("실패");
/*cell = row.createCell(5);
cell.setCellValue("충전금");
cell.setCellStyle(style);
cell = row.createCell(6);
cell.setCellValue("포인트");
cell.setCellStyle(style);*/
cell = row.createCell(5);
cell.setCellValue("충전금");
cell.setCellStyle(style);
cell = row.createCell(6);
cell.setCellValue("포인트");
cell.setCellStyle(style);
/*cell = row.createCell(9);
cell.setCellValue("충전금");
cell.setCellStyle(style);
cell = row.createCell(10);
cell.setCellValue("포인트");
cell.setCellStyle(style);*/
DecimalFormat formatter = new DecimalFormat("###,###.##");
String befCash = "";
String befPoint = "";
@ -2638,11 +3033,15 @@ public class MjonPayController {
if(j==0) cell.setCellValue(i+1); //번호
if(j==1) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getRegDate()); //결제일시
if(j==2) cell.setCellValue(msgType); //문자유형
if(j==3) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSmsTxt()); //내용
if(j==4) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSuccSendCnt()); //성공건수
if(j==5) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getFailSendCnt()); //실패건수
if(j==6) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSuccSendPrice()); //금액
}
if(j==3) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSuccSendCnt()); //발송건수
if(j==4) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSmsTxt()); //내용
if(j==5) cell.setCellValue(((MjonMsgVO)payUserList.get(i)).getSuccSendPrice()); //충전 - 충전금
if(j==6) cell.setCellValue(0); //충전 - 포인트
/*if(j==7) cell.setCellValue(totPrice); //사용 - 충전금
if(j==8) cell.setCellValue(0); //사용 - 포인트
if(j==9) cell.setCellValue(thisPoint); //잔액 - 충전금
if(j==10) cell.setCellValue(befPoint); //잔액 - 포인트
*/ }
}
}
response.setHeader("Set-Cookie", "fileDownload=true; path=/");
@ -4645,19 +5044,35 @@ public class MjonPayController {
model.addAttribute("endDate", endDate);
DecimalFormat decFormat = new DecimalFormat("###,###");
DecimalFormat decFormatFloat = new DecimalFormat("###,###.#");
model.addAttribute("sendSumCount", decFormat.format(sendSumCount));
model.addAttribute("supplySumPrice", decFormat.format(supplySumPrice));
model.addAttribute("vatSumPrice", decFormat.format(vatSumPrice));
model.addAttribute("totalSumPrice", decFormatFloat.format(totalSumPrice));
model.addAttribute("totalSumPrice", decFormat.format(totalSumPrice));
model.addAttribute("resultList", payUserSumList);
// 수신자 정보
MJUtil mjUtil = new MJUtil();
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
mberManageVO.setMoblphonNo(mjUtil.addDash(mberManageVO.getMoblphonNo()));
mberManageVO.setBizNo(mjUtil.bizNoAddDash(mberManageVO.getBizNo()));
model.addAttribute("mberManageVO", mberManageVO);
String mberNm = ""; // 회사명
String managerNm = ""; // 담당자명
String moblphonNo = ""; // 연락처
MberManageVO mberManageVO = new MberManageVO();
mberManageVO = mjonMsgDataService.selectMberManageInfo(userId);
if (mberManageVO != null) {
// 회원종류 p-개인 c-기업
if (mberManageVO.getDept().equals("c")) {
mberNm = mberManageVO.getMberNm();
managerNm = mberManageVO.getManagerNm();
moblphonNo = mberManageVO.getMoblphonNo();
}
else {
mberNm = mberManageVO.getMberNm();
managerNm = mberManageVO.getMberNm();
moblphonNo = mberManageVO.getMoblphonNo();
}
}
model.addAttribute("mberNm", mberNm);
model.addAttribute("managerNm", managerNm);
model.addAttribute("moblphonNo", moblphonNo);
//부가세 포함 가격 정보 계산
double addTax = Math.round(totalSumPrice * 0.1);
@ -5775,42 +6190,7 @@ public class MjonPayController {
return "/uss/ion/pay/cashPointSendList";
}
/**
* * 거래명세서 팝업
* @param searchVO
* @param model
* @return "/web/member/pay/payInvoicePopupAjax.do"
* @throws Exception
*/
@RequestMapping(value= {"/web/member/pay/payInvoicePopupAjax.do"})
public String printInvoiceAjax(
@ModelAttribute("searchVO") MjonPayVO mjonPayVO
, RedirectAttributes redirectAttributes
, ModelMap model) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(loginVO == null) {
//redirectAttributes.addFlashAttribute("message", "문자온 서비스는 로그인 후 이용 가능합니다.");
return "redirect:/web/user/login/login.do";
}
mjonPayVO.setUserId(userId);
//결제 정보 불러오기
MJUtil mjUtil = new MJUtil();
MjonPayVO result = mjonPayService.selectPayDetail(mjonPayVO);
result.setMbtlNum(mjUtil.addDash(result.getMbtlNum()));
result.setBizNo(mjUtil.bizNoAddDash(result.getBizNo()));
model.addAttribute("result", result);
return "web/pay/payInvoicePrintPopup";
}
/**
* @param p_pattern
* @param p_mjonPayVO
@ -5923,6 +6303,5 @@ public class MjonPayController {
return p_response;
}
}

View File

@ -278,8 +278,6 @@ public class MjonPayV2Controller {
try {
// 다음 결제시 결제수단 SELECT
nextPayMethod = userManageService.selectNextPayMethod(userId);
// 실제 마지막 결제 방식 -
}
catch(Exception e) {
isSuccess = false;
@ -1642,45 +1640,6 @@ public class MjonPayV2Controller {
return "web/cop/kgmV2/bankOkUrl";
}
/**
* 마지막 결제수단 SELECT
* @throws Exception
*/
@RequestMapping(value = "/web/member/pay/selectLastPayMethodAjax.do")
public ModelAndView selectLastPayMethodAjax(MjonPayVO mjonPayVO,
HttpServletRequest request ) throws Exception {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
boolean isSuccess = true;
String msg = "";
String nextPayMethod = "";
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
if(userId == null) {
isSuccess = false;
msg = "로그인이 필요합니다.";
}
try {
// 다음 결제시 결제수단 SELECT
nextPayMethod = userManageService.selectLastPayMethod(userId);
}
catch(Exception e) {
isSuccess = false;
msg = e.getMessage();
}
modelAndView.addObject("isSuccess", isSuccess);
modelAndView.addObject("msg", msg);
modelAndView.addObject("nextPayMethod", nextPayMethod);
return modelAndView;
}
// Get Server Path
public static String getKgServerPath(HttpServletRequest request) {
String kgmPath = request.getScheme() + "://" + request.getServerName() +":" + request.getServerPort();

View File

@ -42,7 +42,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@ -3502,40 +3501,5 @@ public class TestController {
}
@RequestMapping("/uss/ion/test/callNicepay.do")
public String callNicepay(Model model) {
String url = "https://dev.nicepay.co.kr/webapi/sslConnectionTest.jsp";
String mid = "itn180208m"; // 실제 MID 값으로 변경
try {
// RestTemplate 사용
RestTemplate restTemplate = new RestTemplate();
// 헤더 설정
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
// 파라미터 설정
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("MID", mid);
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(params, headers);
// POST 요청
ResponseEntity<String> response = restTemplate.postForEntity(url, request, String.class);
// JSP에 전달
model.addAttribute("result", response.getBody());
model.addAttribute("url", url);
model.addAttribute("mid", mid);
} catch (Exception e) {
model.addAttribute("result", "에러 발생: " + e.getMessage());
}
return "uss/ion/test/TestNicePaySSL"; // nicepayResult.jsp로 이동
}
}

View File

@ -5,27 +5,18 @@ import java.math.RoundingMode;
import javax.annotation.Resource;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import egovframework.rte.fdl.cmmn.exception.FdlException;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
import itn.let.kakao.kakaoComm.KakaoSendUtil;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.user.kakaoAt.service.impl.KakaoAlimTalkDAO;
import itn.let.mjo.event.service.MjonEventService;
import itn.let.mjo.event.service.MjonEventVO;
import itn.let.mjo.event.service.impl.MjonEventDAO;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.mjo.pay.service.impl.MjonPayDAO;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uss.umt.service.MberManageVO;
import lombok.extern.slf4j.Slf4j;
/**
*
@ -41,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
*
*
*/
@Slf4j
@Component
public class PriceAndPoint {
@ -56,11 +46,6 @@ public class PriceAndPoint {
@Resource(name = "egovMjonCashIdGnrService")
private EgovIdGnrService idgenMjonCashId;
@Resource(name="kakaoAlimTalkDAO")
private KakaoAlimTalkDAO kakaoAlimTalkDAO;
/**
* @methodName : getBefCash
@ -129,120 +114,19 @@ public class PriceAndPoint {
, String msgGroupId
) throws Exception {
// MjonPayVO mjonPayVO = new MjonPayVO();
// mjonPayVO.setCashId(idgenMjonCashId.getNextStringId());
// mjonPayVO.setUserId(userId);
// System.out.println(" + totPrice :: "+ totPrice);
// mjonPayVO.setCash(totPrice);
// mjonPayVO.setFrstRegisterId(userId);
// mjonPayVO.setMemo(memo);
// mjonPayVO.setMsgGroupId(msgGroupId);
MjonPayVO mjonPayVO = new MjonPayVO();
mjonPayVO.setCashId(idgenMjonCashId.getNextStringId());
mjonPayVO.setUserId(userId);
System.out.println(" + totPrice :: "+ totPrice);
mjonPayVO.setCash(totPrice);
mjonPayVO.setFrstRegisterId(userId);
mjonPayVO.setMemo(memo);
mjonPayVO.setMsgGroupId(msgGroupId);
insertCashAndPoint(userId, totPrice, memo, msgGroupId, null);
// mjonPayDAO.insertCash(mjonPayVO); //캐시
// mjonPayDAO.updateMemberCash(mjonPayVO); //회원정보 업데이트
}
/**
* @methodName : insertCashAndPoint
* @author : 이호영
* @date : 2025. 7. 17.
* @description : insertCashAndPoint 에서 환불으로 인해 userData 추가
* @return : void
* @param userId
* @param totPrice
* @param memo
* @param msgGroupId
* @param userData
* @throws Exception
*
*/
public void insertCashAndPoint(
String userId
, float totPrice
, String memo
, String msgGroupId
, String userData
) throws Exception {
MjonPayVO mjonPayVO = buildPayVO(userId, totPrice, memo, msgGroupId);
// 환불로 인해 userData가 추후 사용될 경우 여기에 처리
if (StringUtils.isNotEmpty(userData)) { mjonPayVO.setOrderId(userData); }
mjonPayDAO.insertCash(mjonPayVO); //캐시
mjonPayDAO.updateMemberCash(mjonPayVO); //회원정보 업데이트
}
private MjonPayVO buildPayVO(String userId, float totPrice, String memo, String msgGroupId) throws FdlException {
MjonPayVO vo = new MjonPayVO();
vo.setCashId(idgenMjonCashId.getNextStringId());
vo.setUserId(userId);
vo.setCash(totPrice);
vo.setFrstRegisterId(userId);
vo.setMemo(memo);
vo.setMsgGroupId(msgGroupId);
System.out.println(" + totPrice :: " + totPrice);
return vo;
}
public void insertBizFtKakaoPrice(String userId, String msgGroupId) throws Exception {
KakaoVO kakaoVO = new KakaoVO();
System.out.println("=======================");
// 사용자 개인 단가 정보 불러오기
MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(userId);
// 시스템 기본 단가 정보 불러오기
JoinSettingVO sysJoinSetVO = mjonMsgDataDAO.selectJoinSettingInfo();
KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
// TODO Auto-generated method stub
kakaoVO.setMsgGroupId(msgGroupId);
kakaoVO.setSmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()));
kakaoVO.setMmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()));
kakaoVO.setPicturePrice(KakaoSendUtil.getValidPrice(mberManageVO.getPicturePrice(), sysJoinSetVO.getPicturePrice()));
kakaoVO.setKakaoFtPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtPrice(), sysJoinSetVO.getKakaoFtPrice()));
kakaoVO.setKakaoFtImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtImgPrice(), sysJoinSetVO.getKakaoFtImgPrice()));
kakaoVO.setKakaoFtWideImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtWideImgPrice(), sysJoinSetVO.getKakaoFtWideImgPrice()));
kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
}
/**
* @methodName : insertCashAndPoint
* @author : 이지우
* @date : 2025. 8. 14.
* @description : insertCashAndPoint 에서 updateMemberCash 제외
* @return : void
* @param userId
* @param totPrice
* @param memo
* @param msgGroupId
* @param userData
* @throws Exception
*
*/
public void insertCashAndPointNoUpdate(
String userId
, float totPrice
, String memo
, String msgGroupId
, String userData
) throws Exception {
MjonPayVO mjonPayVO = buildPayVO(userId, totPrice, memo, msgGroupId);
// 환불로 인해 userData가 추후 사용될 경우 여기에 처리
if (StringUtils.isNotEmpty(userData)) { mjonPayVO.setOrderId(userData); }
mjonPayDAO.insertCash(mjonPayVO); //캐시
}
}

View File

@ -47,6 +47,9 @@ public interface SchdlrManageService {
//전용계좌 자동 충전 배치
public void vacsAutoCharge() throws Exception;
//문자온 카카오톡 실패 건수 환불 배치
public void kakaoFailPayBack() throws Exception;
//문자온 문자전송 실패 건수 환불 배치
public void payBack(String type, int limitCout) throws Exception;

View File

@ -2,9 +2,7 @@ package itn.let.schdlr.service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Resource;
import javax.sql.DataSource;
@ -26,16 +24,12 @@ import itn.let.fax.admin.service.FaxAdmService;
import itn.let.fax.admin.service.FaxStatVO;
import itn.let.kakao.admin.kakaoAt.service.MjonKakaoAtStatVO;
import itn.let.kakao.admin.statistics.service.KakaoStatisticsService;
import itn.let.kakao.kakaoComm.KakaoVO;
import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService;
import itn.let.lett.service.LetterService;
import itn.let.mail.service.MailTemplateService;
import itn.let.mjo.mjocommon.MjonCommon;
import itn.let.mjo.msg.service.MjonMsgService;
import itn.let.mjo.msg.service.MjonMsgStatVO;
import itn.let.mjo.msg.service.MjonMsgVO;
import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
import itn.let.mjo.pay.service.MjonPayService;
import itn.let.mjo.pay.service.MjonPayVO;
import itn.let.sts.com.StatsVO;
import itn.let.sts.cst.service.EgovConectStatsService;
import itn.let.uss.umt.service.EgovUserManageService;
@ -88,15 +82,6 @@ public class SchedulerUtil {
@Resource(name="MjonMsgDataDAO")
private MjonMsgDataDAO mjonMsgDataDAO;
@Resource(name="kakaoAlimTalkService")
private KakaoAlimTalkService kakaoAlimTalkService;
@Resource(name="MjonCommon")
private MjonCommon mjonCommon;
@Resource(name = "mjonPayService")
private MjonPayService mjonPayService;
/** 설정값 가져오기 */
@Value("#{globalSettings['Globals.Env']}")
private String GlobalsEnv;
@ -480,38 +465,18 @@ public class SchedulerUtil {
public LockProvider lockProvider(DataSource dataSource) {
return new JdbcTemplateLockProvider(dataSource);
}
// @Scheduled(cron = "0 0 0/2 * * ?") // 매시간 짝수 정각마다 실행
@Scheduled(cron = "0 0/3 * * * ?") // 3분마다 실행
@SchedulerLock(name = "runKakaoOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void runKakaoOneTime() throws Exception {
/* 회원 money 업데이트 처리 트랜잭션 분리를 위하여 impl이 아닌 현재 위치에서 반복문 실행 */
// do something...
try {
System.out.println("=============SchedulerUtil=====runKakaoOneTime =============>");
List<KakaoVO> kakaoRefundList = kakaoAlimTalkService.selectKakaoSentRefundListForSingle();
Set<String> targetIdSet = new HashSet<>();
for(KakaoVO kakaoVO : kakaoRefundList) {
try {
kakaoAlimTalkService.kakaoSingleRefund(kakaoVO);
targetIdSet.add(kakaoVO.getUserId());
} catch (Exception e) {
String msg = "[문자온] 환불 실패 - " + kakaoVO.getMsgId() +"("+ kakaoVO.getUserId() + ")";
mjonCommon.sendSimpleSlackMsg(msg);;
}
}
MjonPayVO mjonPayVO = new MjonPayVO();
for(String userId : targetIdSet) {
try {
mjonPayVO.setUserId(userId);
mjonPayService.updateMemberCash(mjonPayVO); //회원정보 업데이트
} catch(Exception e) {
String msg = "[문자온] 환불 후 잔액 갱신 실패 - " + userId;
mjonCommon.sendSimpleSlackMsg(msg);;
}
}
schdlrManageService.kakaoFailPayBack();
}catch(Exception ex) {
ex.printStackTrace();
}
}
//대체문자 결과 반영
@ -528,6 +493,8 @@ public class SchedulerUtil {
}
//환불 실행
private void PayBack(String p_type) throws Exception {

View File

@ -393,12 +393,12 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
// 대상 : 휴대폰결제, 즉시이체, 전용계좌
// Step 1. 스미싱의심 지정 여부
// JoinSettingVO joinSettingVO = new JoinSettingVO();
JoinSettingVO joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
JoinSettingVO joinSettingVO = new JoinSettingVO();
joinSettingVO = egovSiteManagerService.selectAdminNotiDetail();
if (joinSettingVO != null && joinSettingVO.getSmishingNoti().equals("Y")) {
// Step 1. 개인회원 여부 체크
// int isPersnalMemberCnt = egovSiteManagerService.selectPersnalMemberCnt(Userid);
// if (isPersnalMemberCnt == 1) {
int isPersnalMemberCnt = egovSiteManagerService.selectPersnalMemberCnt(Userid);
if (isPersnalMemberCnt == 1) {
// Step 2. 첫결제 여부 체크
int isFirstPayCnt = egovSiteManagerService.selectFirstPayCnt(Userid);
if (isFirstPayCnt == 1) {
@ -418,11 +418,10 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
// 스미싱 의심회원으로 변경
UserManageVO userManageVO = new UserManageVO();
userManageVO.setSmishingYn("Y");
userManageVO.setAtSmishingYn("Y");
userManageVO.setMberId(Userid);
userManageService.updateOneUserSmishingYnNotAlert(userManageVO);
}
// }
}
}
} catch (Exception e) {
@ -438,6 +437,17 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
}
// 카카오 환불 처리 리스트
public void kakaoFailPayBack() throws Exception {
// 카카오 알림톡 환불 처리
kakaoAlimTalkService.selectKakaoAtSentRefundList();
// 카카오 친구톡 환불 처리
// kakaoAlimTalkService.selectKakaoFtSentRefundList();
}
@Override
public void payBack(String type, int limitCout) throws Exception {
// 문자 환불

View File

@ -1,12 +1,5 @@
package itn.let.sym.site.service;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* 로그인정책에 대한 VO 클래스를 정의한다.
* 로그인정책정보의 목록 항목을 관리한다.
@ -25,18 +18,13 @@ import lombok.ToString;
*
* </pre>
*/
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ToString
public class JoinSettingVO {
/**
* serialVersionUID
*/
@SuppressWarnings("unused")
private static final long serialVersionUID = 1L;
private float shortPrice; // 단문 단가
private float longPrice; //장문 단가
@ -49,9 +37,6 @@ public class JoinSettingVO {
private float customTextPrice; // 텍스트 단순수정
private float kakaoAtPrice; // 카카오 알림톡 단가
private float kakaoFtPrice; // 카카오 친구톡 단가
private float kakaoFtImgPrice; // 카카오 친구톡 이미지 단가
private float kakaoFtWideImgPrice; // 카카오 친구톡 와이드 단가
private float faxPrice; // 팩스 단가
private float refundPer; //환불 비율
@ -65,7 +50,189 @@ public class JoinSettingVO {
private String slackNoti; //관리자 SLACK 알림 여부
private String smishingNoti; //첫결제(카드제외) 스미싱의심 알림 여부
private String holiSmishingNoti; //야간 스미싱알림 여부
private String smsNotiIfOverFifty; //50건이상 문자발송 안내문자 발송
public String getSmishingNoti() {
return smishingNoti;
}
public void setSmishingNoti(String smishingNoti) {
this.smishingNoti = smishingNoti;
}
public float getShortPrice() {
return shortPrice;
}
public void setShortPrice(float shortPrice) {
this.shortPrice = shortPrice;
}
public float getLongPrice() {
return longPrice;
}
public void setLongPrice(float longPrice) {
this.longPrice = longPrice;
}
public float getPicturePrice() {
return picturePrice;
}
public void setPicturePrice(float picturePrice) {
this.picturePrice = picturePrice;
}
public float getPicture2Price() {
return picture2Price;
}
public void setPicture2Price(float picture2Price) {
this.picture2Price = picture2Price;
}
public float getPicture3Price() {
return picture3Price;
}
public void setPicture3Price(float picture3Price) {
this.picture3Price = picture3Price;
}
public float getCustomSamplePrice() {
return customSamplePrice;
}
public void setCustomSamplePrice(float customSamplePrice) {
this.customSamplePrice = customSamplePrice;
}
public float getCustomEditPrice() {
return customEditPrice;
}
public void setCustomEditPrice(float customEditPrice) {
this.customEditPrice = customEditPrice;
}
public float getCustomEdit3Price() {
return customEdit3Price;
}
public void setCustomEdit3Price(float customEdit3Price) {
this.customEdit3Price = customEdit3Price;
}
public float getCustomTextPrice() {
return customTextPrice;
}
public void setCustomTextPrice(float customTextPrice) {
this.customTextPrice = customTextPrice;
}
public float getRefundPer() {
return refundPer;
}
public void setRefundPer(float refundPer) {
this.refundPer = refundPer;
}
public float getJoinCash() {
return joinCash;
}
public void setJoinCash(float joinCash) {
this.joinCash = joinCash;
}
public float getPointPer() {
return pointPer;
}
public void setPointPer(float pointPer) {
this.pointPer = pointPer;
}
public String getLasUpdusrId() {
return lasUpdusrId;
}
public void setLasUpdusrId(String lasUpdusrId) {
this.lasUpdusrId = lasUpdusrId;
}
public String getLastUpdtPnttm() {
return lastUpdtPnttm;
}
public void setLastUpdtPnttm(String lastUpdtPnttm) {
this.lastUpdtPnttm = lastUpdtPnttm;
}
public String getJoinCertType() {
return joinCertType;
}
public void setJoinCertType(String joinCertType) {
this.joinCertType = joinCertType;
}
public String getSmsNoti() {
return smsNoti;
}
public void setSmsNoti(String smsNoti) {
this.smsNoti = smsNoti;
}
public String getEmailNoti() {
return emailNoti;
}
public void setEmailNoti(String emailNoti) {
this.emailNoti = emailNoti;
}
public String getSlackNoti() {
return slackNoti;
}
public void setSlackNoti(String slackNoti) {
this.slackNoti = slackNoti;
}
public float getKakaoAtPrice() {
return kakaoAtPrice;
}
public void setKakaoAtPrice(float kakaoAtPrice) {
this.kakaoAtPrice = kakaoAtPrice;
}
public float getKakaoFtPrice() {
return kakaoFtPrice;
}
public void setKakaoFtPrice(float kakaoFtPrice) {
this.kakaoFtPrice = kakaoFtPrice;
}
public float getFaxPrice() {
return faxPrice;
}
public void setFaxPrice(float faxPrice) {
this.faxPrice = faxPrice;
}
public String getHoliSmishingNoti() {
return holiSmishingNoti;
}
public void setHoliSmishingNoti(String holiSmishingNoti) {
this.holiSmishingNoti = holiSmishingNoti;
}
}

View File

@ -121,4 +121,5 @@ public interface EgovLoginService {
//비밀번호 실패 횟수 조회
public LoginVO selectPassMiss(LoginVO vo) throws Exception;
public KmcVO kmcDecryption(HttpServletRequest request, KmcVO kmcVO);
}

View File

@ -17,7 +17,6 @@ import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import itn.com.cmm.LoginVO;
import itn.let.mjo.pay.service.KmcVO;
import itn.let.uat.uia.service.AuthCertVO;
import itn.let.uat.uia.service.EgovLoginService;
import itn.let.uss.umt.service.UserManageVO;
import itn.let.utl.fcc.service.EgovNumberUtil;
@ -319,6 +318,240 @@ public class EgovLoginServiceImpl extends EgovAbstractServiceImpl implements
return loginDAO.selectPassMiss(vo);
}
@Override
public KmcVO kmcDecryption(HttpServletRequest request, KmcVO kmcVO) {
String rec_cert = request.getParameter("rec_cert").trim();
String certNum = request.getParameter("certNum").trim();
kmcVO.setRecCert(rec_cert);
kmcVO.setCertNum(certNum);
// 파라미터 유효성 검증
if (rec_cert.length() == 0 || certNum.length() == 0) {
kmcVO.setErrMessage("비정상");
return kmcVO;
}
// 변수선언
// --------------------------------------------------------------------------------------------------------
String k_certNum = ""; // 파라미터로 수신한 요청번호
k_certNum = certNum;
String date = ""; // 요청일시
String CI = ""; // 연계정보(CI)
String DI = ""; // 중복가입확인정보(DI)
String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사
String birthDay = ""; // 생년월일
String gender = ""; // 성별
String nation = ""; // 내국인
String name = ""; // 성명
String M_name = ""; // 미성년자 성명
String M_birthDay = ""; // 미성년자 생년월일
String M_Gender = ""; // 미성년자 성별
String M_nation = ""; // 미성년자 내외국인
String result = ""; // 결과값
String certMet = ""; // 인증방법
String ip = ""; // ip주소
String plusInfo = "";
String encPara = "";
String encMsg1 = "";
String encMsg2 = "";
String msgChk = "";
IcertSecuManager seed = new IcertSecuManager();
// 02. 1차 복호화
// 수신된 certNum를 이용하여 복호화
rec_cert = seed.getDec(rec_cert, k_certNum);
// 03. 1차 파싱
int inf1 = rec_cert.indexOf("/", 0);
int inf2 = rec_cert.indexOf("/", inf1 + 1);
encPara = rec_cert.substring(0, inf1); // 암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1 + 1, inf2); // 암호화된 통합 파라미터의 Hash값
// 04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
kmcVO.setEncMsg2(encMsg2);
if (encMsg2.equals(encMsg1)) {
msgChk = "Y";
}
if (!"Y".equals(msgChk)) {
kmcVO.setErrMessage("비정상접근입니다.");
return kmcVO;
}
// 05. 2차 복호화
rec_cert = seed.getDec(encPara, k_certNum);
kmcVO.setRecCert(rec_cert);
// 06. 2차 파싱
int info1 = rec_cert.indexOf("/", 0);
int info2 = rec_cert.indexOf("/", info1 + 1);
int info3 = rec_cert.indexOf("/", info2 + 1);
int info4 = rec_cert.indexOf("/", info3 + 1);
int info5 = rec_cert.indexOf("/", info4 + 1);
int info6 = rec_cert.indexOf("/", info5 + 1);
int info7 = rec_cert.indexOf("/", info6 + 1);
int info8 = rec_cert.indexOf("/", info7 + 1);
int info9 = rec_cert.indexOf("/", info8 + 1);
int info10 = rec_cert.indexOf("/", info9 + 1);
int info11 = rec_cert.indexOf("/", info10 + 1);
int info12 = rec_cert.indexOf("/", info11 + 1);
int info13 = rec_cert.indexOf("/", info12 + 1);
int info14 = rec_cert.indexOf("/", info13 + 1);
int info15 = rec_cert.indexOf("/", info14 + 1);
int info16 = rec_cert.indexOf("/", info15 + 1);
int info17 = rec_cert.indexOf("/", info16 + 1);
int info18 = rec_cert.indexOf("/", info17 + 1);
certNum = rec_cert.substring(0, info1);
kmcVO.setCertNum(certNum);
date = rec_cert.substring(info1 + 1, info2);
kmcVO.setDate(date);
CI = rec_cert.substring(info2 + 1, info3);
kmcVO.setCI(CI);
phoneNo = rec_cert.substring(info3 + 1, info4);
kmcVO.setPhoneNo(phoneNo);
phoneCorp = rec_cert.substring(info4 + 1, info5);
kmcVO.setPhoneCorp(phoneCorp);
birthDay = rec_cert.substring(info5 + 1, info6);
kmcVO.setBirthDay(birthDay);
gender = rec_cert.substring(info6 + 1, info7);
kmcVO.setGender(gender);
nation = rec_cert.substring(info7 + 1, info8);
kmcVO.setNation(nation);
name = rec_cert.substring(info8 + 1, info9);
kmcVO.setName(name);
result = rec_cert.substring(info9 + 1, info10);
kmcVO.setResult(result);
certMet = rec_cert.substring(info10 + 1, info11);
kmcVO.setCertMet(certMet);
ip = rec_cert.substring(info11 + 1, info12);
kmcVO.setIp(ip);
M_name = rec_cert.substring(info12 + 1, info13);
kmcVO.setMName(M_name);
M_birthDay = rec_cert.substring(info13 + 1, info14);
kmcVO.setMBirthDay(M_birthDay);
M_Gender = rec_cert.substring(info14 + 1, info15);
kmcVO.setMGender(M_Gender);
M_nation = rec_cert.substring(info15 + 1, info16);
kmcVO.setMNation(M_nation);
plusInfo = rec_cert.substring(info16 + 1, info17);
kmcVO.setPlusInfo(plusInfo);
DI = rec_cert.substring(info17 + 1, info18);
kmcVO.setDI(DI);
// 07. CI, DI 복호화
CI = seed.getDec(CI, k_certNum);
kmcVO.setCI(CI);
DI = seed.getDec(DI, k_certNum);
kmcVO.setDI(DI);
if ("Y".equals(result)) {
}
// --------------------------------------------------------------
String regex = "";
if (certNum.length() == 0 || certNum.length() > 40) {
kmcVO.setErrMessage("요청번호 비정상.");
return kmcVO;
}
regex = "[0-9]*";
if (date.length() != 14 || !this.paramChk(regex, date)) {
kmcVO.setErrMessage("요청일시");
return kmcVO;
}
regex = "[A-Z]*";
if (certMet.length() != 1 || !this.paramChk(regex, certMet)) {
kmcVO.setErrMessage("본인인증방법 비정상" + certMet);
return kmcVO;
}
regex = "[0-9]*";
if ((phoneNo.length() != 10 && phoneNo.length() != 11) || !this.paramChk(regex, phoneNo)) {
kmcVO.setErrMessage("휴대폰번호 비정상");
return kmcVO;
}
regex = "[A-Z]*";
if (phoneCorp.length() != 3 || !this.paramChk(regex, phoneCorp)) {
kmcVO.setErrMessage("이동통신사 비정상");
return kmcVO;
}
regex = "[0-9]*";
if (birthDay.length() != 8 || !this.paramChk(regex, birthDay)) {
kmcVO.setErrMessage("생년월일 비정상");
return kmcVO;
}
regex = "[0-9]*";
if (gender.length() != 1 || !this.paramChk(regex, gender)) {
kmcVO.setErrMessage("성별 비정상");
return kmcVO;
}
regex = "[0-9]*";
if (nation.length() != 1 || !this.paramChk(regex, nation)) {
kmcVO.setErrMessage("내/외국인 비정상");
return kmcVO;
}
regex = "[\\sA-Za-z가-<2D>R.,-]*";
if (name.length() > 60 || !this.paramChk(regex, name)) {
kmcVO.setErrMessage("성명 비정상");
return kmcVO;
}
regex = "[A-Z]*";
if (result.length() != 1 || !this.paramChk(regex, result)) {
kmcVO.setErrMessage("결과값 비정상");
return kmcVO;
}
regex = "[\\sA-Za-z가-?.,-]*";
if (M_name.length() != 0) {
if (M_name.length() > 60 || !this.paramChk(regex, M_name)) {
kmcVO.setErrMessage("미성년자 성명 비정상");
return kmcVO;
}
}
regex = "[0-9]*";
if (M_birthDay.length() != 0) {
if (M_birthDay.length() != 8 || !this.paramChk(regex, M_birthDay)) {
kmcVO.setErrMessage("미성년자 생년월일 비정상");
}
}
regex = "[0-9]*";
if (M_Gender.length() != 0) {
if (M_Gender.length() != 1 || !paramChk(regex, M_Gender)) {
kmcVO.setErrMessage("미성년자 성별 비정상");
}
}
regex = "[0-9]*";
if (M_nation.length() != 0) {
if (M_nation.length() != 1 || !this.paramChk(regex, M_nation)) {
kmcVO.setErrMessage("미성년자 내/외국인 비정상");
}
}
return kmcVO;
}
public Boolean paramChk(String patn, String param) {
Pattern pattern = Pattern.compile(patn);
Matcher matcher = pattern.matcher(param);

View File

@ -1,10 +1,5 @@
package itn.let.uat.uia.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.List;
import javax.annotation.Resource;
@ -16,16 +11,14 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import itn.com.cmm.util.StringUtil;
import itn.com.uss.olh.hpc.service.HackIpService;
import itn.com.uss.olh.hpc.service.HackIpVO;
import itn.com.utl.fcc.service.EgovStringUtil;
import itn.let.mjo.msgdata.service.MjonMsgDataService;
import itn.let.mjo.cert.service.CertVO;
import itn.let.mjo.msgsent.service.MjonMsgSentVO;
import itn.let.mjo.pay.service.KmcVO;
import itn.let.sec.rgm.service.AuthorGroup;
import itn.let.sec.rgm.service.EgovAuthorGroupService;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.uat.uia.service.AuthCertVO;
import itn.let.uss.umt.service.AdmProcHstryVO;
import itn.let.uss.umt.service.EgovMberManageService;
@ -89,10 +82,6 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement
@Resource(name = "hackIpService")
private HackIpService hackIpService;
/* MjonMsgDataService */
@Resource(name = "MjonMsgDataService")
private MjonMsgDataService mjonMsgDataService;
@Override
public int insertMber(MberManageVO mberManageVO) throws Exception {
@ -632,71 +621,4 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement
return mberManageDAO.findTopByregDateFromCertLog(authCertVO);
}
public MberManageVO selectMberHeaderInfo(String mberId) throws Exception {
//회원 단가, 이벤트 단가, 이벤트 종료일 조회
MberManageVO headerInfo = mberManageDAO.selectMberHeaderInfo(mberId);
//기본 단가 조회
JoinSettingVO sysPrice = mjonMsgDataService.selectJoinSettingInfo();
//이벤트 종료까지 남은 계산
long eventLeftDay = calculateEventLeftDay(headerInfo.getEventEndDate());
headerInfo.setEventLeftDay(String.valueOf(eventLeftDay));
//이벤트 유무에 따라 이벤트 잔액 or 잔액 사용
boolean isEventActive = eventLeftDay > 0;
double money = isEventActive ? headerInfo.getEventRemainCash() : headerInfo.getUserMoney();
//이벤트, 회원 단가가 0일 기본 단가 사용
setPrices(headerInfo, sysPrice, isEventActive);
//발송가능 건수 조회
calculateAvailableCounts(headerInfo, money);
return headerInfo;
}
private long calculateEventLeftDay(String eventEndDateStr) {
if (StringUtil.isEmpty(eventEndDateStr)) return 0;
LocalDate today = LocalDate.now();
LocalDate eventEndDate = LocalDate.parse(eventEndDateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
return ChronoUnit.DAYS.between(today, eventEndDate);
}
private void setPrices(MberManageVO headerInfo, JoinSettingVO sysPrice, boolean isEventActive) {
if (isEventActive) {
headerInfo.setHeaderShortPrice(priceChk(headerInfo.getEventShortPrice(), sysPrice.getShortPrice()));
headerInfo.setHeaderLongPrice(priceChk(headerInfo.getEventLongPrice(), sysPrice.getLongPrice()));
headerInfo.setHeaderPicturePrice(priceChk(headerInfo.getEventPicturePrice(), sysPrice.getPicturePrice()));
headerInfo.setHeaderPicture2Price(priceChk(headerInfo.getEventPicture2Price(), sysPrice.getPicture2Price()));
headerInfo.setHeaderPicture3Price(priceChk(headerInfo.getEventPicture3Price(), sysPrice.getPicture3Price()));
} else {
headerInfo.setHeaderShortPrice(priceChk(headerInfo.getShortPrice(), sysPrice.getShortPrice()));
headerInfo.setHeaderLongPrice(priceChk(headerInfo.getLongPrice(), sysPrice.getLongPrice()));
headerInfo.setHeaderPicturePrice(priceChk(headerInfo.getPicturePrice(), sysPrice.getPicturePrice()));
headerInfo.setHeaderPicture2Price(priceChk(headerInfo.getPicture2Price(), sysPrice.getPicture2Price()));
headerInfo.setHeaderPicture3Price(priceChk(headerInfo.getPicture3Price(), sysPrice.getPicture3Price()));
}
// 카카오, 팩스 단가는 기본 단가 고정
headerInfo.setHeaderKakaoAtPrice(sysPrice.getKakaoAtPrice());
headerInfo.setHeaderFaxPrice(sysPrice.getFaxPrice());
}
private float priceChk(float price, float sysPrice) {
return price > 0 ? price : sysPrice;
}
private void calculateAvailableCounts(MberManageVO headerInfo, double money) {
headerInfo.setHeaderShortCnt(calcCount(money, headerInfo.getHeaderShortPrice()));
headerInfo.setHeaderLongCnt(calcCount(money, headerInfo.getHeaderLongPrice()));
headerInfo.setHeaderPictureCnt(calcCount(money, headerInfo.getHeaderPicturePrice()));
headerInfo.setHeaderPicture2Cnt(calcCount(money, headerInfo.getHeaderPicture2Price()));
headerInfo.setHeaderPicture3Cnt(calcCount(money, headerInfo.getHeaderPicture3Price()));
headerInfo.setHeaderKakaoAtCnt(calcCount(money, headerInfo.getHeaderKakaoAtPrice()));
headerInfo.setHeaderFaxCnt(calcCount(money, headerInfo.getHeaderFaxPrice()));
}
private int calcCount(double money, double price) {
if (price <= 0) return 0;
return (int) Math.floor(money / price);
}
}

View File

@ -345,8 +345,5 @@ public class MberManageDAO extends EgovComAbstractDAO{
public String findTopByregDateFromCertLog(AuthCertVO authCertVO) {
return (String)select("mberManageDAO.findTopByregDateFromCertLog", authCertVO);
}
public MberManageVO selectMberHeaderInfo(String mberId) {
return (MberManageVO) select("mberManageDAO.selectMberHeaderInfo", mberId);
}
}

View File

@ -253,7 +253,7 @@ public class EgovLoginController {
private CertIpService certIpService;
@Resource(name = "KmcCertChecker")
private KmcCertChecker kmcCertChecker;
private KmcCertChecker kmcCertCheck;
private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
@ -336,7 +336,7 @@ public class EgovLoginController {
MberCertPhoneVO mberCertPhoneVO = new MberCertPhoneVO();
mberCertPhoneVO.setTrUrl("/web/cop/kmc/authRequestAjax.do");
AuthCertVO certVO = kmcCertChecker.authCertCheck(mberCertPhoneVO, request);
AuthCertVO certVO = kmcCertCheck.authCertCheck(mberCertPhoneVO, request);
model.addAttribute("tr_cert", certVO.getTr_cert());
model.addAttribute("tr_url", certVO.getTr_url());
@ -385,7 +385,7 @@ public class EgovLoginController {
mberCertPhoneVO.setNation(mberManageVO.getNationality());
mberCertPhoneVO.setBirthDay(mberManageVO.getBirth());
AuthCertVO certVO = kmcCertChecker.authCertCheck(mberCertPhoneVO, request);
AuthCertVO certVO = kmcCertCheck.authCertCheck(mberCertPhoneVO, request);
// AuthCertVO certVO = kmcCertCheck.authCertCheckTwo(serverNm + "/web/cop/kmc/authRequestAjax.do",
// mberManageVO.getMberNm(), mberManageVO.getMoblphonNo(), mberManageVO.getSexdstnCode(),
@ -4035,7 +4035,7 @@ public class EgovLoginController {
}
mberCertPhoneVO.setPlusInfo(plusInfo);
AuthCertVO certVO = kmcCertChecker.authCertCheck(mberCertPhoneVO, request);
AuthCertVO certVO = kmcCertCheck.authCertCheck(mberCertPhoneVO, request);
modelAndView.addObject("tr_cert", certVO.getTr_cert());
modelAndView.addObject("tr_url", certVO.getTr_url());
@ -4060,26 +4060,22 @@ public class EgovLoginController {
*/
@RequestMapping("/web/cop/kmc/authRequestFindIdPwAjax.do")
public String authRequestFindIdPwAjax(HttpServletRequest request, HttpServletResponse response, ModelMap model,
public String authRequestFindIdPwAjax(HttpServletRequest request, ModelMap model,
@RequestParam Map<String, Object> commandMap, @ModelAttribute("searchVO") KmcVO kmcVO,
RedirectAttributes redirectAttributes) throws Exception {
// KmcVO kmcRVO = loginService.kmcDecryption(request, kmcVO);
//kmc 본인인증 결과처리
kmcVO = kmcCertChecker.authCertResult(request, response, model);
//kmc 본인인증 로그 처리
AuthCertVO certVO = kmcCertChecker.insertCertLog(kmcVO, "KMC_아이디패스워드찾기");
KmcVO kmcRVO = loginService.kmcDecryption(request, kmcVO);
String msg = "";
if (!findIdKmcCheck(kmcVO.getDI(), kmcVO.getName(), kmcVO.getPhoneNo())) {
if (!findIdKmcCheck(kmcRVO.getDI(), kmcRVO.getName(), kmcRVO.getPhoneNo())) {
msg = "일치하는 정보가 없습니다.";
redirectAttributes.addFlashAttribute("message", msg);
return "redirect:/web/user/findUserId.do";
}
// kmcRVO.setCertType("KMC_아이디패스워드찾기");
// // 디비 테이블에 저장하기
// mberManageService.insertCertInfoLogBn(kmcRVO);
kmcRVO.setCertType("KMC_아이디패스워드찾기");
// 디비 테이블에 저장하기
mberManageService.insertCertInfoLogBn(kmcRVO);
model.addAttribute("kmcVO", kmcVO);
return "web/login/findUserIdKmcReqPage";
@ -4096,24 +4092,18 @@ public class EgovLoginController {
* @discription 관리자 로그인 DN 최초 등록
*/
@RequestMapping("/web/cop/kmc/authRequestSelfLoginAjax.do")
public String authRequestSelfLoginAjax(HttpServletRequest request, HttpServletResponse response, ModelMap model,
public String authRequestSelfLoginAjax(HttpServletRequest request, ModelMap model,
@RequestParam Map<String, Object> commandMap, @ModelAttribute("searchVO") KmcVO kmcVO,
RedirectAttributes redirectAttributes, HttpSession session) throws Exception {
UserManageVO userManageVO = new UserManageVO();
// KmcVO kmcRVO = loginService.kmcDecryption(request, kmcVO);
//kmc 본인인증 결과처리
kmcVO = kmcCertChecker.authCertResult(request, response, model);
//kmc 본인인증 로그 처리
AuthCertVO certVO = kmcCertChecker.insertCertLog(kmcVO, "KMC_아이디패스워드찾기");
KmcVO kmcRVO = loginService.kmcDecryption(request, kmcVO);
userManageVO.setCrtfcDnValue(kmcVO.getDI());
userManageVO.setEmplyrNm(kmcVO.getName());
userManageVO.setEmplyrId(kmcVO.getPlusInfo().split(",,,")[0]);
userManageVO.setPassword(kmcVO.getPlusInfo().split(",,,")[1]);
userManageVO.setCrtfcDnValue(kmcRVO.getDI());
userManageVO.setEmplyrNm(kmcRVO.getName());
userManageVO.setEmplyrId(kmcRVO.getPlusInfo().split(",,,")[0]);
userManageVO.setPassword(kmcRVO.getPlusInfo().split(",,,")[1]);
userManageService.updateCrtfcDnValue(userManageVO);
@ -4131,20 +4121,20 @@ public class EgovLoginController {
e.printStackTrace();
// TODO: handle exception
}
// kmcRVO.setCertType("KMC_관리자미인증IP접속인증");
// // 디비 테이블에 저장하기
//
// try {
// mberManageService.insertCertInfoLogBn(kmcRVO);
//
// } catch (Exception e) {
// System.out.println("!!!!!!!!!!!!!!!!!");
// e.printStackTrace();
// // TODO: handle exception
// }
kmcRVO.setCertType("KMC_관리자미인증IP접속인증");
// 디비 테이블에 저장하기
try {
mberManageService.insertCertInfoLogBn(kmcRVO);
} catch (Exception e) {
System.out.println("!!!!!!!!!!!!!!!!!");
e.printStackTrace();
// TODO: handle exception
}
model.addAttribute("kmcVO", kmcVO);
model.addAttribute("kmcVO", kmcRVO);
System.out.println("======================================");
model.addAttribute("userManageVO", userManageVO);
@ -5435,7 +5425,7 @@ public class EgovLoginController {
mberCertPhoneVO.setNation(KMCInfoVO.getNationality());
mberCertPhoneVO.setPlusInfo(loginVO.getId());
AuthCertVO certVO = kmcCertChecker.authCertCheck(mberCertPhoneVO, request);
AuthCertVO certVO = kmcCertCheck.authCertCheck(mberCertPhoneVO, request);
modelAndView.addObject("tr_cert", certVO.getTr_cert());
modelAndView.addObject("tr_url", certVO.getTr_url());
@ -5456,19 +5446,245 @@ public class EgovLoginController {
*
*/
@RequestMapping("/web/cop/kmc/insertIPAjax.do")
public String insertIPAjax(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map<String, Object> commandMap,
public String insertIPAjax(HttpServletRequest request, ModelMap model, @RequestParam Map<String, Object> commandMap,
@ModelAttribute("searchVO") KmcVO kmcVO) throws Exception {
//kmc 본인인증 결과처리
kmcVO = kmcCertChecker.authCertResult(request, response, model);
//kmc 본인인증 로그 처리
AuthCertVO certVO = kmcCertChecker.insertCertLog(kmcVO, "IP등록");
String errMessage = ""; // 에러메세지
String rec_cert = ""; // 결과값(암호화)
String certNum = ""; // certNum
rec_cert = request.getParameter("rec_cert").trim();
certNum = request.getParameter("certNum").trim();
kmcVO.setRecCert(rec_cert);
kmcVO.setCertNum(certNum);
// 파라미터 유효성 검증
if (rec_cert.length() == 0 || certNum.length() == 0) {
errMessage = "비정상";
return returnPage(model, errMessage, kmcVO);
}
// 변수선언
// --------------------------------------------------------------------------------------------------------
String k_certNum = ""; // 파라미터로 수신한 요청번호
k_certNum = certNum;
String date = ""; // 요청일시
String CI = ""; // 연계정보(CI)
String DI = ""; // 중복가입확인정보(DI)
String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사
String birthDay = ""; // 생년월일
String gender = ""; // 성별
String nation = ""; // 내국인
String name = ""; // 성명
String M_name = ""; // 미성년자 성명
String M_birthDay = ""; // 미성년자 생년월일
String M_Gender = ""; // 미성년자 성별
String M_nation = ""; // 미성년자 내외국인
String result = ""; // 결과값
String certMet = ""; // 인증방법
String ip = ""; // ip주소
String plusInfo = "";
String encPara = "";
String encMsg1 = "";
String encMsg2 = "";
String msgChk = "";
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
// 02. 1차 복호화
// 수신된 certNum를 이용하여 복호화
rec_cert = seed.getDec(rec_cert, k_certNum);
// 03. 1차 파싱
int inf1 = rec_cert.indexOf("/", 0);
int inf2 = rec_cert.indexOf("/", inf1 + 1);
encPara = rec_cert.substring(0, inf1); // 암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1 + 1, inf2); // 암호화된 통합 파라미터의 Hash값
// 04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
kmcVO.setEncMsg2(encMsg2);
if (encMsg2.equals(encMsg1)) {
msgChk = "Y";
}
if (!"Y".equals(msgChk)) {
errMessage = "비정상접근입니다.";
return returnPage(model, errMessage, kmcVO);
}
// 05. 2차 복호화
rec_cert = seed.getDec(encPara, k_certNum);
kmcVO.setRecCert(rec_cert);
// 06. 2차 파싱
int info1 = rec_cert.indexOf("/", 0);
int info2 = rec_cert.indexOf("/", info1 + 1);
int info3 = rec_cert.indexOf("/", info2 + 1);
int info4 = rec_cert.indexOf("/", info3 + 1);
int info5 = rec_cert.indexOf("/", info4 + 1);
int info6 = rec_cert.indexOf("/", info5 + 1);
int info7 = rec_cert.indexOf("/", info6 + 1);
int info8 = rec_cert.indexOf("/", info7 + 1);
int info9 = rec_cert.indexOf("/", info8 + 1);
int info10 = rec_cert.indexOf("/", info9 + 1);
int info11 = rec_cert.indexOf("/", info10 + 1);
int info12 = rec_cert.indexOf("/", info11 + 1);
int info13 = rec_cert.indexOf("/", info12 + 1);
int info14 = rec_cert.indexOf("/", info13 + 1);
int info15 = rec_cert.indexOf("/", info14 + 1);
int info16 = rec_cert.indexOf("/", info15 + 1);
int info17 = rec_cert.indexOf("/", info16 + 1);
int info18 = rec_cert.indexOf("/", info17 + 1);
certNum = rec_cert.substring(0, info1);
kmcVO.setCertNum(certNum);
date = rec_cert.substring(info1 + 1, info2);
kmcVO.setDate(date);
CI = rec_cert.substring(info2 + 1, info3);
kmcVO.setCI(CI);
phoneNo = rec_cert.substring(info3 + 1, info4);
kmcVO.setPhoneNo(phoneNo);
phoneCorp = rec_cert.substring(info4 + 1, info5);
kmcVO.setPhoneCorp(phoneCorp);
birthDay = rec_cert.substring(info5 + 1, info6);
kmcVO.setBirthDay(birthDay);
gender = rec_cert.substring(info6 + 1, info7);
kmcVO.setGender(gender);
nation = rec_cert.substring(info7 + 1, info8);
kmcVO.setNation(nation);
name = rec_cert.substring(info8 + 1, info9);
kmcVO.setName(name);
result = rec_cert.substring(info9 + 1, info10);
kmcVO.setResult(result);
certMet = rec_cert.substring(info10 + 1, info11);
kmcVO.setCertMet(certMet);
ip = rec_cert.substring(info11 + 1, info12);
kmcVO.setIp(ip);
M_name = rec_cert.substring(info12 + 1, info13);
kmcVO.setMName(M_name);
M_birthDay = rec_cert.substring(info13 + 1, info14);
kmcVO.setMBirthDay(M_birthDay);
M_Gender = rec_cert.substring(info14 + 1, info15);
kmcVO.setMGender(M_Gender);
M_nation = rec_cert.substring(info15 + 1, info16);
kmcVO.setMNation(M_nation);
plusInfo = rec_cert.substring(info16 + 1, info17);
kmcVO.setPlusInfo(plusInfo);
DI = rec_cert.substring(info17 + 1, info18);
kmcVO.setDI(DI);
// 07. CI, DI 복호화
CI = seed.getDec(CI, k_certNum);
kmcVO.setCI(CI);
DI = seed.getDec(DI, k_certNum);
kmcVO.setDI(DI);
if ("Y".equals(result)) {
}
// --------------------------------------------------------------
String regex = "";
if (certNum.length() == 0 || certNum.length() > 40) {
errMessage = "요청번호 비정상.";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (date.length() != 14 || !paramChk(regex, date)) {
errMessage = "요청일시";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (certMet.length() != 1 || !paramChk(regex, certMet)) {
errMessage = "본인인증방법 비정상" + certMet;
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if ((phoneNo.length() != 10 && phoneNo.length() != 11) || !paramChk(regex, phoneNo)) {
errMessage = "휴대폰번호 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (phoneCorp.length() != 3 || !paramChk(regex, phoneCorp)) {
errMessage = "이동통신사 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (birthDay.length() != 8 || !paramChk(regex, birthDay)) {
errMessage = "생년월일 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (gender.length() != 1 || !paramChk(regex, gender)) {
errMessage = "성별 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[0-9]*";
if (nation.length() != 1 || !paramChk(regex, nation)) {
errMessage = "내/외국인 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[\\sA-Za-z가-<2D>R.,-]*";
if (name.length() > 60 || !paramChk(regex, name)) {
errMessage = "성명 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[A-Z]*";
if (result.length() != 1 || !paramChk(regex, result)) {
errMessage = "결과값 비정상";
return returnPage(model, errMessage, kmcVO);
}
regex = "[\\sA-Za-z가-?.,-]*";
if (M_name.length() != 0) {
if (M_name.length() > 60 || !paramChk(regex, M_name)) {
errMessage = "미성년자 성명 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_birthDay.length() != 0) {
if (M_birthDay.length() != 8 || !paramChk(regex, M_birthDay)) {
errMessage = "미성년자 생년월일 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_Gender.length() != 0) {
if (M_Gender.length() != 1 || !paramChk(regex, M_Gender)) {
errMessage = "미성년자 성별 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
regex = "[0-9]*";
if (M_nation.length() != 0) {
if (M_nation.length() != 1 || !paramChk(regex, M_nation)) {
errMessage = "미성년자 내/외국인 비정상";
return returnPage(model, errMessage, kmcVO);
}
}
LoginVO loginVO = new LoginVO();
loginVO.setId(kmcVO.getPlusInfo());
loginVO.setId(plusInfo);
loginVO = loginService.selectKMCInfo(loginVO);
loginVO.setIp(kmcVO.getIp());
String userIp = EgovClntInfo.getClntIP(request);
loginVO.setIp(ip);
loginService.insertMberIp(loginVO);

File diff suppressed because it is too large Load Diff

View File

@ -198,7 +198,7 @@ public class EgovMypageRESTAPIController{
List<ApiKeyVO> resultList = new ArrayList<ApiKeyVO>();
resultList = apiKeyMngService.selectApiKeyApplyStatus(apiKeyVO);
System.out.println("=============");
if (resultList.size()>0) {
if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm()))
{
@ -250,31 +250,6 @@ public class EgovMypageRESTAPIController{
return "web/api/apiSpec";
}
@RequestMapping(value="/web/api/apiAtSpec.do")
public String apiAtSpec(ModelMap model)
throws Exception {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
if(loginVO == null) {
return "redirect:/web/user/login/login.do";
}
model.addAttribute("loginVO", loginVO);
return "web/api/apiAtSpec";
}
@RequestMapping(value="/web/api/apiFtSpec.do")
public String apiFtSpec(ModelMap model)
throws Exception {
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
if(loginVO == null) {
return "redirect:/web/user/login/login.do";
}
model.addAttribute("loginVO", loginVO);
return "web/api/apiFtSpec";
}
/**
* @param model
* @return

View File

@ -1,44 +1,29 @@
package itn.let.uat.uia.web;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Map;
import java.util.Random;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.ui.ModelMap;
import org.springframework.web.servlet.FlashMap;
import org.springframework.web.servlet.FlashMapManager;
import org.springframework.web.servlet.support.RequestContextUtils;
import com.icert.comm.secu.IcertSecuManager;
import itn.let.cert.phone.service.CertPhoneService;
import itn.let.cert.phone.service.MberCertPhoneVO;
import itn.let.mjo.pay.service.KmcVO;
import itn.let.uat.uia.service.AuthCertVO;
import itn.let.uss.umt.service.EgovMberManageService;
import itn.let.uss.umt.service.MberManageVO;
@Component("KmcCertChecker")
public class KmcCertChecker {
@Resource(name = "CertPhoneService")
private CertPhoneService certPhoneService;
@Resource(name = "mberManageService")
private EgovMberManageService mberManageService;
//회원가입 인증수단을 휴대폰 본인인증만 했을 경우 사용
public AuthCertVO authCertCheck(
@ -79,13 +64,11 @@ public class KmcCertChecker {
String tr_add = "N"; // IFrame사용여부
//01. 한국모바일인증() 암호화 모듈 선언
// IcertSecuManager seed = new IcertSecuManager();
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
IcertSecuManager seed = new IcertSecuManager();
//02. 1차 암호화 (tr_cert 데이터변수 조합 암호화)
String enc_tr_cert = "";
tr_cert = cpId +"/"+ urlCode +"/"+ certNum +"/"+ date +"/"+ certMet +"/"+ birthDay +"/"+ gender +"/"+ name +"/"+ phoneNo +"/"+ phoneCorp +"/"+ nation +"/"+ plusInfo +"/"+ extendVar;
// tr_cert = cpId +"/"+ urlCode +"/"+ certNum +"/"+ date +"/"+ certMet +"///////"+ plusInfo +"/"+ extendVar;
enc_tr_cert = seed.getEnc(tr_cert, "");
//03. 1차 암호화 데이터에 대한 위변조 검증값 생성 (HMAC)
@ -104,315 +87,7 @@ public class KmcCertChecker {
return authCertVO;
}
public KmcVO authCertResult(
HttpServletRequest request
, HttpServletResponse response
, ModelMap model
) throws IOException {
//크롬 SameSite정책 방지 - 도메인이 다른 타사로 이동 크롬 정책에 의해 세션 유실이 일어나는 경우가 있는데, 이를 방지하기 위해 samesite 보안을 none처리
response.setHeader("Set-Cookie", "mberSession=mberSession; Secure; SameSite=None");
KmcVO kmcVO = new KmcVO(); //return VO
// 변수 -------------------------------------------------------------------------------------------------------------
String api_token = ""; // 토큰값(암호화)
String api_certNum = ""; // 요청번호(암호화)
String message = ""; // JSON 전문
String result_cd = ""; // JSON 결과코드
String result_msg = ""; // JSON 결과-상세
String strResult = ""; // JSON 결과
String apiRecCert = ""; // JSON 전송 데이터
String apiCertNum = ""; // JSON 전송 데이터
String rec_cert = ""; // 결과수신DATA
String k_certNum = ""; // 파라미터로 수신한 요청번호
String certNum = ""; // 요청번호
String date = ""; // 요청일시
String CI = ""; // 연계정보(CI)
String DI = ""; // 중복가입확인정보(DI)
String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사
String birth = ""; // 생년월일
String gender = ""; // 성별
String nation = ""; // 내국인
String name = ""; // 성명
String reserve1 = ""; // 예비필드
String reserve2 = ""; // 예비필드
String reserve3 = ""; // 예비필드
String reserve4 = ""; // 예비필드
String result = ""; // 결과값
String certMet = ""; // 인증방법
String ip = ""; // ip주소
String plusInfo = "";
String encPara = "";
String encMsg1 = "";
String encMsg2 = "";
String msgChk = "";
//-----------------------------------------------------------------------------------------------------------------
try{
// Parameter 수신 --------------------------------------------------------------------
api_token = request.getParameter("apiToken").trim();
api_certNum = request.getParameter("certNum");
// 파라미터 유효성 검증
if( api_token.length() == 0 ){
goErrorPage("토큰값 비정상", request, response);
return kmcVO;
}
if( api_certNum.length() == 0 ){
goErrorPage("요청번호 비정상", request, response);
return kmcVO;
}
//현재시각 세팅(YYYYMMDDHI24MISS)
Calendar today = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String api_date = sdf.format(today.getTime());
//01. 암호화 모듈 (jar) Loading
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
//api_token, api_certNum 복호화
api_token = seed.getDec(api_token, "");
api_certNum = seed.getDec(api_certNum, "");
// 파라미터 유효성 검증
if( api_token.length() == 0 ){
goErrorPage("토큰값 비정상(복호화 후)", request, response);
return kmcVO;
}
if( api_certNum.length() == 0 ){
goErrorPage("요청번호 비정상(복호화 후)", request, response);
return kmcVO;
}
// 1. URL 설정
String serverURL = "https://www.kmcert.com/kmcis/api/kmcisToken_api.jsp";
// 2. 연결 생성
URL url = new URL(serverURL);
// 3. HttpURLConnection 객체 생성.
HttpURLConnection con = null;
OutputStream wr = null;
BufferedReader bufferedReader = null;
// 4. URL 연결 (웹페이지 URL 연결.)
con = (HttpURLConnection)url.openConnection();
con.setConnectTimeout(20000); // TimeOut 시간 (서버 접속시 연결 시간 - 20초)
con.setReadTimeout(20000); // TimeOut 시간 (Read시 연결 시간 - 20초)
con.setDoOutput(true); // OutputStream으로 POST 데이터를 넘겨주겠다는 옵션.
con.setRequestProperty("Content-Type", "application/json;charset=utf-8"); // 타입설정(application/json) 형식으로 전송 (Request Body 전달시 application/json로 서버에 전달.)
con.setRequestProperty("Accept", "application/json"); // 서버 Response Data를 JSON 형식의 타입으로 요청.
con.setRequestMethod("POST"); // 요청 방식 선택 (POST)
// 5. JSON 전문 구성
JSONObject jsonData = new JSONObject();
jsonData.put("apiToken", api_token);
jsonData.put("apiDate", api_date);
message = jsonData.toString();
// 6. 전송
// Request Body에 Data를 담기위해 OutputStream 객체를 생성.
wr = con.getOutputStream();
// Request Body에 Data 셋팅.(한글깨짐 방지를 위해 utf-8인코딩 처리
wr.write(message.getBytes("utf-8"));
wr.flush();
wr.close();
// 실제 서버로 Request 요청 하는 부분. (응답 코드를 받는다. 200 성공, 나머지 에러)
int responseCode = con.getResponseCode();
// 4. 결과 수신
if(responseCode == 200){
bufferedReader = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
}else{
bufferedReader = new BufferedReader(new InputStreamReader(con.getErrorStream(), "UTF-8"));
}
if(bufferedReader != null){
StringBuilder stringBuilder = new StringBuilder();
String line = "";
while((line = bufferedReader.readLine()) != null){
stringBuilder.append(line);
}
bufferedReader.close();
String stringRet = stringBuilder.toString();
// 5. 넘어온 문자열을 JSON 객체로 변환
JSONParser jsonParser = new JSONParser();
//JSON데이터를 넣어 JSON Object 만들어 준다.
JSONObject jsonObj = (JSONObject)jsonParser.parse(stringRet);
// 6. JSON 객체에서 데이터 가져오기
if(jsonObj.get("result_cd") != null){
result_cd = jsonObj.get("result_cd").toString();
if("APR01".equals(result_cd)){
//통신성공
strResult = "Y";
rec_cert = jsonObj.get("apiRecCert").toString();
k_certNum = jsonObj.get("apiCertNum").toString();
}else if("APR02".equals(result_cd)){
//실패 - Token Expire
strResult = "N";
result_msg = "실패 - Token Expire";
}else if("APR03".equals(result_cd)){
//실패 - Token Not Found
strResult = "N";
result_msg = "실패 - Token Not Found";
}else if("APR04".equals(result_cd)){
//실패 - API 요청일시 길이 오류
strResult = "N";
result_msg = "실패 - API 요청일시 길이 오류";
}else if("APR05".equals(result_cd)){
//실패 - API 토큰 길이 오류
strResult = "N";
result_msg = "실패 - API 토큰 길이 오류";
}else if("APR06".equals(result_cd)){
//실패 - 결과전송 재요청(3회 제한)
strResult = "N";
result_msg = "실패 - 결과전송 재요청(3회 제한)";
}
}else{
//JSON 결과코드 에러
strResult = "F";
}
}else{ //timeout except 처리
strResult = "F";
}
// 파라미터 유효성 검증
if(!strResult.equals("Y")){
goErrorPage("결과값 비정상, 결과코드["+result_cd+"], "+"상세내용["+result_msg+"]", request, response);
return kmcVO;
}
//02. 1차 복호화
rec_cert = seed.getDec(rec_cert, "");
//03. 1차 파싱
int inf1 = rec_cert.indexOf("/",0);
int inf2 = rec_cert.indexOf("/",inf1+1);
encPara = rec_cert.substring(0,inf1); //암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1+1,inf2); //암호화된 통합 파라미터의 Hash값
//04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
if(encMsg2.equals(encMsg1)){
msgChk="Y";
}
if(msgChk.equals("N")){
goErrorPage("비정상적인 접근입니다.!!", request, response);
return kmcVO;
}
//05. 2차 복호화
rec_cert = seed.getDec(encPara, "");
//06. 2차 파싱
int info1 = rec_cert.indexOf("/",0);
int info2 = rec_cert.indexOf("/",info1+1);
int info3 = rec_cert.indexOf("/",info2+1);
int info4 = rec_cert.indexOf("/",info3+1);
int info5 = rec_cert.indexOf("/",info4+1);
int info6 = rec_cert.indexOf("/",info5+1);
int info7 = rec_cert.indexOf("/",info6+1);
int info8 = rec_cert.indexOf("/",info7+1);
int info9 = rec_cert.indexOf("/",info8+1);
int info10 = rec_cert.indexOf("/",info9+1);
int info11 = rec_cert.indexOf("/",info10+1);
int info12 = rec_cert.indexOf("/",info11+1);
int info13 = rec_cert.indexOf("/",info12+1);
int info14 = rec_cert.indexOf("/",info13+1);
int info15 = rec_cert.indexOf("/",info14+1);
int info16 = rec_cert.indexOf("/",info15+1);
int info17 = rec_cert.indexOf("/",info16+1);
int info18 = rec_cert.indexOf("/",info17+1);
kmcVO.setCertNum (rec_cert.substring(0,info1));
kmcVO.setDate (rec_cert.substring(info1+1,info2));
//CI 복호화
kmcVO.setCI (seed.getDec(rec_cert.substring(info2+1,info3), ""));
kmcVO.setPhoneNo (rec_cert.substring(info3+1,info4));
kmcVO.setPhoneCorp (rec_cert.substring(info4+1,info5));
kmcVO.setBirthDay (rec_cert.substring(info5+1,info6));
kmcVO.setGender (rec_cert.substring(info6+1,info7));
kmcVO.setNation (rec_cert.substring(info7+1,info8));
kmcVO.setName (rec_cert.substring(info8+1,info9));
kmcVO.setResult (rec_cert.substring(info9+1,info10));
kmcVO.setCertMet (rec_cert.substring(info10+1,info11));
kmcVO.setIp (rec_cert.substring(info11+1,info12));
kmcVO.setReserve1 (rec_cert.substring(info12+1,info13));
kmcVO.setReserve2 (rec_cert.substring(info13+1,info14));
kmcVO.setReserve3 (rec_cert.substring(info14+1,info15));
kmcVO.setReserve4 (rec_cert.substring(info15+1,info16));
kmcVO.setPlusInfo (rec_cert.substring(info16+1,info17));
//DI 복호화
kmcVO.setDI (seed.getDec(rec_cert.substring(info17+1,info18), ""));
//07. CI, DI 복호화
// CI = seed.getDec(CI, "");
// DI = seed.getDec(DI, "");
// ----------------------------------------------------------------------------------
}catch(StringIndexOutOfBoundsException ex){
goErrorPage("StringIndexOutOfBoundsException", request, response);
}catch(NullPointerException ex){
goErrorPage("NullPointerException", request, response);
}catch(NumberFormatException ex){
goErrorPage("NumberFormatException", request, response);
}catch(IllegalStateException ex){
goErrorPage("IllegalStateException", request, response);
}catch(IndexOutOfBoundsException ex){
goErrorPage("IndexOutOfBoundsException", request, response);
} catch (IOException e) {
goErrorPage("IOException", request, response);
} catch (ParseException e) {
goErrorPage("ParseException", request, response);
}
return kmcVO;
}
public AuthCertVO insertCertLog(KmcVO kmcVO, String msg) throws Exception {
//KMC 본인인증 로그 insert
AuthCertVO certVO = new AuthCertVO();
certVO.setMberId(kmcVO.getPlusInfo());
certVO.setCertNum(kmcVO.getCertNum());
certVO.setCertDate(kmcVO.getDate());
certVO.setCertDi(kmcVO.getDI());
certVO.setCertPhone(kmcVO.getPhoneNo());
certVO.setCertNation(kmcVO.getNation());
certVO.setCertName(kmcVO.getName());
certVO.setCertResult(kmcVO.getResult());
certVO.setCertType(msg);
certVO.setCertIpaddr(kmcVO.getIp());
certVO.setBirthDay(kmcVO.getBirthDay());
certVO.setSexdstnCode(kmcVO.getGender());
//디비 테이블에 저장하기
mberManageService.insertCertInfoLog(certVO);
return certVO;
}
private String getDomain(HttpServletRequest request) {
String serverNm = request.getScheme() + "://" + request.getServerName();
@ -469,12 +144,5 @@ public class KmcCertChecker {
return mberCertPhoneVO;
}
private void goErrorPage(String msg, HttpServletRequest request, HttpServletResponse response) throws IOException {
FlashMap flashMap = RequestContextUtils.getOutputFlashMap(request);
flashMap.put("msg", msg);
FlashMapManager flashMapManager = RequestContextUtils.getFlashMapManager(request);
flashMapManager.saveOutputFlashMap(flashMap, request, response);
response.sendRedirect("/web/cert/log/kmcErrorPage.do");
}
}

View File

@ -19,8 +19,6 @@ public class SendLogVO {
/*내용*/
private String contents;
private String sendMsgType;
public String getSendId() {
return sendId;
@ -64,13 +62,5 @@ public class SendLogVO {
public void setContents(String contents) {
this.contents = contents;
}
public String getSendMsgType() {
return sendMsgType;
}
public void setSendMsgType(String sendMsgType) {
this.sendMsgType = sendMsgType;
}
}

View File

@ -251,6 +251,4 @@ public interface EgovMberManageService {
public String findTopByregDateFromCertLog(AuthCertVO authCertVO);
//사용자 헤더 정보(단가, 이벤트 활성화 기간)
public MberManageVO selectMberHeaderInfo(String mberId) throws Exception;
}

View File

@ -220,6 +220,4 @@ public interface EgovUserManageService {
public Map<String, Object> selectFaxSendList(FaxGroupDataVO faxGroupDataVO);
// 마지막 결제수단 조회
public String selectLastPayMethod(String mberId) throws Exception;
}

View File

@ -512,39 +512,6 @@ public class MberManageVO extends UserDefaultVO{
*/
private String secuLoginFlag;
/**
* 회원 이벤트 정보
*/
private String eventEndDate; //회원 이벤트 종료일자
private double eventRemainCash; //이벤트 차감 남은 Cash
private float eventShortPrice; //이벤트 단문 가격
private float eventLongPrice; //이벤트 장문 가격
private float eventPicturePrice; //이벤트 그림 1장 가격
private float eventPicture2Price; //이벤트 그림 2장 가격
private float eventPicture3Price; //이벤트 그림 3장 가격
private String eventLeftDay; //이벤트 남은 기간
/**
* 헤더 영역 정보(단가, 발송가능 건수)
*/
private float headerShortPrice;
private float headerLongPrice;
private float headerPicturePrice;
private float headerPicture2Price;
private float headerPicture3Price;
private float headerKakaoAtPrice;
private float headerKakaoFtPrice;
private float headerFaxPrice;
private int headerShortCnt;
private int headerLongCnt;
private int headerPictureCnt;
private int headerPicture2Cnt;
private int headerPicture3Cnt;
private int headerKakaoAtCnt;
private int headerKakaoFtCnt;
private int headerFaxCnt;
public String getSmsCode() {
return smsCode;
}
@ -1837,150 +1804,6 @@ public class MberManageVO extends UserDefaultVO{
public void setSecuLoginFlag(String secuLoginFlag) {
this.secuLoginFlag = secuLoginFlag;
}
public String getEventEndDate() {
return eventEndDate;
}
public void setEventEndDate(String eventEndDate) {
this.eventEndDate = eventEndDate;
}
public double getEventRemainCash() {
return eventRemainCash;
}
public void setEventRemainCash(double eventRemainCash) {
this.eventRemainCash = eventRemainCash;
}
public float getEventShortPrice() {
return eventShortPrice;
}
public void setEventShortPrice(float eventShortPrice) {
this.eventShortPrice = eventShortPrice;
}
public float getEventLongPrice() {
return eventLongPrice;
}
public void setEventLongPrice(float eventLongPrice) {
this.eventLongPrice = eventLongPrice;
}
public float getEventPicturePrice() {
return eventPicturePrice;
}
public void setEventPicturePrice(float eventPicturePrice) {
this.eventPicturePrice = eventPicturePrice;
}
public float getEventPicture2Price() {
return eventPicture2Price;
}
public void setEventPicture2Price(float eventPicture2Price) {
this.eventPicture2Price = eventPicture2Price;
}
public float getEventPicture3Price() {
return eventPicture3Price;
}
public void setEventPicture3Price(float eventPicture3Price) {
this.eventPicture3Price = eventPicture3Price;
}
public String getEventLeftDay() {
return eventLeftDay;
}
public void setEventLeftDay(String eventLeftDay) {
this.eventLeftDay = eventLeftDay;
}
public float getHeaderShortPrice() {
return headerShortPrice;
}
public void setHeaderShortPrice(float headerShortPrice) {
this.headerShortPrice = headerShortPrice;
}
public float getHeaderLongPrice() {
return headerLongPrice;
}
public void setHeaderLongPrice(float headerLongPrice) {
this.headerLongPrice = headerLongPrice;
}
public float getHeaderPicturePrice() {
return headerPicturePrice;
}
public void setHeaderPicturePrice(float headerPicturePrice) {
this.headerPicturePrice = headerPicturePrice;
}
public float getHeaderPicture2Price() {
return headerPicture2Price;
}
public void setHeaderPicture2Price(float headerPicture2Price) {
this.headerPicture2Price = headerPicture2Price;
}
public float getHeaderPicture3Price() {
return headerPicture3Price;
}
public void setHeaderPicture3Price(float headerPicture3Price) {
this.headerPicture3Price = headerPicture3Price;
}
public int getHeaderShortCnt() {
return headerShortCnt;
}
public void setHeaderShortCnt(int headerShortCnt) {
this.headerShortCnt = headerShortCnt;
}
public int getHeaderLongCnt() {
return headerLongCnt;
}
public void setHeaderLongCnt(int headerLongCnt) {
this.headerLongCnt = headerLongCnt;
}
public int getHeaderPictureCnt() {
return headerPictureCnt;
}
public void setHeaderPictureCnt(int headerPictureCnt) {
this.headerPictureCnt = headerPictureCnt;
}
public int getHeaderPicture2Cnt() {
return headerPicture2Cnt;
}
public void setHeaderPicture2Cnt(int headerPicture2Cnt) {
this.headerPicture2Cnt = headerPicture2Cnt;
}
public int getHeaderPicture3Cnt() {
return headerPicture3Cnt;
}
public void setHeaderPicture3Cnt(int headerPicture3Cnt) {
this.headerPicture3Cnt = headerPicture3Cnt;
}
public float getHeaderKakaoAtPrice() {
return headerKakaoAtPrice;
}
public void setHeaderKakaoAtPrice(float headerKakaoAtPrice) {
this.headerKakaoAtPrice = headerKakaoAtPrice;
}
public float getHeaderKakaoFtPrice() {
return headerKakaoFtPrice;
}
public void setHeaderKakaoFtPrice(float headerKakaoFtPrice) {
this.headerKakaoFtPrice = headerKakaoFtPrice;
}
public float getHeaderFaxPrice() {
return headerFaxPrice;
}
public void setHeaderFaxPrice(float headerFaxPrice) {
this.headerFaxPrice = headerFaxPrice;
}
public int getHeaderKakaoAtCnt() {
return headerKakaoAtCnt;
}
public void setHeaderKakaoAtCnt(int headerKakaoAtCnt) {
this.headerKakaoAtCnt = headerKakaoAtCnt;
}
public int getHeaderKakaoFtCnt() {
return headerKakaoFtCnt;
}
public void setHeaderKakaoFtCnt(int headerKakaoFtCnt) {
this.headerKakaoFtCnt = headerKakaoFtCnt;
}
public int getHeaderFaxCnt() {
return headerFaxCnt;
}
public void setHeaderFaxCnt(int headerFaxCnt) {
this.headerFaxCnt = headerFaxCnt;
}
}

View File

@ -882,11 +882,5 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement
return resultMap;
}
// 마지막 결제수단 SELECT
@Override
public String selectLastPayMethod(String mberId) throws Exception {
return userManageDAO.selectLastPayMethod(mberId);
}
}

View File

@ -320,9 +320,5 @@ public class UserManageDAO extends EgovAbstractDAO{
public int selectUserPrePaymentPGdataCount(String userId) throws Exception{
return (int) select("userManageDAO.selectUserPrePaymentPGdataCount", userId);
}
// 마지막 결제수단 SELECT
public String selectLastPayMethod(String mberId) throws Exception{
return (String) select("userManageDAO.selectLastPayMethod", mberId);
}
}

View File

@ -12,9 +12,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.RSAPublicKeySpec;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -109,7 +106,6 @@ import itn.let.lett.service.LetterVO;
import itn.let.mjo.addr.service.AddrTransHistService;
import itn.let.mjo.addr.service.AddrTransHistVO;
import itn.let.mjo.event.service.MjonEventService;
import itn.let.mjo.event.service.MjonEventVO;
import itn.let.mjo.kisa.service.KisaService;
import itn.let.mjo.kisa.service.KisaVO;
import itn.let.mjo.mjocommon.MjonForienIpChk;
@ -134,7 +130,6 @@ import itn.let.sym.mnu.mpm.service.MenuManageVO;
import itn.let.sym.prm.service.EgovProgrmManageService;
import itn.let.sym.prm.service.ProgrmManageVO;
import itn.let.sym.site.service.EgovSiteManagerService;
import itn.let.sym.site.service.JoinSettingVO;
import itn.let.sym.site.service.MetaTagVO;
import itn.let.sym.site.service.SiteManagerVO;
import itn.let.uss.umt.service.EgovMberManageService;
@ -1261,16 +1256,6 @@ public class MainController {
model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO));
}
/*
* 회원별 단가, 기본 단가, 이벤트 정보 조회
* 2025.07.25 이지우 추가
* */
MberManageVO mberHeaderInfoVO = new MberManageVO();
if(loginVO != null) {
mberHeaderInfoVO = mberManageService.selectMberHeaderInfo(loginVO.getId());
}
model.addAttribute("mberHeaderInfoVO", mberHeaderInfoVO);
return "web/com/webCommonHeader";
}

View File

@ -28,7 +28,7 @@ Globals.Env = dev
# mysql
Globals.DriverClassName=com.mysql.jdbc.Driver
Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc
#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon
Globals.UserName= mjonUr
Globals.Password= mjon!@#$

View File

@ -28,10 +28,8 @@ Globals.Env = local
# mysql
Globals.DriverClassName=com.mysql.jdbc.Driver
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?characterEncoding=UTF-8&useUnicode=true&serverTimezone=Asia/Seoul
Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
Globals.UserName= mjonUr
Globals.Password= mjon!@#$
#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

View File

@ -27,7 +27,7 @@ Globals.Env = prod
# mysql
Globals.DriverClassName=com.mysql.jdbc.Driver
Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc
Globals.UserName= mjonUr
Globals.Password= mjon!@#$

View File

@ -1,94 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:egov-security="http://www.egovframe.go.kr/schema/egov-security"
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
http://www.egovframe.go.kr/schema/egov-security http://maven.egovframe.go.kr/schema/egov-security/egov-security-3.7.xsd">
<security:http pattern="/css/**" security="none"/>
<security:http pattern="/html/**" security="none"/>
<security:http pattern="/images/**" security="none"/>
<security:http pattern="/js/**" security="none"/>
<security:http pattern="/resource/**" security="none"/>
<security:http pattern="\A/WEB-INF/jsp/.*\Z" request-matcher="regex" security="none"/>
<egov-security:config id="securityConfig"
loginUrl="/uat/uia/actionMain.do"
logoutSuccessUrl="/uat/uia/actionMain.do"
loginFailureUrl="/uat/uia/actionSecurityLogin.do?login_error=1"
accessDeniedUrl="/sec/ram/accessDenied.do"
dataSource="egov.dataSource"
jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP,
USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID, MBTLNUM AS MOBLPHONNO,
'-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, DEPT
FROM COMVNUSERMASTER A
INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID
WHERE CONCAT(USER_SE, USER_ID) = ?"
jdbcAuthoritiesByUsernameQuery="SELECT A.SCRTY_DTRMN_TRGET_ID USER_ID, A.AUTHOR_CODE AUTHORITY
FROM LETTNEMPLYRSCRTYESTBS A, COMVNUSERMASTER B
WHERE A.SCRTY_DTRMN_TRGET_ID = B.ESNTL_ID AND B.USER_ID = ?"
jdbcMapClass="itn.let.uat.uia.service.impl.EgovSessionMapping"
requestMatcherType="regex"
hash="plaintext"
hashBase64="false"
concurrentMaxSessons="999"
concurrentExpiredUrl="/"
defaultTargetUrl="/uat/uia/actionMain.do"
/>
<!--원 소스 -->
<!-- defaultTargetUrl="/uat/uia/actionMain.do" -->
<!-- sqlHierarchicalRoles="
SELECT a.CHLDRN_ROLE child, a.PARNTS_ROLE parent
FROM LETTNROLES_HIERARCHY a LEFT JOIN LETTNROLES_HIERARCHY b on (a.CHLDRN_ROLE = b.PARNTS_ROLE)" -->
<egov-security:secured-object-config id="securedObjectConfig"
roleHierarchyString="
ROLE_ADMIN > ROLE_USER_MEMBER
ROLE_USER_MEMBER > ROLE_ANONYMOUS"
sqlRolesAndUrl="
SELECT a.ROLE_PTTRN url, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url'
ORDER BY a.ROLE_SORT"
sqlRolesAndMethod="
SELECT a.ROLE_PTTRN method, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'method'
ORDER BY a.ROLE_SORT"
sqlRolesAndPointcut="
SELECT a.ROLE_PTTRN pointcut, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'pointcut'
ORDER BY a.ROLE_SORT"
sqlRegexMatchedRequestMapping="
SELECT a.resource_pattern uri, b.authority authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'regex'
ORDER BY a.ROLE_SORT"
/>
<egov-security:initializer id="initializer" supportMethod="true" supportPointcut="false" />
<!-- URL에 세미콜론(semicolon)허용 여부(기본값/false) -->
<bean id="egovStrictHttpFirewall" class="org.springframework.security.web.firewall.StrictHttpFirewall">
<property name="allowSemicolon" value="true"/>
</bean>
<security:http-firewall ref="egovStrictHttpFirewall"/>
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:egov-security="http://www.egovframe.go.kr/schema/egov-security"
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
http://www.egovframe.go.kr/schema/egov-security http://www.egovframe.go.kr/schema/egov-security/egov-security-3.7.xsd">
<security:http pattern="/css/**" security="none"/>
<security:http pattern="/html/**" security="none"/>
<security:http pattern="/images/**" security="none"/>
<security:http pattern="/js/**" security="none"/>
<security:http pattern="/resource/**" security="none"/>
<security:http pattern="\A/WEB-INF/jsp/.*\Z" request-matcher="regex" security="none"/>
<egov-security:config id="securityConfig"
loginUrl="/uat/uia/actionMain.do"
logoutSuccessUrl="/uat/uia/actionMain.do"
loginFailureUrl="/uat/uia/actionSecurityLogin.do?login_error=1"
accessDeniedUrl="/sec/ram/accessDenied.do"
dataSource="egov.dataSource"
jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP,
USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID, MBTLNUM AS MOBLPHONNO,
'-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, DEPT
FROM COMVNUSERMASTER A
INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID
WHERE CONCAT(USER_SE, USER_ID) = ?"
jdbcAuthoritiesByUsernameQuery="SELECT A.SCRTY_DTRMN_TRGET_ID USER_ID, A.AUTHOR_CODE AUTHORITY
FROM LETTNEMPLYRSCRTYESTBS A, COMVNUSERMASTER B
WHERE A.SCRTY_DTRMN_TRGET_ID = B.ESNTL_ID AND B.USER_ID = ?"
jdbcMapClass="itn.let.uat.uia.service.impl.EgovSessionMapping"
requestMatcherType="regex"
hash="plaintext"
hashBase64="false"
concurrentMaxSessons="999"
concurrentExpiredUrl="/"
defaultTargetUrl="/uat/uia/actionMain.do"
/>
<!--원 소스 -->
<!-- defaultTargetUrl="/uat/uia/actionMain.do" -->
<!-- sqlHierarchicalRoles="
SELECT a.CHLDRN_ROLE child, a.PARNTS_ROLE parent
FROM LETTNROLES_HIERARCHY a LEFT JOIN LETTNROLES_HIERARCHY b on (a.CHLDRN_ROLE = b.PARNTS_ROLE)" -->
<egov-security:secured-object-config id="securedObjectConfig"
roleHierarchyString="
ROLE_ADMIN > ROLE_USER_MEMBER
ROLE_USER_MEMBER > ROLE_ANONYMOUS"
sqlRolesAndUrl="
SELECT a.ROLE_PTTRN url, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url'
ORDER BY a.ROLE_SORT"
sqlRolesAndMethod="
SELECT a.ROLE_PTTRN method, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'method'
ORDER BY a.ROLE_SORT"
sqlRolesAndPointcut="
SELECT a.ROLE_PTTRN pointcut, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'pointcut'
ORDER BY a.ROLE_SORT"
sqlRegexMatchedRequestMapping="
SELECT a.resource_pattern uri, b.authority authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'regex'
ORDER BY a.ROLE_SORT"
/>
<egov-security:initializer id="initializer" supportMethod="true" supportPointcut="false" />
<!-- URL에 세미콜론(semicolon)허용 여부(기본값/false) -->
<bean id="egovStrictHttpFirewall" class="org.springframework.security.web.firewall.StrictHttpFirewall">
<property name="allowSemicolon" value="true"/>
</bean>
<security:http-firewall ref="egovStrictHttpFirewall"/>
</beans>

View File

@ -569,8 +569,10 @@
on A.ADDR_GRP_ID = mag.ADDR_GRP_ID
WHERE
A.MBER_ID = #mberId#
AND (A.RECV_STATUS IN ('Y', 'S') OR A.RECV_STATUS IS NULL)
AND (A.ADDR_GRP_ID IS NULL OR MAG.DELETE_YN = 'N')
AND (A.RECV_STATUS = 'Y'
or A.RECV_STATUS = 'S'
or A.RECV_STATUS is null)
AND mag.DELETE_YN = 'N'
</select>
<!-- 주소록 상세 조회 -->
@ -1352,32 +1354,34 @@
, BOOKMARK
, RECV_STATUS
)
SELECT t.ADDR_GRP_ID,
t.MBER_ID,
t.ADDR_NM,
FN_GETHYPHEN(t.ADDR_PHONE_NO),
t.ADDR_INFO1,
t.ADDR_INFO2,
t.ADDR_INFO3,
t.ADDR_INFO4,
t.ADDR_COMMENT,
t.FRST_REGIST_PNTTM,
t.FRST_REGISTER_ID,
t.LAST_UPDT_PNTTM,
t.LAST_UPDUSR_ID,
t.DELETE_YN,
t.BOOKMARK,
t.RECV_STATUS
FROM TEMP_MJ_ADDR AS t
LEFT JOIN MJ_ADDR AS m
ON m.MBER_ID = t.MBER_ID
AND m.ADDR_GRP_ID = t.ADDR_GRP_ID
AND m.BOOKMARK = t.BOOKMARK
AND replace(m.ADDR_PHONE_NO, '-', '') = replace(t.ADDR_PHONE_NO, '-', '')
WHERE t.MBER_ID = #mberId#
AND t.ADDR_GRP_ID = #addrGrpId#
AND t.BOOKMARK = #bookmark#
AND m.MBER_ID IS NULL
SELECT
ADDR_GRP_ID
, MBER_ID
, ADDR_NM
, ADDR_PHONE_NO
, ADDR_INFO1
, ADDR_INFO2
, ADDR_INFO3
, ADDR_INFO4
, ADDR_COMMENT
, FRST_REGIST_PNTTM
, FRST_REGISTER_ID
, LAST_UPDT_PNTTM
, LAST_UPDUSR_ID
, DELETE_YN
, BOOKMARK
, RECV_STATUS
FROM TEMP_MJ_ADDR
WHERE MBER_ID = #mberId#
AND ADDR_GRP_ID = #addrGrpId#
AND BOOKMARK = #bookmark#
AND ADDR_PHONE_NO NOT IN
(
SELECT ADDR_PHONE_NO FROM MJ_ADDR
WHERE MBER_ID = #mberId#
AND ADDR_GRP_ID = #addrGrpId#
AND BOOKMARK = #bookmark#
)
</insert>

View File

@ -85,11 +85,4 @@
DELETE FROM lettngnrlmber_access_call_info
WHERE access_no = #accessNo#
</delete>
<update id="ApiCallInfoMngDAO.updateApiCallInfoAll" parameterClass="apiKeyVO">
UPDATE lettngnrlmber_access_call_info
SET use_yn = #useYn#
WHERE access_no = #accessNo#
</update>
</sqlMap>

View File

@ -208,7 +208,6 @@
)
WHERE 1=1
and a.mber_id=#mberId#
and b.USE_YN != 'N'
LIMIT 1
</select>

View File

@ -909,7 +909,7 @@
<!-- 발신 내용 상세보기 조회 (상세보기 버튼 클릭시)-->
<select id="KakaoSentDAO.selectKakaoSentDetailDataAjax" parameterClass="mjonKakaoATVO" resultClass="mjonKakaoATVO">
/* KakaoSentDAO.selectKakaoSentDetailDataAjax */
SELECT
MGD.MSG_GROUP_ID as msgGroupId
, MGD.USER_ID as userId
@ -925,14 +925,9 @@
, MD.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData /* 대체 문자 (치환O) */
, MGD.BIZ_KAKAO_RESEND_ORGNL_TXT as bizKakaoResendOrgnlTxt /* 대체 문자( 치환X ) */
, MD.BIZ_KAKAO_JSON_FILE as bizKakaoJsonFile /* Json 파일 경로 */
, BA.CONTENTS as contents
, MGD.AD_FLAG as adFlag
, MD.FILE_PATH1 as filePath1
FROM MJ_MSG_GROUP_DATA MGD
INNER JOIN MJ_MSG_DATA MD
ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
LEFT JOIN BIZ_ATTACHMENTS BA
ON MD.BIZ_KAKAO_JSON_FILE = BA.MSG_KEY
AND MGD.USER_ID = MD.USER_ID
WHERE
MGD.USER_ID = #userId#
@ -1397,10 +1392,6 @@
B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey,
A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
A.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData,
B.AD_FLAG as adFlag ,
B.BIZ_KAKAO_IMAGE_TYPE as bizKakaoImageType ,
B.BIZ_KAKAO_RESEND_TYPE as bizKakaoResendType ,
CASE
WHEN B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N'
THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE)
@ -1409,7 +1400,7 @@
C.YELLOW_ID AS yellowId
FROM MJ_MSG_GROUP_DATA B
INNER JOIN (
select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA, CALL_TO
select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN
from MJ_MSG_DATA
where DEL_FLAG = 'N'
<isNotEmpty property="tabType">
@ -1452,9 +1443,6 @@
<isEqual property="searchCondition" compareValue="3">
AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
</isEqual>
<isEqual property="searchCondition" compareValue="4" >
AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
</isNotEmpty>
GROUP BY B.MSG_GROUP_ID
ORDER BY 1=1
@ -1675,96 +1663,23 @@
</select>
<select id="KakaoSentDAO.selectKakaoSentCntEachCnt_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
/* KakaoSentDAO.selectKakaoSentCntEachCnt_advc */
SELECT
a.MSG_GROUP_ID AS msgGroupId
, a.successCount
, a.waitCount
, a.failCount
, a.divideYn
<isEqual property="bizKakaoResendYn" compareValue="Y">
, a.kakaoResendSuccCount
, a.kakaoResendFailCount
<isEqual property="msgType" compareValue="8">
, a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
</isEqual>
<isEqual property="msgType" compareValue="9">
<!-- bizKakaoImageType 있음 + MMS -->
<isNotEmpty property="bizKakaoImageType">
<!-- 와이드 이미지인 경우 -->
<isEqual property="bizKakaoImageType" compareValue="W">
, a.successCount * bkp.BIZ_KAKAO_FT_WIDE_IMG_PRICE AS successPrice
</isEqual>
<!-- 일반 이미지인 경우 -->
<isEqual property="bizKakaoImageType" compareValue="I">
, a.successCount * bkp.BIZ_KAKAO_FT_IMG_PRICE AS successPrice
</isEqual>
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_PICTURE_PRICE) AS kakaoResendSuccPrice
</isNotEmpty>
<!-- 이미지 없음 -->
<isEmpty property="bizKakaoImageType">
, a.successCount * bkp.BIZ_KAKAO_FT_PRICE AS successPrice
<isEqual property="bizKakaoResendType" compareValue="MMS">
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
</isEqual>
<isEqual property="bizKakaoResendType" compareValue="SMS">
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * 0) AS kakaoResendSuccPrice
</isEqual>
<!-- 예외: bizKakaoResendType 이 MMS, SMS 둘 다 아닐 경우 -->
<isNotEqual property="bizKakaoResendType" compareValue="MMS">
<isNotEqual property="bizKakaoResendType" compareValue="SMS">
, 0 AS kakaoResendSuccPrice
</isNotEqual>
</isNotEqual>
</isEmpty>
</isEqual>
</isEqual>
<isNotEqual property="bizKakaoResendYn" compareValue="Y">
, 0 AS kakaoResendSuccCount
, 0 AS kakaoResendFailCount
<isEqual property="msgType" compareValue="8">
, a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
</isEqual>
<isEqual property="msgType" compareValue="9">
<!-- 와이드 이미지인 경우 -->
<isEqual property="bizKakaoImageType" compareValue="W">
, a.successCount * bkp.BIZ_KAKAO_FT_WIDE_IMG_PRICE AS successPrice
</isEqual>
<!-- 일반 이미지인 경우 -->
<isEqual property="bizKakaoImageType" compareValue="I">
, a.successCount * bkp.BIZ_KAKAO_FT_IMG_PRICE AS successPrice
</isEqual>
<!-- 텍스트형(이미지 없음)인 경우 -->
<isNotEqual property="bizKakaoImageType" compareValue="W">
<isNotEqual property="bizKakaoImageType" compareValue="I">
, a.successCount * bkp.BIZ_KAKAO_FT_PRICE AS successPrice
</isNotEqual>
</isNotEqual>
</isEqual>
, 0 AS kakaoResendSuccPrice
a.MSG_GROUP_ID AS msgGroupId
, a.successCount
, a.waitCount
, a.failCount
, a.divideYn
<isEqual property="bizKakaoResendYn" compareValue="Y">
, a.kakaoResendSuccCount
, a.kakaoResendFailCount
, a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
</isEqual>
<isNotEqual property="bizKakaoResendYn" compareValue="Y">
, 0 AS kakaoResendSuccCount
, 0 AS kakaoResendFailCount
, 0 AS successPrice
, 0 AS kakaoResendSuccPrice
</isNotEqual>
FROM (
SELECT
@ -1823,19 +1738,8 @@
, a.failCount
, a.kakaoResendSuccCount
, a.kakaoResendFailCount
<!-- , a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice -->
,case
when a.msgType = '8' then a.successCount * bkp.BIZ_KAKAO_AT_PRICE
when a.msgType = '9' and a.bizKakaoImageType = 'I' then a.successCount * bkp.BIZ_KAKAO_FT_IMG_PRICE
when a.msgType = '9' and a.bizKakaoImageType = 'W' then a.successCount * bkp.BIZ_KAKAO_FT_WIDE_IMG_PRICE
when a.msgType = '9' and a.bizKakaoImageType != 'I' and a.bizKakaoImageType != 'W' then a.successCount * bkp.BIZ_KAKAO_FT_PRICE
end successPrice
<!-- , (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice -->
,case
when a.msgType = '8' then (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE)
when a.msgType = '9' and (a.bizKakaoImageType = 'I' or a.bizKakaoImageType = 'W') then a.mmsCnt * bkp.BIZ_PICTURE_PRICE
when a.msgType = '9' and a.bizKakaoImageType != 'I' and a.bizKakaoImageType != 'W' then (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE)
end kakaoResendSuccPrice
, a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
, (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
, a.divideYn
, a.bizKakaoResendYn
, MKPI.YELLOW_ID AS yellowId
@ -1961,7 +1865,6 @@
, MD.BIZ_KAKAO_RESEND_YN as bizKakaoResendYn
, MD.MSG_NOTICETALK_SENDER_KEY
, MD.MSG_NOTICETALK_TMP_KEY
, MGD.BIZ_KAKAO_IMAGE_TYPE as bizKakaoImageType
FROM MJ_MSG_DATA MD
inner join MJ_MSG_GROUP_DATA MGD on
MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
@ -1993,7 +1896,6 @@
<!-- 발신 내용 상세보기 조회 (상세보기 버튼 클릭시)-->
<select id="KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax" parameterClass="mjonKakaoATVO" resultClass="mjonKakaoATVO">
/* KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax */
SELECT
MGD.MSG_GROUP_ID as msgGroupId

View File

@ -72,17 +72,12 @@
, SMS_TXT
, BIZ_KAKAO_TITLE
, AD_FLAG
, FILE_PATH1
, BIZ_KAKAO_RESEND_YN
, BIZ_KAKAO_RESEND_DATA
, BIZ_KAKAO_RESEND_TYPE
, BIZ_KAKAO_JSON_FILE
, REQ_DATE
, FILE_CNT
, MSG_RESULT
)VALUES
<iterate conjunction=",">
(
@ -100,17 +95,12 @@
, #[].templateContent#
, #[].templateTitle#
, #[].adFlag#
, #[].filePath1#
, #[].subMsgSendYn#
, #[].subMsgTxt#
, #[].subMsgType#
, #[].bizJsonName#
, #[].reqDate#
, #[].fileCnt#,
'00'
)
</iterate>
</insert>
@ -141,7 +131,6 @@
REQ_DATE,
MSG_GROUP_CNT,
MSG_TYPE,
AD_FLAG,
AGENT_CODE,
EACH_PRICE,
@ -150,12 +139,10 @@
BEF_POINT,
TOT_PRICE,
SEND_KIND,
AT_DELAY_YN,
BIZ_KAKAO_RESEND_ORGNL_TXT,
BIZ_KAKAO_RESEND_TYPE,
BIZ_KAKAO_IMAGE_TYPE
BIZ_KAKAO_RESEND_TYPE
)VALUES
(
#msgGroupId#,
@ -166,7 +153,6 @@
#reqDate#,
#msgGroupCnt#,
#msgType#,
#adFlag#,
#agentCode#,
#eachPrice#,
@ -175,12 +161,10 @@
#befPoint#,
#totPrice#,
#sendKind#,
#atDelayYn#,
#bizKakaoResendOrgnlTxt#,
#bizKakaoResendType#,
#bizKakaoImageType#
#bizKakaoResendType#
)
</insert>
@ -194,7 +178,6 @@
, BIZ_KAKAO_FT_WIDE_IMG_PRICE
, BIZ_SMS_PRICE
, BIZ_MMS_PRICE
, BIZ_PICTURE_PRICE
)
VALUES
(
@ -205,18 +188,14 @@
,#kakaoFtWideImgPrice#
,#smsPrice#
,#mmsPrice#
,#picturePrice#
)
</insert>
<select id="kakaoAlimTalkDAO.selectKakaoSentRefundList" resultClass="kakaoVO">
<select id="kakaoAlimTalkDAO.selectKakaoAtSentRefundList" resultClass="kakaoVO">
SELECT
MMD.USER_ID AS userId
, MMD.MSG_GROUP_ID AS msgGroupId
, MMD.MSG_ID AS msgId
, MMD.MSG_SEQ AS msgSeq
, MMGD.BIZ_KAKAO_IMAGE_TYPE AS bizKakaoImageType
, MMGD.EACH_PRICE AS eachPrice
, MMD.USERDATA AS userData
, MMD.REFUND_YN AS refundYn
, MMD.RSLT_CODE AS rsltCode
@ -226,21 +205,42 @@
, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
, MMD.BIZ_KAKAO_RESEND_YN AS subMsgSendYn
, MMD.BIZ_KAKAO_RESEND_TYPE AS subMsgType
, MMD.FILE_CNT AS fileCnt
, MMD.BIZ_UMID AS bizUmid
, MMD.MSG_TYPE AS msgType
FROM
MJ_MSG_DATA MMD FORCE index (IDX_MJ_MSG_DATA_13)
MJ_MSG_DATA MMD
INNER JOIN LETTNGNRLMBER MB
ON MMD.USER_ID = MB.MBER_ID
INNER JOIN mj_msg_group_data MMGD
on MMD.MSG_GROUP_ID = MMGD.MSG_GROUP_ID
WHERE 1=1
AND MMD.CUR_STATE = '3'
AND MMD.REFUND_YN = 'N'
AND MMD.RESERVE_C_YN = 'N'
AND MMD.MSG_TYPE IN(8, 9)
ORDER BY MMD.USER_ID ASC
AND MMD.MSG_TYPE = 8
</select>
<select id="kakaoAlimTalkDAO.selectKakaoFtSentRefundList" resultClass="kakaoVO">
SELECT
MMD.USER_ID AS userId
, MMD.MSG_GROUP_ID AS msgGroupId
, MMD.MSG_SEQ AS msgSeq
, MMD.USERDATA AS userData
, MMD.REFUND_YN AS refundYn
, MMD.RSLT_CODE AS rsltCode
, MMD.RSLT_CODE2 AS rsltCode2
, MMD.AGENT_CODE AS agentCode
, DATE_FORMAT(MMD.SENT_DATE,'%Y-%m-%d %T') AS sentDate
, DATE_FORMAT(MMD.RSLT_DATE,'%Y-%m-%d %T') AS rsltDate
, MMD.BIZ_KAKAO_RESEND_YN AS subMsgSendYn
, MMD.BIZ_KAKAO_RESEND_TYPE AS subMsgType
FROM
MJ_MSG_DATA MMD
INNER JOIN LETTNGNRLMBER MB
ON MMD.USER_ID = MB.MBER_ID
WHERE 1=1
AND MMD.CUR_STATE = '3'
AND MMD.REFUND_YN = 'N'
AND MMD.RESERVE_C_YN = 'N'
AND MMD.MSG_TYPE = 9
</select>
<select id="kakaoAlimTalkDAO.selectKakaoAtUmid" resultClass="kakaoVO" parameterClass="kakaoVO">
@ -252,15 +252,6 @@
AND USERDATA = #userData#
</select>
<select id="kakaoAlimTalkDAO.selectBizLog" resultClass="kakaoVO" parameterClass="String">
SELECT
CALL_STATUS AS bizLogCallStatus
FROM
BIZ_LOG
WHERE 1=1
AND CMID = #umid#
</select>
<!-- 카카오 전송 환불 프로시저 실행 (카카오 전송 성공 관련) -->
<procedure id="kakaoAlimTalkDAO.updateKakaoAtSend" parameterClass="kakaoVO">
{call kakaoAt_Send(#userId#, #msgGroupId#, #userData#)}
@ -280,7 +271,7 @@
<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 성공 관련 - 대체문자 선택시 차액 환불 처리) -->
<procedure id="kakaoAlimTalkDAO.updateKakaoFtSend" parameterClass="kakaoVO">
{call kakaoFt_Send(#userId#, #msgGroupId#, #userData#, #fileCnt#, #bizKakaoResendType#, #bizKakaoImageType#)}
{call kakaoFt_Send(#userId#, #msgGroupId#, #userData#)}
</procedure>
<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 실패시 대체문자 관련 - 대체문자 발송 완료 된 경우) -->

View File

@ -37,7 +37,7 @@
VALUES
( #friendId#
, #userId#
, #atchFileId#
, #bizJsonName#
, #templateName#
, #imageFileName#
, #templateImageUrl#
@ -200,7 +200,6 @@
A.IMAGE_TYPE AS imageType,
A.IMAGE_TITLE AS imgTitle,
A.IMAGE_LINK AS imgLink,
A.ATCH_FILE_ID AS atchFileId,
A.TEMPLATE_CONTENTS AS templateContent,
A.AD_FLAG AS adFlag,
DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
@ -216,7 +215,6 @@
KFT.IMAGE_TYPE,
KFT.IMAGE_TITLE,
KFT.IMAGE_LINK,
KFT.ATCH_FILE_ID,
KFT.TEMPLATE_CONTENTS,
KFT.AD_FLAG,
KFT.FRST_REGIST_PNTTM,

View File

@ -173,8 +173,7 @@
FILE_PATH1,
FILE_PATH2,
FILE_PATH3,
MSG_GROUP_ID,
MSG_RESULT
MSG_GROUP_ID
)VALUES
<iterate conjunction=",">
(
@ -192,8 +191,7 @@
#[].filePath1#,
#[].filePath2#,
#[].filePath3#,
#[].msgGroupId#,
'00'
#[].msgGroupId#
)
</iterate>
</insert>
@ -2153,8 +2151,6 @@
, POINT_PER AS pointPer
, KAKAO_AT_PRICE AS kakaoAtPrice
, KAKAO_FT_PRICE AS kakaoFtPrice
, KAKAO_FT_IMG_PRICE AS kakaoFtImgPrice
, KAKAO_FT_WIDE_IMG_PRICE AS kakaoFtWideImgPrice
, FAX_PRICE AS faxPrice
FROM MJ_MBER_SETTING
@ -2173,8 +2169,6 @@
, PICTURE3_PRICE AS picture3Price
, KAKAO_AT_PRICE AS kakaoAtPrice
, KAKAO_FT_PRICE AS kakaoFtPrice
, KAKAO_FT_IMG_PRICE AS kakaoFtImgPrice
, KAKAO_FT_WIDE_IMG_PRICE AS kakaoFtWideImgPrice
, FAX_PRICE AS faxPrice
, USER_MONEY AS userMoney
, USER_POINT AS userPoint
@ -2186,8 +2180,6 @@
, BLINE_CODE AS blineCode
, AT_SMISHING_YN AS atSmishingYn
, PRE_PAYMENT_YN AS prePaymentYn
, BIZ_NO AS bizNo
, MBER_EMAIL_ADRES AS mberEmailAdres
FROM LETTNGNRLMBER
WHERE MBER_ID = #userId#
@ -2327,7 +2319,6 @@
EVENT_YN,
DELAY_YN,
AT_DELAY_YN,
SEND_KIND,
BIZ_KAKAO_RESEND_ORGNL_TXT,
SUBJECT_CHK_YN
)
@ -2355,7 +2346,6 @@
#eventYn#,
#delayYn#,
#atDelayYn#,
#sendKind#,
#kakaoSubMagOrgnlTxt#,
#subjectChkYn#
)
@ -3178,7 +3168,6 @@
WHERE 1 = 1
AND pf.SentEA > 0
AND mjf.USER_ID = #userId#
AND mjf.RESERVE_C_YN = 'N'
) AS pay
WHERE 1=1
@ -3288,7 +3277,7 @@
, M.fileName3 AS fileName3
, M.orderByCode AS orderByCode
, M.msgId AS msgId
, DATE_FORMAT(M.reqDate, '%Y-%m-%d %H:%i') AS reqDate
, M.reqDate AS reqDate
FROM
(SELECT
DATE_FORMAT(B.REGDATE, '%Y-%m-%d %H:%i' ) AS regDate
@ -3329,7 +3318,7 @@
/*and A.DEL_FLAG = 'N'*/
AND A.USER_ID = #userId#
AND B.USER_ID = #userId#
AND B.RESERVE_C_YN = 'N'
/*AND B.RESERVE_C_YN = 'N'*/
ORDER BY 1=1
, msgGroupId DESC
, sentDate DESC
@ -3377,7 +3366,6 @@
WHERE 1 = 1
AND pf.SentEA > 0
AND mjf.USER_ID = #userId#
AND mjf.RESERVE_C_YN = 'N'
) AS pay
WHERE 1=1
@ -3603,15 +3591,15 @@
, MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate
, M.msgTypeName
, M.orderByCode
, SUM(IF(M.msgTypeName = '단문', 1, 0)) AS shtSendCount
, SUM(IF(M.msgTypeName = '장문', 1, 0)) AS longSendCount
, SUM(IF(M.msgTypeName = '그림', 1, 0)) AS pictSendCount
, SUM(IF(M.msgTypeName = '단문(SMS)', 1, 0)) AS shtSendCount
, SUM(IF(M.msgTypeName = '장문(LMS)', 1, 0)) AS longSendCount
, SUM(IF(M.msgTypeName = '그림(MMS)', 1, 0)) AS pictSendCount
, SUM(IF(M.msgTypeName = '알림톡', 1, 0)) AS atSendCount
, SUM(IF(M.msgTypeName = '친구톡', 1, 0)) AS ftSendCount
<!-- , SUM(M.MSG_GROUP_CNT) AS sendCount -->
, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 1), 0) AS supplyPrice
, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 0), 0) AS supplyPrice
, 0 AS vatPrice
, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 1), 0) AS totalPrice
, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 0), 0) AS totalPrice
, M.MSG_TYPE
FROM (
SELECT
@ -3624,14 +3612,14 @@
, B.MSG_TYPE
, CASE
WHEN B.MSG_TYPE = '6' AND B.FILE_CNT > 0
THEN '그림'
THEN '그림(MMS)'
WHEN B.MSG_TYPE = '6' AND B.FILE_CNT = 0
THEN '장문'
THEN '장문(LMS)'
WHEN B.MSG_TYPE = '8'
THEN '알림톡'
WHEN B.MSG_TYPE = '9'
THEN '친구톡'
ELSE '단문'
ELSE '단문(SMS)'
END msgTypeName
, CASE
WHEN B.MSG_TYPE = '6' AND B.FILE_CNT > 0
@ -3649,6 +3637,8 @@
AND A.MSG_GROUP_ID = B.MSG_GROUP_ID
AND A.USER_ID = #userId#
AND B.USER_ID = #userId#
AND B.DEL_FLAG = 'N'
AND IFNULL(B.DEL_FLAG,'N') = 'N'
AND B.RESERVE_C_YN = 'N'
<isNotEmpty property="startDate">
@ -3676,9 +3666,6 @@
<isEqual property="pageType" compareValue="at">
AND B.MSG_TYPE = '8'
</isEqual>
<isEqual property="pageType" compareValue="ft">
AND B.MSG_TYPE = '9'
</isEqual>
</isNotEmpty>
) M
WHERE 1=1
@ -3694,9 +3681,9 @@
, IFNULL(MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )), 0) AS minRegDate
, M.msgTypeName
, IFNULL(SUM(SentEA), 0) AS ftSendCount
, ifnull(TRUNCATE(SUM(supplyPrice) , 1), 0) AS supplyPrice
, ifnull(TRUNCATE(SUM(supplyPrice) , 0), 0) AS supplyPrice
, 0 AS vatPrice
, ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 1), 0) AS totalPrice
, ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 0), 0) AS totalPrice
FROM (
SELECT pf.ReqDate AS REGDATE
, pf.ReqDate AS REQ_DATE
@ -3737,8 +3724,7 @@
RECEIVE,
FRST_SEND_PNTTM,
CHECK_NO,
CONTENTS,
SEND_MSG_TYPE
CONTENTS
)
@ -3751,8 +3737,7 @@
#receive#,
now(),
#checkNo#,
#contents#,
#sendMsgType#
#contents#
)
</insert>
@ -7446,17 +7431,6 @@
</update>
<update id="mjonMsgDAO.updateRefundY" parameterClass="mjonMsgVO">
UPDATE MJ_MSG_DATA
SET REFUND_YN = 'Y'
WHERE
USER_ID = #userId#
AND USERDATA = #userData#
AND MSG_GROUP_ID = #msgGroupId#
</update>
<update id="mjonMsgDAO.updateKakaoAtDelayCancelMsgGroupDataFlag" parameterClass="mjonMsgVO">
UPDATE
@ -8300,21 +8274,5 @@
</delete>
<select id="mjonMsgDataDAO.selectSysMsgTodaySendYn" parameterClass="SendLogVO" resultClass="boolean">
SELECT
<![CDATA[
COUNT(1) >= 1 AS todaySendYn
]]>
FROM
mj_system_send a
WHERE
RECEIVE = #receive#
<![CDATA[
AND FRST_SEND_PNTTM >= CURDATE()
AND FRST_SEND_PNTTM < CURDATE() + INTERVAL 1 DAY
]]>
AND SEND_MSG_TYPE = '01'
</select>
</sqlMap>

View File

@ -7,7 +7,6 @@
<sqlMap namespace="Msg">
<typeAlias alias="mjonMsgSWFDTO" type="itn.let.mjo.msgsent.service.MjonMsgSWFDTO"/>
<typeAlias alias="mjonMsgDetailSentVO" type="itn.let.mjo.msgsent.service.MjonMsgDetailSentVO"/>
<typeAlias alias="mjonMsgDetailSentDTO" type="itn.let.mjo.msgsent.service.MjonMsgDetailSentDTO"/>
<typeAlias alias="mjonMsgSentVO" type="itn.let.mjo.msgsent.service.MjonMsgSentVO"/>
<typeAlias alias="mjonMsgVO" type="itn.let.mjo.msg.service.MjonMsgVO"/>
<typeAlias alias="addrGroupVO" type="itn.let.mjo.addr.service.AddrGroupVO"/>
@ -254,9 +253,6 @@
<isEqual property="searchCondition" compareValue="3" >
AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
<isEqual property="searchCondition" compareValue="4" >
AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
</isNotEmpty>
<isNotEmpty property="searchCondition01">
AND B.RESERVE_YN = #searchCondition01#
@ -393,7 +389,7 @@
<!-- 전체 발송결과 조회 (전송사별)-->
<select id="MjonMsgSentDAO.findByMsgDetailListAjax" parameterClass="mjonMsgDetailSentVO" resultClass="mjonMsgDetailSentDTO">
<select id="MjonMsgSentDAO.findByMsgDetailListAjax" parameterClass="mjonMsgDetailSentVO" resultClass="mjonMsgDetailSentVO">
/* MjonMsgSentDAO.findByMsgDetailListAjax*/
SELECT
@ -476,9 +472,6 @@
<isEqual property="searchCondition" compareValue="3" >
AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
<isEqual property="searchCondition" compareValue="4" >
AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
</isNotEmpty>
<isNotEmpty property="searchCondition01">
AND B.RESERVE_YN = #searchCondition01#

View File

@ -3,11 +3,10 @@
========= ======= =================================================
2021.03.01 신명섭
-->
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
<sqlMap namespace="Pay">
<typeAlias alias="mjonPayVO" type="itn.let.mjo.pay.service.MjonPayVO"/>
<typeAlias alias="stVcVO" type="itn.let.mjo.pay.service.StVcVO"/>
<typeAlias alias="bizKakaoPriceVO" type="itn.let.kakao.kakaoComm.BizKakaoPriceVO"/>
<typeAlias alias="mjonVaMsgLogVO" type="itn.let.mjo.pay.service.MjonVaMsgLogVO"/>
<!-- 공통 쿼리 부분 문자 발송 관련 -->
@ -101,7 +100,6 @@
, D.CODE_NM AS rcptTypeTxt
, E.CONFIRM_YN AS confirmYn
, E.RCPT_TYPE AS rcptType
, E.CONFIRM_DATE AS confirmDate
, IFNULL(MP.POINT, '0') AS point
, EMI.EVENT_PG_MOID AS eventMoid
, mber.SMISHING_YN AS smishingYn
@ -150,7 +148,6 @@
MOID
, CONFIRM_YN
, RCPT_TYPE
, CONFIRM_DATE
FROM
MJ_TAX
WHERE 1=1
@ -609,7 +606,6 @@
MEMO,
ORDER_ID,
MSG_GROUP_ID
)VALUES
(
#userId#,
@ -628,22 +624,6 @@
</update>
<select id="mjonPayDAO.selectBizKakaoPrice" resultClass="bizKakaoPriceVO" parameterClass="String">
SELECT
BIZ_KAKAO_PRICE_ID AS bizKakaoPriceId,
BIZ_KAKAO_AT_PRICE AS bizKakaoAtPrice,
BIZ_KAKAO_FT_PRICE AS bizKakaoFtPrice,
BIZ_KAKAO_FT_IMG_PRICE AS bizKakaoFtImgPrice,
BIZ_KAKAO_FT_WIDE_IMG_PRICE AS bizKakaoFtWideImgPrice,
BIZ_SMS_PRICE AS bizSmsPrice,
BIZ_MMS_PRICE AS bizMmsPrice,
MSG_GROUP_ID AS msgGroupId
FROM BIZ_KAKAO_PRICE
WHERE MSG_GROUP_ID = #msgGroupId#
</select>
<insert id="mjonPayDAO.insertMjPg" parameterClass="mjonPayVO">
INSERT INTO MJ_PG
(
@ -2375,27 +2355,4 @@
</select>
<select id="mjonPayDAO.selectPayDetail" parameterClass="mjonPayVO" resultClass="mjonPayVO">
SELECT
LM.BIZ_NO AS bizNo
, LM.MBER_NM AS mberNm
, LM.MANAGER_NM AS managerNm
, LM.MBTLNUM AS mbtlNum
, LM.MBER_EMAIL_ADRES AS email
, LM.PRE_PAYMENT_YN AS prePaymentYn
, LM.DEPT AS dept
, LM.USER_MONEY AS userMoney
, MP.REG_DATE AS regDate
, MP.AMT AS amt
, MP.CASH AS cash
, MP.PG_STATUS AS pgStatus
FROM LETTNGNRLMBER LM
LEFT JOIN MJ_PG MP
ON MP.USER_ID = LM.MBER_ID
WHERE LM.MBER_ID = #userId#
AND MP.MOID = #moid#
</select>
</sqlMap>

View File

@ -980,7 +980,6 @@
IFNULL(SLACK_NOTI, 'N') AS slackNoti,
IFNULL(SMISHING_NOTI, 'N') AS smishingNoti,
IFNULL(HOLI_SMISHING_NOTI, 'N') AS holiSmishingNoti,
IFNULL(SMS_NOTI_IF_OVER_FIFTY, 'N') AS smsNotiIfOverFifty,
LAST_UPDUSR_ID AS lasUpdusrId,
LAST_UPDT_PNTTM AS lastUpdtPnttm
FROM MJ_MBER_SETTING

View File

@ -2142,38 +2142,4 @@
</update>
<select id="mberManageDAO.selectMberHeaderInfo" resultClass="itn.let.uss.umt.service.MberManageVO" parameterClass="String">
SELECT
L.SHORT_PRICE AS shortPrice
, L.LONG_PRICE AS longPrice
, L.PICTURE_PRICE AS picturePrice
, L.PICTURE2_PRICE AS picture2Price
, L.PICTURE3_PRICE AS picture3Price
, L.PRE_PAYMENT_YN AS prePaymentYn
, L.USER_MONEY AS userMoney
, IFNULL(MEMI.EVENT_SHORT_PRICE, 0) AS eventShortPrice
, IFNULL(MEMI.EVENT_LONG_PRICE, 0) AS eventLongPrice
, IFNULL(MEMI.EVENT_PICTURE_PRICE, 0) AS eventPicturePrice
, IFNULL(MEMI.EVENT_PICTURE2_PRICE, 0) AS eventPicture2Price
, IFNULL(MEMI.EVENT_PICTURE3_PRICE, 0) AS eventPicture3Price
, IFNULL(MEMI.EVENT_REMAIN_CASH, 0) AS eventRemainCash
, DATE_FORMAT(MEMI.EVENT_END_DATE, '%Y-%m-%d') AS eventEndDate
FROM
LETTNGNRLMBER L
LEFT JOIN
MJ_EVENT_MBER_INFO MEMI
ON L.MBER_ID = MEMI.MBER_ID
AND MEMI.EVENT_INFO_ID = (
SELECT
MAX(EVENT_INFO_ID)
FROM
MJ_EVENT_MBER_INFO
WHERE
MBER_ID = #mberID#
AND EVENT_STATUS = 'Y'
)
WHERE L.MBER_ID = #mberId#
</select>
</sqlMap>

View File

@ -1367,7 +1367,6 @@
LETTNGNRLMBER
SET
SMISHING_YN = #smishingYn#
, AT_SMISHING_YN = #atSmishingYn#
WHERE 1=1
AND MBER_ID = #mberId#
</update>
@ -1459,15 +1458,5 @@
AND MONTH(REG_DATE) = MONTH(CURRENT_DATE)
</select>
<!-- 마지막 결제수단 SELECT -->
<select id="userManageDAO.selectLastPayMethod" parameterClass="String" resultClass="String">
SELECT
IFNULL(PAY_METHOD, '') AS nextPayMethod
FROM MJ_PG
WHERE
USER_ID = #userId#
ORDER BY REG_DATE DESC LIMIT 1
</select>
</sqlMap>

View File

@ -36,11 +36,6 @@
<link rel="stylesheet" href="/publish/js/datepicker/classic.css">
<link rel="stylesheet" href="/publish/js/datepicker/classic.date.css">
<link rel="stylesheet" href="/publish/js/highlight/styles/default.min.css">
<link rel="stylesheet" href="/publish/js/highlight/styles/arta.css">
<script type="text/javascript" src="/publish/js/jquery-3.5.0.js"></script>
<script type="text/javascript" src="/publish/js/jquery.mCustomScrollbar.concat.min.js"></script>
<script type="text/javascript" src="/publish/js/common.js?date=202507210001"></script>
@ -85,9 +80,6 @@
<!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 -->
<script type="text/javascript" src="/dist/js/tabulator/jquery_wrapper.js"></script>
<script type="text/javascript" src="/publish/js/highlight/highlight.min.js"></script>
<%-- 20240110 matomo 사용 안함으로 인하여 주석처리 함
<c:if test="${fn:contains(pageContext.request.requestURL, 'munjaon.co.kr')}">

Some files were not shown because too many files have changed in this diff Show More