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

feat: 성공코드 공통으로 적용 application.properties[STAT_0 -> respone.status.success]

Browse Source
This commit is contained in:
hylee 2023-05-30 09:55:08 +09:00
parent 51d78b68df
commit 0dc0bb0773
6 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/itn/mjonApi/cmn/aop/SendAspect.java
View File

@ -111,7 +111,7 @@ public class SendAspect {
SendSuccessRestResponse sendSuccessRestResponse = (SendSuccessRestResponse) restResponse.getObject(); SendSuccessRestResponse sendSuccessRestResponse = (SendSuccessRestResponse) restResponse.getObject();
resutlCode = sendSuccessRestResponse.getResultCode(); resutlCode = sendSuccessRestResponse.getResultCode();
}else{ }else{
log.info(" :: SendFailRestResponse :: "); log.info(" :: FailRestResponse :: ");
FailRestResponse failRestResponse = (FailRestResponse) restResponse.getObject(); FailRestResponse failRestResponse = (FailRestResponse) restResponse.getObject();
resutlCode = failRestResponse.getResultCode(); resutlCode = failRestResponse.getResultCode();

14
src/main/java/com/itn/mjonApi/cmn/config/RestTemplateConfig.java
View File

@ -1,8 +1,7 @@
package com.itn.mjonApi.cmn.config; package com.itn.mjonApi.cmn.config;
import java.nio.charset.StandardCharsets; import com.itn.mjonApi.cmn.interceptor.RestTemplateLogInterceptor;
import java.time.Duration; import lombok.extern.slf4j.Slf4j;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -16,9 +15,8 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import com.itn.mjonApi.cmn.interceptor.RestTemplateLogInterceptor; import java.nio.charset.StandardCharsets;
import java.time.Duration;
import lombok.extern.slf4j.Slf4j;
/** /**
* packageName : com.itn.mjonApi.cmn.config * packageName : com.itn.mjonApi.cmn.config
@ -36,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;
public class RestTemplateConfig { public class RestTemplateConfig {
@Value("${api.root.url}") @Value("${api.root.url}")
private String rootUrl; private String ROOT_URL;
@Bean @Bean
public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
@ -52,7 +50,7 @@ public class RestTemplateConfig {
RestTemplate restTemplate = restTemplateBuilder RestTemplate restTemplate = restTemplateBuilder
.requestFactory(() -> factory) .requestFactory(() -> factory)
.rootUri(String.format(rootUrl)) .rootUri(String.format(ROOT_URL))
.setReadTimeout(Duration.ofSeconds(5)) // read timeout .setReadTimeout(Duration.ofSeconds(5)) // read timeout
.setConnectTimeout(Duration.ofSeconds(5)) // connection timeout .setConnectTimeout(Duration.ofSeconds(5)) // connection timeout
.additionalMessageConverters(new StringHttpMessageConverter(StandardCharsets.UTF_8)) //메시지 컨버터 추가 .additionalMessageConverters(new StringHttpMessageConverter(StandardCharsets.UTF_8)) //메시지 컨버터 추가

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

@ -45,13 +45,12 @@ public class SendSuccessRestResponse {
* @param mjonResponseVO * @param mjonResponseVO
* @return * @return
*/ */
public static SendSuccessRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO) { public static SendSuccessRestResponse convertMjonDataToApiResponse(MjonResponseVO mjonResponseVO, String STAT_CODE) {
String enumStr = "STAT_0";
return SendSuccessRestResponse.builder() return SendSuccessRestResponse.builder()
.resultCode(StatMsg.valueOf(enumStr).getCode()) // 성공 코드 200 - StatMsg 참고 .resultCode(StatMsg.valueOf(STAT_CODE).getCode()) // 성공 코드 200 - StatMsg 참고
.message(StatMsg.valueOf(enumStr).getMsg()) // 성공은 message가 없음 - StatMsg 참고 .message(StatMsg.valueOf(STAT_CODE).getMsg()) // 성공은 message가 없음 - StatMsg 참고
.msgGroupId(mjonResponseVO.getMsgGroupId()) // 전송 메세지 그룹 ID .msgGroupId(mjonResponseVO.getMsgGroupId()) // 전송 메세지 그룹 ID
.successCnt(mjonResponseVO.getResultSts()) // 성공 건수 .successCnt(mjonResponseVO.getResultSts()) // 성공 건수
.blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수 .blockCnt(mjonResponseVO.getResultBlockSts()) // 수신거부 건수

26
src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java
View File

@ -1,20 +1,18 @@
package com.itn.mjonApi.mjon.api.inqry.service.impl; package com.itn.mjonApi.mjon.api.inqry.service.impl;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Map;
import org.apache.ibatis.annotations.Case;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.itn.mjonApi.cmn.msg.StatMsg; import com.itn.mjonApi.cmn.msg.StatMsg;
import com.itn.mjonApi.mjon.api.inqry.mapper.PriceMapper; import com.itn.mjonApi.mjon.api.inqry.mapper.PriceMapper;
import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceResponse; import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceResponse;
import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO;
import com.itn.mjonApi.mjon.api.inqry.service.PriceService; import com.itn.mjonApi.mjon.api.inqry.service.PriceService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Map;
/** /**
* @packageName : com.itn.mjonApi.mjon.api.inqry.service.impl * @packageName : com.itn.mjonApi.mjon.api.inqry.service.impl
@ -34,6 +32,10 @@ public class PriceServiceImpl implements PriceService {
@Autowired @Autowired
PriceMapper priceMapper; PriceMapper priceMapper;
// 성공 stat_code
@Value("${respone.status.success}")
private String STAT_CODE;
@Override @Override
public PriceResponse selectUserPrice(String mberId) throws Exception { public PriceResponse selectUserPrice(String mberId) throws Exception {
@ -45,13 +47,11 @@ public class PriceServiceImpl implements PriceService {
// 이용단가, 발송가능 건수 // 이용단가, 발송가능 건수
PriceVO priceVO = price_refine(mberId, userMoney, priceMapper); PriceVO priceVO = price_refine(mberId, userMoney, priceMapper);
String enumStr = "STAT_0";
//response set //response set
priceResponse = PriceResponse.builder() priceResponse = PriceResponse.builder()
//defalut set //defalut set
.resultCode(StatMsg.valueOf(enumStr).getCode()) .resultCode(StatMsg.valueOf(STAT_CODE).getCode())
.message(StatMsg.valueOf(enumStr).getMsg()) .message(StatMsg.valueOf(STAT_CODE).getMsg())
.localDateTime(LocalDateTime.now()) .localDateTime(LocalDateTime.now())
//1. 잔액 //1. 잔액
.userMoney(userMoney) .userMoney(userMoney)

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

@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.connector.Response; import org.apache.catalina.connector.Response;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -40,6 +41,9 @@ public class SendServiceImpl implements SendService {
this.apiService = apiService; this.apiService = apiService;
} }
// 성공 stat_code
@Value("${respone.status.success}")
private String STAT_CODE;
private static final String replaseStrList = "[*이름*],[*1*],[*2*],[*3*],[*4*]"; private static final String replaseStrList = "[*이름*],[*1*],[*2*],[*3*],[*4*]";
@Override @Override
@ -112,7 +116,7 @@ public class SendServiceImpl implements SendService {
// convertMjonDataToApiResponse => MjonResponseVO 데이터를 ApiResponse 데이터로 변환하는 메소드 // convertMjonDataToApiResponse => MjonResponseVO 데이터를 ApiResponse 데이터로 변환하는 메소드
if(munjaSendResponse.getResult() != "fail"){ // 성공 if(munjaSendResponse.getResult() != "fail"){ // 성공
return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), SendSuccessRestResponse.convertMjonDataToApiResponse(munjaSendResponse)); return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), SendSuccessRestResponse.convertMjonDataToApiResponse(munjaSendResponse, STAT_CODE));
}else{ // 실패 }else{ // 실패
return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), FailRestResponse.convertMjonDataToApiResponse(munjaSendResponse)); return new RestResponse(HttpStatus.OK, "", LocalDateTime.now(), FailRestResponse.convertMjonDataToApiResponse(munjaSendResponse));
} }

3
src/main/resources/application.properties
View File

@ -20,3 +20,6 @@ spring.devtools.restart.enabled=true
spring.devtools.livereload.enabled=true spring.devtools.livereload.enabled=true
server.error.whitelabel.enabled=false server.error.whitelabel.enabled=false
# respone success status code
respone.status.success=STAT_0