feat: 연계문서v1.2.1 메시지레이아웃 적용

src/main/java/cokr/xit/ntri/api/recv/presentation/NtriRecvApi.java

@@ -4,12 +4,13 @@ import cokr.xit.ntri.api.recv.entity.repository.RecvLevyCancelRepository;
 import cokr.xit.ntri.api.recv.entity.repository.RecvLevyResultRepository;
 import cokr.xit.ntri.api.recv.entity.repository.RecvRcivInfoRepository;
 import cokr.xit.ntri.api.recv.entity.repository.RecvRdcamtInfoRepository;
-import cokr.xit.ntri.api.recv.model.RecvResponseDTO;
 import cokr.xit.ntri.api.recv.service.RecvApiSpec;
 import cokr.xit.ntri.api.recv.service.impl.LevyCancel;
 import cokr.xit.ntri.api.recv.service.impl.LevyResult;
 import cokr.xit.ntri.api.recv.service.impl.RcivInfo;
 import cokr.xit.ntri.api.recv.service.impl.RdcamtInfo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 @Slf4j
 @RequiredArgsConstructor
 @RestController
@@ -34,53 +37,47 @@ public class NtriRecvApi {
     private final RecvRcivInfoRepository recvRcivInfoRepository;
     private final RecvRdcamtInfoRepository recvRdcamtInfoRepository;
 
+    private ObjectMapper mapper = new ObjectMapper();
+
 
     @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
             @Content(mediaType = "application/json", examples = {
                     @ExampleObject(name = "Example..."
                             , summary = "부과결과정보 전송", description = "세외수입시스템 -> 개별시스템을 호출하여 데이터를 전송 한다."
-                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0001\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"spclFisBizCd\":null,\"fyr\":null,\"actSeCd\":null,\"rprsTxmCd\":null,\"operItemCd\":null,\"lvyNo\":null,\"itmNo\":null,\"epayNo\":null,\"vtlacBankNm1\":null,\"vtlacBankNm2\":null,\"vtlacBankNm3\":null,\"vtlacBankNm4\":null,\"vtlacBankNm5\":null,\"vtlacBankNm6\":null,\"vtlacBankNm7\":null,\"vtlacBankNm8\":null,\"vtlacBankNm9\":null,\"vtlacBankNm10\":null,\"vtlacBankNm11\":null,\"vtlacBankNm12\":null,\"vtlacBankNm13\":null,\"vtlacBankNm14\":null,\"vtlacBankNm15\":null,\"vtlacBankNm16\":null,\"vtlacBankNm17\":null,\"vtlacBankNm18\":null,\"vtlacBankNm19\":null,\"vtlacBankNm20\":null,\"vrActno1\":null,\"vrActno2\":null,\"vrActno3\":null,\"vrActno4\":null,\"vrActno5\":null,\"vrActno6\":null,\"vrActno7\":null,\"vrActno8\":null,\"vrActno9\":null,\"vrActno10\":null,\"vrActno11\":null,\"vrActno12\":null,\"vrActno13\":null,\"vrActno14\":null,\"vrActno15\":null,\"vrActno16\":null,\"vrActno17\":null,\"vrActno18\":null,\"vrActno19\":null,\"vrActno20\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}")
+                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0001\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"reqVo\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"spclFisBizCd\":null,\"fyr\":null,\"actSeCd\":null,\"rprsTxmCd\":null,\"operItemCd\":null,\"lvyNo\":null,\"itmNo\":null,\"epayNo\":null,\"vtlacBankNm1\":null,\"vtlacBankNm2\":null,\"vtlacBankNm3\":null,\"vtlacBankNm4\":null,\"vtlacBankNm5\":null,\"vtlacBankNm6\":null,\"vtlacBankNm7\":null,\"vtlacBankNm8\":null,\"vtlacBankNm9\":null,\"vtlacBankNm10\":null,\"vtlacBankNm11\":null,\"vtlacBankNm12\":null,\"vtlacBankNm13\":null,\"vtlacBankNm14\":null,\"vtlacBankNm15\":null,\"vtlacBankNm16\":null,\"vtlacBankNm17\":null,\"vtlacBankNm18\":null,\"vtlacBankNm19\":null,\"vtlacBankNm20\":null,\"vrActno1\":null,\"vrActno2\":null,\"vrActno3\":null,\"vrActno4\":null,\"vrActno5\":null,\"vrActno6\":null,\"vrActno7\":null,\"vrActno8\":null,\"vrActno9\":null,\"vrActno10\":null,\"vrActno11\":null,\"vrActno12\":null,\"vrActno13\":null,\"vrActno14\":null,\"vrActno15\":null,\"vrActno16\":null,\"vrActno17\":null,\"vrActno18\":null,\"vrActno19\":null,\"vrActno20\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}}")
             })
     })
     @PostMapping(value = "/recv/levy/result", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "부과결과정보(실시간)", description = "세외수입시스템으로 부과자료 연계 후 결의처리 시 전자납부번호 및 가상계좌번호 실시간 제공")
-    public ResponseEntity<RecvResponseDTO> levyResult(@RequestBody String jParam) {
+    public ResponseEntity levyResult(@RequestBody String jParam) {
         //저장
         RecvApiSpec recv = LevyResult.builder()
                 .jpaRepository(recvLevyResultRepository)
                 .jParam(jParam)
                 .build();
-        try {
+        Map<String, Object> resultInfo = this.execute(recv, jParam);
-            recv.execute();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
 
-        return new ResponseEntity<RecvResponseDTO>((RecvResponseDTO) recv.getResult(), HttpStatus.OK);
+        return new ResponseEntity(resultInfo, HttpStatus.OK);
     }
 
     @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
             @Content(mediaType = "application/json", examples = {
                     @ExampleObject(name = "Example..."
                             , summary = "부과취소정보 전송", description = "세외수입시스템 -> 개별시스템을 호출하여 데이터를 전송 한다."
-                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0002\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"linkMngKey\":null,\"taxnNo\":null,\"lvyRtrcnYmd\":null,\"delRsnCn\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}")
+                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0002\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"reqVo\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"linkMngKey\":null,\"taxnNo\":null,\"lvyRtrcnYmd\":null,\"delRsnCn\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}}")
             })
     })
     @PostMapping(value = "/recv/levy/cancel", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "부과취소정보(실시간)", description = "세외수입시스템으로 부과자료 연계 후 부과자료 삭제 시 삭제정보 실시간 제공(재 부과 연계시 부과연계관리키는 변경하여 제공)")
-    public ResponseEntity<RecvResponseDTO> levyCancel(@RequestBody String jParam) {
+    public ResponseEntity levyCancel(@RequestBody String jParam) {
         //저장
         RecvApiSpec recv = LevyCancel.builder()
                 .jpaRepository(recvLevyCancelRepository)
                 .jParam(jParam)
                 .build();
-        try {
+        Map<String, Object> resultInfo = this.execute(recv, jParam);
-            recv.execute();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
 
-        return new ResponseEntity<RecvResponseDTO>((RecvResponseDTO) recv.getResult(), HttpStatus.OK);
+        return new ResponseEntity(resultInfo, HttpStatus.OK);
     }
 
 
@@ -88,24 +85,20 @@ public class NtriRecvApi {
             @Content(mediaType = "application/json", examples = {
                     @ExampleObject(name = "Example..."
                             , summary = "수납정보 전송", description = "세외수입시스템 -> 개별시스템을 호출하여 데이터를 전송 한다."
-                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0003\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"sgbNm\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"dptNm\":null,\"spclFisBizCd\":null,\"spclFisBizNm\":null,\"fyr\":null,\"actSeCd\":null,\"actSeNm\":null,\"rprsTxmCd\":null,\"rprsTxmNm\":null,\"operItemCd\":null,\"operItemNm\":null,\"lvyNo\":null,\"itmNo\":null,\"epayNo\":null,\"rcvmtNo\":null,\"rcvmtSeCd\":null,\"rcvmtSeNm\":null,\"rcvmtYmd\":null,\"actYmd\":null,\"tsfYmd\":null,\"rcvmtPctAmt\":null,\"rcvmtAdtnAmt\":null,\"rcvmtIntrAmt\":null,\"bankNm\":null,\"rcvmtTyCd\":null,\"rcvmtTy\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}")
+                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0003\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"reqVo\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"sgbNm\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"dptNm\":null,\"spclFisBizCd\":null,\"spclFisBizNm\":null,\"fyr\":null,\"actSeCd\":null,\"actSeNm\":null,\"rprsTxmCd\":null,\"rprsTxmNm\":null,\"operItemCd\":null,\"operItemNm\":null,\"lvyNo\":null,\"itmNo\":null,\"epayNo\":null,\"rcvmtNo\":null,\"rcvmtSeCd\":null,\"rcvmtSeNm\":null,\"rcvmtYmd\":null,\"actYmd\":null,\"tsfYmd\":null,\"rcvmtPctAmt\":null,\"rcvmtAdtnAmt\":null,\"rcvmtIntrAmt\":null,\"bankNm\":null,\"rcvmtTyCd\":null,\"rcvmtTy\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}}")
             })
     })
     @PostMapping(value = "/recv/rciv/info", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "수납정보(실시간)", description = "세외수입시스템으로 부과자료 연계 후 수납처리 시 실시간 제공")
-    public ResponseEntity<RecvResponseDTO> rcivInfo(@RequestBody String jParam) {
+    public ResponseEntity rcivInfo(@RequestBody String jParam) {
         //저장
         RecvApiSpec recv = RcivInfo.builder()
                 .jpaRepository(recvRcivInfoRepository)
                 .jParam(jParam)
                 .build();
-        try {
+        Map<String, Object> resultInfo = this.execute(recv, jParam);
-            recv.execute();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
 
-        return new ResponseEntity<RecvResponseDTO>((RecvResponseDTO) recv.getResult(), HttpStatus.OK);
+        return new ResponseEntity(resultInfo, HttpStatus.OK);
     }
 
 
@@ -113,23 +106,53 @@ public class NtriRecvApi {
             @Content(mediaType = "application/json", examples = {
                     @ExampleObject(name = "Example..."
                             , summary = "감액정보 전송", description = "세외수입시스템 -> 개별시스템을 호출하여 데이터를 전송 한다."
-                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0004\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"sgbNm\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"dptNm\":null,\"spclFisBizCd\":null,\"spclFisBizNm\":null,\"fyr\":null,\"actSeCd\":null,\"actSeNm\":null,\"rprsTxmCd\":null,\"rprsTxmNm\":null,\"operItemCd\":null,\"operItemNm\":null,\"lvyNo\":null,\"itmNo\":null,\"rdcYmd\":null,\"rdcPctAmt\":null,\"rdcAdtnAmt\":null,\"rdcIntrAmt\":null,\"rdcAmt\":null,\"rdcRsnCn\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}")
+                            , value = "{\"header\":{\"ifDate\":\"20210412103022\",\"ifMsgKey\":\"Z211103155123435-e7def4c1652a478e9c77525ab5b3ebda\",\"ifId\":\"ERR_Z000001DCP_1741000NIS_0004\",\"source\":\"3820000DCP\",\"target\":\"1741000NIS\",\"ifType\":\"S\",\"ifFormat\":\"J\",\"retName\":\"\",\"retCode\":\"200\"},\"body\":{\"reqVo\":{\"registDt\":null,\"lastUpdtDt\":null,\"rspSgbCd\":null,\"rspLinkTrgtCd\":null,\"rspLinkMngKey\":null,\"rspLinkRstCd\":null,\"rspLinkRstMsg\":null,\"id\":null,\"sgbCd\":null,\"sgbNm\":null,\"linkMngKey\":null,\"taxnNo\":null,\"untyTaxnNo\":null,\"dptCd\":null,\"dptNm\":null,\"spclFisBizCd\":null,\"spclFisBizNm\":null,\"fyr\":null,\"actSeCd\":null,\"actSeNm\":null,\"rprsTxmCd\":null,\"rprsTxmNm\":null,\"operItemCd\":null,\"operItemNm\":null,\"lvyNo\":null,\"itmNo\":null,\"rdcYmd\":null,\"rdcPctAmt\":null,\"rdcAdtnAmt\":null,\"rdcIntrAmt\":null,\"rdcAmt\":null,\"rdcRsnCn\":null,\"rsveItem1\":null,\"rsveItem2\":null,\"rsveItem3\":null,\"rsveItem4\":null,\"rsveItem5\":null}}}")
             })
     })
     @PostMapping(value = "/recv/rdcamt/info", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "감액정보(실시간)", description = "세외수입시스템으로 부과자료 연계 후 감액자료 발생 시 실시간 제공")
-    public ResponseEntity<RecvResponseDTO> rdcamtInfo(@RequestBody String jParam) {
+    public ResponseEntity rdcamtInfo(@RequestBody String jParam) {
         //저장
         RecvApiSpec recv = RdcamtInfo.builder()
                 .jpaRepository(recvRdcamtInfoRepository)
                 .jParam(jParam)
                 .build();
+        Map<String, Object> resultInfo = this.execute(recv, jParam);
+
+        return new ResponseEntity(resultInfo, HttpStatus.OK);
+    }
+
+    private Map<String, Object> execute(RecvApiSpec recv, String jParam) {
+        Map<String, Object> resultInfo = null;
+        Map<String, Object> header = null;
+        Map<String, Object> body = null;
         try {
+            //parsing
+            resultInfo = (Map<String, Object>) mapper.readValue(jParam, Map.class);
+            header = (Map<String, Object>) resultInfo.get("header");
+            body = (Map<String, Object>) resultInfo.get("body");
+            //excute
             recv.execute();
+            //result SET
+            header.put("retCode", "200");
+            header.put("retName", "성공");
+            body.put("resVo", recv.getResult());
+            resultInfo.put("header", header);
+            resultInfo.put("body", body);
+        } catch (JsonProcessingException e) {
+            if (header != null) {
+                header.put("retCode", "500");
+                header.put("retName", "실패. 사유: Parameter Parsing Fail!! " + e.getMessage());
+                resultInfo.put("header", header);
+            }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            if (header != null) {
+                header.put("retCode", "500");
+                header.put("retName", "실패. 사유: " + e.getMessage());
+                resultInfo.put("header", header);
+            }
         }
 
-        return new ResponseEntity<RecvResponseDTO>((RecvResponseDTO) recv.getResult(), HttpStatus.OK);
+        return resultInfo;
     }
 }

src/main/java/cokr/xit/ntri/api/recv/service/impl/LevyCancel.java

@@ -19,7 +19,8 @@ public class LevyCancel extends RecvApiSupport<Map<String, String>, RecvLevyCanc
 
     @Override
     protected Map<String, String> parsing(String jParam) throws JsonProcessingException {
-        return (Map<String, String>) mapper.readValue(jParam, Map.class).get("body");
+        Map<String, Map<String, String>> body = (Map<String,Map<String, String>>) mapper.readValue(jParam, Map.class).get("body");
+        return body.get("reqVo");
     }
 
     @Override

src/main/java/cokr/xit/ntri/api/recv/service/impl/LevyResult.java

@@ -19,7 +19,8 @@ public class LevyResult extends RecvApiSupport<Map<String, String>, RecvLevyResu
 
     @Override
     protected Map<String, String> parsing(String jParam) throws JsonProcessingException {
-        return (Map<String, String>) mapper.readValue(jParam, Map.class).get("body");
+        Map<String, Map<String, String>> body = (Map<String,Map<String, String>>) mapper.readValue(jParam, Map.class).get("body");
+        return body.get("reqVo");
     }
 
     @Override

src/main/java/cokr/xit/ntri/api/recv/service/impl/RcivInfo.java

@@ -19,7 +19,8 @@ public class RcivInfo extends RecvApiSupport<Map<String, String>, RecvRcivInfo,
 
     @Override
     protected Map<String, String> parsing(String jParam) throws JsonProcessingException {
-        return (Map<String, String>) mapper.readValue(jParam, Map.class).get("body");
+        Map<String, Map<String, String>> body = (Map<String,Map<String, String>>) mapper.readValue(jParam, Map.class).get("body");
+        return body.get("reqVo");
     }
 
     @Override

src/main/java/cokr/xit/ntri/api/recv/service/impl/RdcamtInfo.java

@@ -19,7 +19,8 @@ public class RdcamtInfo extends RecvApiSupport<Map<String, String>, RecvRdcamtIn
 
     @Override
     protected Map<String, String> parsing(String jParam) throws JsonProcessingException {
-        return (Map<String, String>) mapper.readValue(jParam, Map.class).get("body");
+        Map<String, Map<String, String>> body = (Map<String,Map<String, String>>) mapper.readValue(jParam, Map.class).get("body");
+        return body.get("reqVo");
     }
 
     @Override