diff --git a/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java b/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java index 250f27b..366cdf0 100644 --- a/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java +++ b/src/main/java/com/itn/mjonApi/cmn/aop/LogAspect.java @@ -155,7 +155,7 @@ public class LogAspect { lettnApiSendMsgLogMapper.insert(apiSendMsgLogVO); // 메세지 그룹 테이블에 발송 구분 업데이트 - updateMsgGroupTbSendKind(apiSendMsgLogVO); + this.updateMsgGroupTbSendKind(apiSendMsgLogVO); } @@ -204,6 +204,7 @@ public class LogAspect { SendSucRestResponse sendSucRestResponse = (SendSucRestResponse) dataObject; if("sendMsgData".equals(methodNm)){ + log.info(" + sendSucRestResponse.getMsgGroupId() :: [{}]", sendSucRestResponse.getMsgGroupId()); msgGroupId = sendSucRestResponse.getMsgGroupId(); } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java index 9977c1c..4b393c3 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/send/mapper/domain/SendSucRestResponse.java @@ -3,7 +3,10 @@ package com.itn.mjonApi.mjon.api.send.mapper.domain; import com.itn.mjonApi.cmn.msg.StatMsg; import lombok.*; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -42,6 +45,7 @@ public class SendSucRestResponse { */ public static SendSucRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) { + List msgTypeList = getMsgType(mjonResponseVO.getMsgType()); return SendSucRestResponse.builder() .resultCode("0") @@ -49,11 +53,31 @@ public class SendSucRestResponse { .successCnt(mjonResponseVO.getResultSts()) // 성공 건수 .blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수 .failCnt("0") - .msgType(StatMsg.valueOf("msgType"+mjonResponseVO.getMsgType()).getMsg()) + .msgType(String.join(", ", msgTypeList)) .build(); } + /** + * msgType이 여러개일때 List로 변환 + * @param msgType + * @return + */ + @NotNull + private static List getMsgType(String msgType) { + List result = new ArrayList<>(); + + if(msgType.indexOf(",") > 0) + { + result = Arrays.stream(msgType.split(",")) + .map(s -> StatMsg.valueOf("msgType"+s).getMsg()) + .collect(Collectors.toList()); + }else{ + result.add(StatMsg.valueOf("msgType"+ msgType).getMsg()); + } + return result; + } + /** * @description 1건~100건 까지 수신자별 메세지 보낸 후 성공 결과를 리턴한다. * @param mjonResponseVOList