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

Merge branch 'hylee'

Browse Source
This commit is contained in:
hylee 2023-05-22 17:37:40 +09:00
commit dee07fecb1
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/itn/mjonApi/cmn/msg/SendFailRestResponse.java → src/main/java/com/itn/mjonApi/cmn/msg/FailRestResponse.java
View File

@ -9,7 +9,7 @@ import java.time.LocalDateTime;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class SendFailRestResponse {
public class FailRestResponse {
//private HttpStatus status;
private String resultCode;
@ -24,15 +24,22 @@ public class SendFailRestResponse {
*
* */
@Builder
public SendFailRestResponse(String enumStr) {
this.resultCode = StatMsg.valueOf(enumStr).getCode();
this.message = StatMsg.valueOf(enumStr).getMsg();
this.localDateTime = LocalDateTime.now();
public static FailRestResponse getSendFailResponse(String resultCode) {
FailRestResponse sendFailResponse = new FailRestResponse();
sendFailResponse.setResultCode(StatMsg.valueOf(resultCode).getCode());
sendFailResponse.setMessage(StatMsg.valueOf(resultCode).getMsg());
sendFailResponse.setLocalDateTime(LocalDateTime.now());
return sendFailResponse;
}
public static SendFailRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) {
/**
* MjonResponseVO -> 변환 -> SendFailRestResponse
* @param mjonResponseVO
* @return
*/
public static FailRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) {
String result = mjonResponseVO.getResult();
String message = mjonResponseVO.getMessage();
String enumStr = "";
@ -41,7 +48,7 @@ public class SendFailRestResponse {
break;
case "smsLengFail" : enumStr = "1080"; // 문자 길이 초과
break;
case "fail" :
case "fail" : // 문자온 프로젝트에서 result가 fail로 다양한 에러가 리턴하여 분기처리함
if(message.indexOf("문자 치환 후 전송 문자 길이를 초과하였습니다.")>-1)
enumStr = "1050"; // 치환 후 문자 길이 초과
if(message.indexOf("치환문자 데이터가 없습니다")>-1)
@ -53,9 +60,7 @@ public class SendFailRestResponse {
break;
}
return SendFailRestResponse.builder()
.enumStr("STAT_"+enumStr)
.build();
return getSendFailResponse(enumStr);
}
}

5
src/main/java/com/itn/mjonApi/cmn/msg/RestResponse.java
View File

@ -18,8 +18,6 @@ public class RestResponse{
private LocalDateTime localDateTime;
private Object object;
private List<?> objectList;
/*
* 200-OK : 정상접속
@ -44,8 +42,7 @@ public class RestResponse{
public RestResponse(HttpStatus status, String message, LocalDateTime timestamp, List<?> objectList) {
this.resultCode = status.value();
checkMessage(status, message);
this.objectList = objectList;
this.localDateTime = timestamp;
}

15
src/main/java/com/itn/mjonApi/cmn/msg/SendSuccessRestResponse.java
View File

@ -29,18 +29,14 @@ public class SendSuccessRestResponse {
/*
* 200-OK : 정상접속
* 401-Unauthorized : 인증실패
*
* */
@Builder
public SendSuccessRestResponse(String enumStr) {
this.resultCode = StatMsg.valueOf(enumStr).getCode();
this.message = StatMsg.valueOf(enumStr).getMsg();
this.localDateTime = LocalDateTime.now();
}
/**
* MjonResponseVO -> 변환 -> SendSuccessRestResponse
* @param mjonResponseVO
* @return
*/
public static SendSuccessRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) {
String enumStr = "STAT_200";
@ -51,6 +47,7 @@ public class SendSuccessRestResponse {
.msgGroupId(mjonResponseVO.getMsgGroupId()) // 전송 메세지 그룹 ID
.successCnt(mjonResponseVO.getResultSts()) // 성공 건수
.blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수
.localDateTime(LocalDateTime.now()) // 현재 시간
.build();
// TODO 추가 예정
// .msgType(mjonResponseVO.getMsgType())

6
src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/MsgRequestVO.java
View File

@ -113,6 +113,11 @@ public class MsgRequestVO implements Serializable {
@ApiModelProperty(value = "치환 후 장문 건수", example = "", hidden = true)
private String longMsgCnt;
@ApiModelProperty(value = "문자 종류 일반:N, 광고:A, 선거:C", example = "N", hidden = true)
private String msgKind="N"; // '문자 종류 일반:N, 광고:A, 선거:C',
// private String msgId ;// '문자ID',
// private String userId ; // '문자온 일반회원ID',
// private String agentFlag ;//'전송사코드(1:아이하트,2:...)',
@ -128,7 +133,6 @@ public class MsgRequestVO implements Serializable {
// private String rsltNet; // '결과처리 통신사',
// private String subject; // 'MMS용 메시지제목',
// private String smsTxtArea;//문자 작성 화면 본문 내용
// private String msgKind; // '문자 종류 일반:N, 광고:A, 선거:C',
// private String msgPayCode; // '재전송 기능에 의한 최종전송콘텐트 종류 저장',
// private String contSeq; // COMMENT 'MMS의 콘텐츠 Key(MMS_CONTENTS_INFO의 CONT_SEQ)',
// private String msgTypeResend; // '재전송할 문자 타입. 값이 있으면 재전송. 없으면 단 건 전송',

11
src/main/java/com/itn/mjonApi/mjon/api/send/service/impl/SendServiceImpl.java
View File

@ -1,7 +1,7 @@
package com.itn.mjonApi.mjon.api.send.service.impl;
import com.itn.mjonApi.cmn.apiServer.ApiService;
import com.itn.mjonApi.cmn.msg.SendFailRestResponse;
import com.itn.mjonApi.cmn.msg.FailRestResponse;
import com.itn.mjonApi.cmn.msg.SendSuccessRestResponse;
import com.itn.mjonApi.mjon.api.send.mapper.SendMapper;
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO;
@ -105,10 +105,11 @@ public class SendServiceImpl implements SendService {
);
log.info("munjaSendResponse : [{}]", munjaSendResponse.toString());
// convertMjonDataToApiResponse => MjonResponseVO 데이터를 ApiResponse 데이터로 변환하는 메소드
if(munjaSendResponse.getResult() != "fail"){ // 성공
return ResponseEntity.ok().body(SendSuccessRestResponse.convertMjonDataToApiResponse(munjaSendResponse));
}else{ // 실패
return ResponseEntity.ok().body(SendFailRestResponse.convertMjonDataToApiResponse(munjaSendResponse));
return ResponseEntity.ok().body(FailRestResponse.convertMjonDataToApiResponse(munjaSendResponse));
}
//step5.발송일시 정상여부 확인
// 1050
@ -123,10 +124,8 @@ public class SendServiceImpl implements SendService {
* 리턴 데이터 메소드
* @return
*/
private static SendFailRestResponse _falseRetunDate(String ststCode) {
return SendFailRestResponse.builder()
.enumStr(ststCode)
.build();
private static FailRestResponse _falseRetunDate(String ststCode) {
return FailRestResponse.getSendFailResponse(ststCode);
}
/**

2
src/main/java/com/itn/mjonApi/mjon/api/send/web/SendRestController.java
View File

@ -1,6 +1,5 @@
package com.itn.mjonApi.mjon.api.send.web;
import com.itn.mjonApi.cmn.msg.SendFailRestResponse;
import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO;
import com.itn.mjonApi.mjon.api.send.service.SendService;
import io.swagger.annotations.ApiOperation;
@ -51,7 +50,6 @@ public class SendRestController {
@ApiOperation(value= "단문 문자 전송", notes = "같은 내용으로 여러명에게 보냄")
public ResponseEntity<?> sendMsg(MsgRequestVO msgRequestVO) throws Exception {
// return ResponseEntity.ok().body();
return sendService.sendMsgData(msgRequestVO);
}