mstIdList, final String stsErrMsg) {
for (String id : mstIdList) {
- final SndngMssageParam paramDTO = SndngMssageParam.builder()
+ final SndngMssageParam dto = SndngMssageParam.builder()
.unitySndngMastrId(id)
- .newSndngProcessSttus(MappingSndngProcessStatus.fromEns(SndngProcessStatus.ACCEPT_FAIL.getCode()))
.errorMssage(stsErrMsg)
.build();
- if (mapper.updateProcessSttusCntcSndngMst(paramDTO) != 1) {
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, SndngProcessStatus.ACCEPT_FAIL.getCode());
+ if (mapper.updateProcessSttusCntcSndngMst(dto) != 1) {
throw BizRuntimeException.create("[accept]연계 발송 마스터 상태변경 실패");
}
}
diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchCloseService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchCloseService.java
index 4b599f0..17ad44c 100644
--- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchCloseService.java
+++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchCloseService.java
@@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import kr.xit.biz.common.ApiConstants;
+import kr.xit.biz.ens.cmm.CmmEnsBizUtils;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
@@ -55,10 +56,10 @@ public class EnsBatchCloseService extends AbstractService implements IEnsBatchCl
final SndngMssageParam paramDTO = SndngMssageParam.builder()
.unitySndngMastrId(id)
.sndngProcessSttus(reqDTO.getSndngProcessSttus())
- .newSndngProcessSttus(ApiConstants.SndngProcessStatus.CLOSE.getCode())
.build();
- if(IS_CCN) paramDTO.setNewSndngProcessSttus(ApiConstants.MappingSndngProcessStatus.fromEns(paramDTO.getNewSndngProcessSttus()));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, paramDTO, ApiConstants.SndngProcessStatus.CLOSE.getCode());
+
if (mapper.updateProcessSttusCntcSndngMst(paramDTO) != 1) {
throw BizRuntimeException.create("[close]연계 발송 마스터 상태변경 실패");
}
diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java
index cc6c04e..fcd7e4a 100644
--- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java
+++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java
@@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.Transactional;
import kr.xit.batch.ens.task.cmm.TaskCmmUtils;
import kr.xit.biz.common.ApiConstants;
-import kr.xit.biz.common.ApiConstants.MappingSndngProcessStatus;
import kr.xit.biz.common.ApiConstants.SndngSeCode;
+import kr.xit.biz.ens.cmm.CmmEnsBizUtils;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
@@ -234,17 +234,17 @@ public class EnsBatchExtractService extends AbstractService implements
final String status = dto.getNewSndngProcessSttus();
if ("SndngAcceptJob".equals(dto.getErrorCode())) {
- if(IS_CCN) dto.setNewSndngProcessSttus(MappingSndngProcessStatus.fromEns(status));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, status);
mapper.updateProcessSttusCntcSndngMst(dto);
} else if ("SndngMakeJob".equals(dto.getErrorCode())) {
- if(IS_CCN) dto.setNewSndngProcessSttus(MappingSndngProcessStatus.fromEns(status));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, status);
mapper.updateProcessSttusCntcSndngMst(dto);
dto.setNewSndngProcessSttus(status);
mapper.updateProcessSttusUnitySndngMst(dto);
} else if ("SndngSendBulksJob".equals(dto.getErrorCode())) {
- if(IS_CCN) dto.setNewSndngProcessSttus(MappingSndngProcessStatus.fromEns(status));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, status);
mapper.updateProcessSttusCntcSndngMst(dto);
dto.setNewSndngProcessSttus(status);
mapper.updateProcessSttusUnitySndngMst(dto);
@@ -278,7 +278,7 @@ public class EnsBatchExtractService extends AbstractService implements
private void updateMstTable(SndngMssageParam paramDTO, SndngSeCode seCode) {
final String status = paramDTO.getNewSndngProcessSttus();
- if(IS_CCN) paramDTO.setNewSndngProcessSttus(MappingSndngProcessStatus.fromEns(status));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, paramDTO, status);
if(mapper.updateProcessSttusCntcSndngMst(paramDTO) != 1) {
throw BizRuntimeException.create(String.format("[send-%s]연계 발송 마스터 상태변경 실패", seCode.getCode()));
}
diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java
index c6225f0..15cfa17 100644
--- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java
+++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java
@@ -114,7 +114,7 @@ public class EnsBatchMakeService extends AbstractService implements IEnsBatchMak
}
//없으면 연계 발송 마스터, 통합 발송 마스터 send-ok
if (sendCnt == 0) {
- if(IS_CCN) dto.setNewSndngProcessSttus(ApiConstants.MappingSndngProcessStatus.fromEns(dto.getNewSndngProcessSttus()));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, dto.getNewSndngProcessSttus());
if (mapper.updateProcessSttusCntcSndngMst(dto) != 1) {
throw BizRuntimeException.create("[make]연계 발송 마스터 상태변경 실패");
}
@@ -168,7 +168,7 @@ public class EnsBatchMakeService extends AbstractService implements IEnsBatchMak
}
// 3. status
- if(IS_CCN) dto.setNewSndngProcessSttus(ApiConstants.MappingSndngProcessStatus.fromEns(dto.getNewSndngProcessSttus()));
+ CmmEnsBizUtils.setMappingProcessStatus(IS_CCN, dto, dto.getNewSndngProcessSttus());
if (mapper.updateProcessSttusCntcSndngMst(dto) != 1) {
throw BizRuntimeException.create("[make]데이타 생성(발송마스터 상태변경) 실패");
}
@@ -212,7 +212,10 @@ public class EnsBatchMakeService extends AbstractService implements IEnsBatchMak
dto.setUrl(CHUNCHEON_CALLBACK_URL);
}
// FIXME: KT callback url 확인 적용
- if(SignguCode.FUNERAL.getCode().equals(dto.getSignguCode())){
+ if(SignguCode.CHEONAN_ES.getCode().equals(dto.getSignguCode())){
+ dto.setUrl(ME_CALLBACK_URL);
+ }
+ if(SignguCode.CHEONAN_WN.getCode().equals(dto.getSignguCode())){
dto.setUrl(ME_CALLBACK_URL);
}
mapper.insertKtBcMastr(dto);
@@ -226,7 +229,10 @@ public class EnsBatchMakeService extends AbstractService implements IEnsBatchMak
dto.setUrl(CHUNCHEON_CALLBACK_URL);
}
// FIXME: KT callback url 확인 적용
- if(SignguCode.FUNERAL.getCode().equals(dto.getSignguCode())){
+ if(SignguCode.CHEONAN_ES.getCode().equals(dto.getSignguCode())){
+ dto.setUrl(ME_CALLBACK_URL);
+ }
+ if(SignguCode.CHEONAN_WN.getCode().equals(dto.getSignguCode())){
dto.setUrl(ME_CALLBACK_URL);
}
//mapper.insertKtBcMastr(dto);
diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java b/mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java
index 108d95b..4ef4b45 100644
--- a/mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java
+++ b/mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java
@@ -42,57 +42,89 @@ public class EnsBatchController {
private final IEnsBatchStatusService statusService;
private final IEnsBatchCloseService closeService;
- @Operation(summary = "통합문서 접수", description = "통합문서 접수")
+ private static final String CAN_1 = """
+ {
+ "signguCode": "44131",
+ "ffnlgCode": "11",
+ "profile": "local"
+ }
+ """;
+ private static final String CAN_2 = """
+ {
+ "signguCode": "44133",
+ "ffnlgCode": "11",
+ "profile": "local"
+ }
+ """;
+
+ private static final String CCN = """
+ {
+ "signguCode": "41220",
+ "ffnlgCode": "11",
+ "profile": "local"
+ }
+ """;
+
@io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
- @Content(mediaType = "application/json", examples = {
- @ExampleObject(value = """
- {
- "signguCode": "51110",
- "ffnlgCode": "11",
- "sndngProcessSttus": "accept"
- }
- """
- )
+ @Content(
+ mediaType = "application/json",
+ examples = {
+ @ExampleObject(
+ name = "춘천",
+ value = CCN),
+ @ExampleObject(
+ name = "천안시 동남구청",
+ value = CAN_1),
+ @ExampleObject(
+ name = "천안시 서북구청",
+ value = CAN_2)
})
})
+ @Operation(summary = "통합문서 접수", description = "통합문서 접수")
@PostMapping(value = "/accept", produces = MediaType.APPLICATION_JSON_VALUE)
public IApiResponse accept(@RequestBody final EnsDTO.BatchEnsRequest reqDTO) {
acceptService.accept(reqDTO);
return ApiResponseDTO.success();
}
- @Operation(summary = "통합문서 발송 데이타 종료", description = "통합문서 발송 데이타 종료")
@io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
- @Content(mediaType = "application/json", examples = {
- @ExampleObject(value = """
- {
- "signguCode": "51110",
- "ffnlgCode": "11",
- "sndngProcessSttus": "send-ok"
- }
- """
- )
+ @Content(
+ mediaType = "application/json",
+ examples = {
+ @ExampleObject(
+ name = "춘천",
+ value = CCN),
+ @ExampleObject(
+ name = "천안시 동남구청",
+ value = CAN_1),
+ @ExampleObject(
+ name = "천안시 서북구청",
+ value = CAN_2)
})
})
+ @Operation(summary = "통합문서 발송 데이타 종료", description = "통합문서 발송 데이타 종료")
@PostMapping(value = "/close", produces = MediaType.APPLICATION_JSON_VALUE)
public IApiResponse close(@RequestBody final EnsDTO.BatchEnsRequest reqDTO){
closeService.close(reqDTO);
return ApiResponseDTO.success();
}
- @Operation(summary = "통합문서(bulk) 상태 조회", description = "통합문서 상태 조회")
@io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = {
- @Content(mediaType = "application/json", examples = {
- @ExampleObject(value = """
- {
- "signguCode": "51110",
- "ffnlgCode": "11",
- "sndngProcessSttus": "send-ok"
- }
- """
- )
- })
+ @Content(
+ mediaType = "application/json",
+ examples = {
+ @ExampleObject(
+ name = "춘천",
+ value = CCN),
+ @ExampleObject(
+ name = "천안시 동남구청",
+ value = CAN_1),
+ @ExampleObject(
+ name = "천안시 서북구청",
+ value = CAN_2)
+ })
})
+ @Operation(summary = "통합문서(bulk) 상태 조회", description = "통합문서 상태 조회")
@PostMapping(value = "/statusBulks", produces = MediaType.APPLICATION_JSON_VALUE)
public IApiResponse statusBulks(@RequestBody final EnsDTO.BatchEnsRequest reqDTO){
statusService.statusBulks(reqDTO);
diff --git a/mens-core/src/main/java/kr/xit/biz/common/ApiConstants.java b/mens-core/src/main/java/kr/xit/biz/common/ApiConstants.java
index 5b99de1..6cbe955 100644
--- a/mens-core/src/main/java/kr/xit/biz/common/ApiConstants.java
+++ b/mens-core/src/main/java/kr/xit/biz/common/ApiConstants.java
@@ -216,9 +216,13 @@ public class ApiConstants {
*/
CHUNCHEON("51110"),
/**
- * 승화원 : NICE CI는 교통시설운영처와 동일한 코드 사용
+ * 천안동남구청
*/
- FUNERAL("88316"),
+ CHEONAN_ES("44131"),
+ /**
+ * 천안서북
+ */
+ CHEONAN_WN("44133"),
;
private final String code;
@@ -247,13 +251,13 @@ public class ApiConstants {
/**
*
- * 발송처리상태 : ENS003 매핑
+ * 춘천의 발송처리상태 : ENS003 매핑
* 01: 요청, 11: 접수완료, 19: 접수실패
* 22: 제작완료, 29: 제작실패, 08: 발송완료, 09: 마감, 99: 발송실패
*
*/
@Getter
- public enum MappingSndngProcessStatus {
+ public enum MappingCcnSndngProcessStatus {
ACCEPT("accept", "01"),
ACCEPT_OK("accept-ok", "11"),
ACCEPT_FAIL("accept-fail", "19"),
@@ -274,7 +278,7 @@ public class ApiConstants {
private final String ensCode;
private final String trfCode;
- MappingSndngProcessStatus(String ensCode, String trfCode) {
+ MappingCcnSndngProcessStatus(String ensCode, String trfCode) {
this.ensCode = ensCode;
this.trfCode = trfCode;
}
@@ -287,10 +291,10 @@ public class ApiConstants {
*
*/
public static String fromTraffic(final String trfCode){
- return Arrays.stream(MappingSndngProcessStatus.values())
+ return Arrays.stream(MappingCcnSndngProcessStatus.values())
.filter(en -> en.getTrfCode().equals(trfCode))
.findFirst()
- .map(MappingSndngProcessStatus::getEnsCode)
+ .map(MappingCcnSndngProcessStatus::getEnsCode)
.orElseThrow(() -> BizRuntimeException.create(String.format("미정의된 상태코드가[%s]", trfCode)));
}
@@ -302,12 +306,76 @@ public class ApiConstants {
*
*/
public static String fromEns(final String ensCode){
- return Arrays.stream(MappingSndngProcessStatus.values())
+ return Arrays.stream(MappingCcnSndngProcessStatus.values())
.filter(en -> en.getEnsCode().equals(ensCode))
.findFirst()
- .map(MappingSndngProcessStatus::getTrfCode)
+ .map(MappingCcnSndngProcessStatus::getTrfCode)
.orElseThrow(() -> BizRuntimeException.create(String.format("미정의된 상태코드가[%s]", ensCode)));
}
}
+ /**
+ *
+ * 천안의 발송처리상태 : ENS003 매핑
+ * 01: 요청, 11: 접수완료, 19: 접수실패
+ * 22: 제작완료, 29: 제작실패, 08: 발송완료, 09: 마감, 99: 발송실패
+ *
+ */
+ @Getter
+ public enum MappingCanSndngProcessStatus {
+ ACCEPT("accept", "accept"),
+ ACCEPT_OK("accept-ok", "acptok"),
+ ACCEPT_FAIL("accept-fail", "acptfail"),
+ MAKE_OK("make-ok", "ensmake"),
+ MAKE_FAIL1("make-fail1", "makefail"),
+ MAKE_FAIL2("make-fail2", "makefail"),
+ MAKE_FAIL3("make-fail3", "makefail"),
+ SENDING1("sending1", "ensok"),
+ SENDING2("sending2", "ensok"),
+ SEND_OK("send-ok", "ensopen"),
+ SEND_FAIL1("send-fail1", "ensfail"),
+ SEND_FAIL2("send-fail2", "ensfail"),
+ SEND_FAIL3("send-fail3", "ensfail"),
+ CLOSE("close", "ensclose")
+
+ ;
+
+ private final String ensCode;
+ private final String trfCode;
+
+ MappingCanSndngProcessStatus(String ensCode, String trfCode) {
+ this.ensCode = ensCode;
+ this.trfCode = trfCode;
+ }
+
+ /**
+ *
+ * traffic 상태코드를 ens 상태코드로 매핑
+ * @param trfCode
+ * @return traffic 상태코드에 매핑된 ens 상태코드
+ *
+ */
+ public static String fromTraffic(final String trfCode){
+ return Arrays.stream(MappingCcnSndngProcessStatus.values())
+ .filter(en -> en.getTrfCode().equals(trfCode))
+ .findFirst()
+ .map(MappingCcnSndngProcessStatus::getEnsCode)
+ .orElseThrow(() -> BizRuntimeException.create(String.format("미정의된 상태코드가[%s]", trfCode)));
+ }
+
+ /**
+ *
+ * ens 상태코드를 traffic 상태코드로 매핑
+ * @param ensCode
+ * @return ens 상태코드에 매핑된 traffic 상태코드
+ *
+ */
+ public static String fromEns(final String ensCode){
+ return Arrays.stream(MappingCcnSndngProcessStatus.values())
+ .filter(en -> en.getEnsCode().equals(ensCode))
+ .findFirst()
+ .map(MappingCcnSndngProcessStatus::getTrfCode)
+ .orElseThrow(() -> BizRuntimeException.create(String.format("미정의된 상태코드가[%s]", ensCode)));
+ }
+ }
}