xit-java
/
mens-traffic-parent
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
dev
kjh 1 year ago
parent a362ca4ea6 c50cffa63e
commit fe4a29b8cb
2 changed files with 267 additions and 6 deletions
Show Stats Download Patch File Download Diff File

267
mens-api/src/main/java/kr/xit/biz/cmm/service/CmmEnsFileService.java
Unescape Escape View File

@ -96,7 +96,7 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
List<FmcInfExcelRslt> rslts = getConvertCis(fileReq, fmcExcels);
// TODO :: CNTC 테이블 insert
String msg = makeCntc(rslts, fmcExcels, fileReq.getRegister());
String msg = makeCntc(rslts, fmcExcels, fileReq);
// TODO :: POST-PLUS(전자우편) 일 경우 tb_ens_post_plus_json 테이블 insert
@ -286,11 +286,12 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
* @return String
* </pre>
*/
private String makeCntc(final List<FmcInfExcelRslt> rslts, final List<FmcInfExcel> fmcExcels, String register){
private String makeCntc(final List<FmcInfExcelRslt> rslts, final List<FmcInfExcel> fmcExcels, FmcExcelUpload fileReq){
int mst = 0;
int errCnt = 0;
final int excelCnt = fmcExcels.size();
String unitySndngMastrId = "";
String register = StringUtils.defaultString(fileReq.getRegister(),"");
for(FmcInfExcelRslt dto : rslts){
if(StringUtils.isEmpty(String.join("", dto.getCi1(), dto.getCi2()))){
@ -316,7 +317,18 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
);
mst++;
}
String mpc = jsonCn1(dto);
String mpc = "";
switch (StringUtils.defaultString(fileReq.getSignguCode(), "")) {
case "88328":
mpc = jsonCn1(dto);
break;
case "88316":
mpc = jsonCn2(dto);
break;
default:
break;
}
//CNTC detail 생성
mapper.insertCntcSndngDtl(
CntcDTO.SndngDtl.builder()
@ -374,13 +386,66 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountNm1(),"") +"\","
+ "\"key\": \"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountNm1(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"금액\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount1(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm1(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount2(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm2(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount3(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapAmountDetailNm3(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmount4(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"합계액\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountTotal(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapGubun1(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") +"까지\","
+ "\"value\": \""+ Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") +"까지 "+ Checks.checkVal(dto.getNapAmountTotal(),"") + "원\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \""+ Checks.checkVal(dto.getNapGubun2(),"") +"\","
+ "\"value\": \""+ Checks.checkVal(dto.getNapAmountTotal(),"") +"원\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "},"
+ "{"
+ "\"title\": \"서울시 세외수입 납부 전용계좌\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"properties\": {"
+ "},"
+ "\"elements\": ["
+ "{"
+ "\"key\": \"우리은행\","
+ "\"value\": \""+ Checks.checkVal(dto.getWVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"신한은행\","
+ "\"value\": \""+ Checks.checkVal(dto.getSVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"하나은행\","
+ "\"value\": \""+ Checks.checkVal(dto.getHVacct(),"") +"\","
+ "\"level\": 1"
+ "}"
+ "]"
@ -398,6 +463,198 @@ public class CmmEnsFileService extends EgovAbstractServiceImpl implements ICmmEn
+ "\"key\": \"모바일\\\\n어플\","
+ "\"value\": \"앱,PLAY스토어에서 (서울시 세금납부) 앱 설치\\\\n계좌이체(전 은행), 신용카드, 간편결제 납부\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"웹페이지\","
+ "\"value\": \"인터넷 검색창에 (이택스) 검색\\\\n계좌이체(전 은행), 신용카드, 간편결제 납부\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"ARS\","
+ "\"value\": \"납부 전용전화(1599-3900) 안내에 따라 납부\\\\n계좌이체 및 신용카드 납부 가능\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"은행방문\","
+ "\"value\": \"전국은행(한국은행 제외), 우체국, 농협, 새마을금고, 신협, 수협, 산림조합\\\\n은행창구 또는 현금인출기에서 계좌이체\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "},"
+ "{"
+ "\"title\": \"연체료\","
+ "\"item_type\": \"TABLE\","
+ "\"elements\": {"
+ "\"head\": ["
+ "\"구분\","
+ "\"1개월\\\\n미만\","
+ "\"3개월\\\\n미만\","
+ "\"6개월\\\\n미만\","
+ "\"6개월\\\\n이상\""
+ "],"
+ "\"rows\": ["
+ "["
+ "\"연체료율\","
+ "\"7%\","
+ "\"8%\","
+ "\"9%\","
+ "\"10%\""
+ "]"
+ "]"
+ "}"
+ "}"
+ "]"
+"}";
return jsonCn;
}
private String jsonCn2(FmcInfExcel dto){
String jsonCn = "{"
+ "\"details\": ["
+ "{"
+ "\"title\": \"서울특별시 시립승화원 고지서\","
+ "\"item_type\": \"SUBJECT_TEXT\","
+ "\"elements\": ["
+ "\"\""
+ "]"
+ "},"
+ "{"
+ "\"title\": \"내용\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"properties\": {"
+ "},"
+ "\"elements\": ["
+ "{"
+ "\"key\": \"수취인\","
+ "\"value\": \""+ Checks.checkVal(dto.getRecevNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"고지서\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiNm(),"") +"("+ Checks.checkVal(dto.getGojiGubun(),"") +")"+"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"고지서 상세\","
+ "\"value\": \""+ Checks.checkVal(dto.getGojiDetailNm(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"자료관리번호\","
+ "\"value\": \""+ Checks.checkVal(dto.getDataSn(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"관리비 기간\","
+ "\"value\": \""+ Checks.checkVal(dto.getCostPd(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"납세번호\","
+ "\"value\": \""+ Checks.checkVal(dto.getTaxNum1(),"") + Checks.checkVal(dto.getTaxNum2(),"") + Checks.checkVal(dto.getTaxNum3(),"") + Checks.checkVal(dto.getTaxNum4(),"") +"\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "},"
+ "{"
+ "\"title\": \"납부 금액\","
+ "\"item_type\": \"TABLE\","
+ "\"elements\": {"
+ "\"head\": ["
+ "\"구 분\","
+ "\"납기내 금액\","
+ "\"납기후 금액\""
+ "],"
+ "\"rows\": ["
+ "["
+ "\"\","
+ "\"" + Checks.checkVal(dto.getNapAmount1(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmount1(),"") + "\""
+ "],"
+ "["
+ "\"\","
+ "\"" + Checks.checkVal(dto.getNapAmount2(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmount2(),"") + "\""
+ "],"
+ "["
+ "\"\","
+ "\"" + Checks.checkVal(dto.getNapAmount3(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmount3(),"") + "\""
+ "],"
+ "["
+ "\"합 계\","
+ "\"" + Checks.checkVal(dto.getNapAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmountTotal(),"") + "\""
+ "],"
+ "["
+ "\"" + Checks.checkVal(dto.getNapGubun1(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(formatDate(dto.getNapPd().substring(0,8), "-"),"") + "까지\""
+ "],"
+ "["
+ "\"" + Checks.checkVal(dto.getNapGubun2(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftAmountTotal(),"") + "\","
+ "\"" + Checks.checkVal(dto.getNapAftPd(),"") + "\""
+ "]"
+ "]"
+ "}"
+ "},"
+ "{"
+ "\"title\": \"고객 전용계좌\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"properties\": {"
+ "},"
+ "\"elements\": ["
+ "{"
+ "\"key\": \"농협\","
+ "\"value\": \""+ Checks.checkVal(dto.getNVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"국민\","
+ "\"value\": \""+ Checks.checkVal(dto.getKVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"우리\","
+ "\"value\": \""+ Checks.checkVal(dto.getWVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"신한\","
+ "\"value\": \""+ Checks.checkVal(dto.getSVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"KEB하나\","
+ "\"value\": \""+ Checks.checkVal(dto.getHVacct(),"") +"\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"우체국\","
+ "\"value\": \""+ Checks.checkVal(dto.getPVacct(),"") +"\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "},"
+ "{"
+ "\"title\": \"서울시 세외수입 납부방법 안내\","
+ "\"item_type\": \"KEY_VALUE\","
+ "\"elements\": ["
+ "{"
+ "\"key\": \"가상계좌\\\\n납부\","
+ "\"value\": \"- 고지서에 기재된 고객 전용(가상)계좌로 납부\\\\n(단, 다른 은행 이체에 따른 수수료는 납세자가 부담하셔야 합니다.)\\\\n- 타인이 이체 하셔도 '서울세외납부자성명'으로 수납됩니다.\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"서울시 인터넷\\\\n세금납부\","
+ "\"value\": \"- 이택스에 접속하여 로그인 후 계좌이체나 신용카드 납부\\\\n이택스: https://etax.seoul.go.kr\\\\n※ 비회원의 경우에는 고지서에 표시된 '납세번호' 입력 후 납부\","
+ "\"level\": 1"
+ "},"
+ "{"
+ "\"key\": \"ARS 납부\\\\n1599-3900\","
+ "\"value\": \"- 서울시 지방세 세외수입 조회납부 선택하여 ARS안내에 따라 납부\\\\n- 계좌이체(신한은행만 가능)나 신용카드(국내 모든카드)로 납부\","
+ "\"level\": 1"
+ "}"
+ "]"
+ "}"

6
mens-core/src/main/java/kr/xit/core/spring/util/ApiWebClientUtil.java
Unescape Escape View File

@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.util.UriComponentsBuilder;
import reactor.core.publisher.Mono;
/**
* <pre>
@ -199,9 +200,12 @@ public class ApiWebClientUtil {
.uri(url)
.contentType(MediaType.MULTIPART_FORM_DATA)
.headers(httpHeaders -> getHeaders(httpHeaders, headerMap))
.body(BodyInserters.fromMultipartData(builder.build()))
.body(Mono.just(files), MultipartFile.class)
//.body(BodyInserters.fromMultipartData(builder.build()))
.exchangeToMono(res -> res.bodyToMono(rtnClzz))
.block();
// .blockOptional()
// .orElse("");
}
public <T> ApiResponseDTO<T> sendError(final Throwable e) {

Write Preview
Loading…
Cancel
Save