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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
kjh 1 month ago
parent e96092c0ec baf910a449
commit 7812b7161a
3 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File

6
cron/cron.txt
Unescape Escape View File

@ -5,6 +5,9 @@
## 업무 테이블 자료 접수
*/2 * * * * curl -X POST https://phts-manager.koti.re.kr/iup/signtalk/accept/all
## FIXME: 업무 테이블 자료 접수 - NICE CI 추가
*/2 * * * * curl -X POST https://phts-manager.koti.re.kr/nice/talk/accept/all
## 업무 테이블 전송 결과 반영
7 7-23 * * * curl -X POST https://phts-manager.koti.re.kr/iup/signtalk/fetch/all
@ -26,6 +29,9 @@
*/1 9-18 * * * curl -X POST https://phts-manager.koti.re.kr/nv/signtalk/send/bulk/all
*/30 9-21 * * * curl -X POST https://phts-manager.koti.re.kr/nv/signtalk/stat/bulk/all
# FIXME: NICE CI 인증톡 추가
*/1 9-18 * * * curl -X POST https://phts-manager.koti.re.kr/nice/talk/send/bulk/all
*/30 9-21 * * * curl -X POST https://phts-manager.koti.re.kr/nice/talk/stat/bulk/all
#---------------------------------------------#
# [ENS] 로그 데이터 삭제 스케줄러

11
src/main/java/cokr/xit/ens/modules/nice/presentation/NiceCiController.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cokr.xit.ens.modules.nice.presentation;
import org.springframework.http.*;
import org.springframework.web.bind.annotation.*;
import cokr.xit.ens.modules.nice.model.*;
import cokr.xit.ens.modules.nice.service.*;
import io.swagger.v3.oas.annotations.*;
import io.swagger.v3.oas.annotations.tags.*;
@ -32,19 +31,19 @@ public class NiceCiController {
private final NiceCiAcceptService niceCiAcceptService;
@Operation(summary = "접수")
@PostMapping(value = "/accept", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> accept(final NiceCiDTO.NiceCiParam niceCiParam) {
return new ResponseEntity<>(niceCiAcceptService.accept(niceCiParam), HttpStatus.OK);
@PostMapping(value = "/accept/all", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> accept() {
return new ResponseEntity<>(niceCiAcceptService.accept(), HttpStatus.OK);
}
@Operation(summary = "(대량)전송요청")
@PostMapping(value = "/send/bulk", produces = MediaType.APPLICATION_JSON_VALUE)
@PostMapping(value = "/send/bulk/all", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> sendBulk() {
return new ResponseEntity<>(niceCiService.requestSendBulk(), HttpStatus.OK);
}
@Operation(summary = "(대량)상태조회")
@PostMapping(value = "/status/bulk", produces = MediaType.APPLICATION_JSON_VALUE)
@PostMapping(value = "/stat/bulk/all", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> findBulkStatus() {
return new ResponseEntity<>(niceCiService.findBulkStatus(), HttpStatus.OK);
}

49
src/main/java/cokr/xit/ens/modules/nice/service/NiceCiAcceptService.java
Unescape Escape View File

@ -8,6 +8,7 @@ import org.springframework.stereotype.*;
import org.springframework.transaction.annotation.*;
import com.google.gson.*;
import com.google.gson.reflect.*;
import cokr.xit.ens.biz.iup.code.*;
import cokr.xit.ens.core.aop.*;
@ -15,10 +16,10 @@ import cokr.xit.ens.core.exception.*;
import cokr.xit.ens.core.exception.code.*;
import cokr.xit.ens.core.utils.*;
import cokr.xit.ens.modules.common.code.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.kko.model.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.kko.api.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.kko.service.process.model.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.support.api.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.support.code.*;
import cokr.xit.ens.modules.common.ctgy.intgrnbill.support.model.*;
import cokr.xit.ens.modules.common.ctgy.sys.mng.domain.*;
import cokr.xit.ens.modules.common.ctgy.sys.mng.service.*;
import cokr.xit.ens.modules.nice.mapper.*;
@ -55,11 +56,9 @@ public class NiceCiAcceptService {
private final KeySequenceService keySequenceService;
private final NiceCiBillHistoryService billHistoryService;
private final INiceCiMapper niceCiMapper;
private final PayUseSysApi payUseSysApi;
private final BillKkoPayApiSpec billKkoPayApi;
private Gson gson = new GsonBuilder().disableHtmlEscaping().create();
@ -83,9 +82,11 @@ public class NiceCiAcceptService {
* </pre>
*/
@Transactional(propagation = Propagation.REQUIRES_NEW)
public EnsResponseVO<?> accept(final NiceCiDTO.NiceCiParam niceCiParam){
niceCiParam.setSendType(IupSendTypeCd.NI.getCode());
niceCiParam.setPrcsCd(IupPrcsCd.TGRG.getCode());
public EnsResponseVO<?> accept(){
final NiceCiDTO.NiceCiParam niceCiParam = NiceCiDTO.NiceCiParam.builder()
.sendType(IupSendTypeCd.NI.getCode())
.prcsCd(IupPrcsCd.TGRG.getCode())
.build();
final List<NiceCiDTO.InputXit> list = niceCiMapper.selectNiceCiAcceptTgts(niceCiParam);
if(list.isEmpty()){
@ -119,8 +120,9 @@ public class NiceCiAcceptService {
try {
List<NiceCiDTO.InputDataXit> inputDataXits = xit.getInputDataXits();
for (NiceCiDTO.InputDataXit data : inputDataXits) {
BillKkoApiRespDTO<?> respDTO = getPayUrl(data, billHistDTO, orgMng, kkoPayUrlRespData);
PayApiRespDTO<Map<String, Object>> respDTO = getPayUrl(data, billHistDTO, orgMng, kkoPayUrlRespData);
// FIXME: API 호출 결과 SET - 연계 설정후 확인 필요
data.setPayUrl(String.valueOf(respDTO.getData()));
niceCiMapper.updatePayUrlOfDataInput(data);
@ -190,7 +192,7 @@ public class NiceCiAcceptService {
* @param kkoPayUrlRespData KkoPayUrlRespData
* @return KkoPayUrlRespData
*/
private BillKkoApiRespDTO<?> getPayUrl(final NiceCiDTO.InputDataXit dataXit, NiceCiDTO.BillHistDTO billHistDTO, final OrgMng orgMng, final KkoPayUrlRespData kkoPayUrlRespData){
private PayApiRespDTO<Map<String, Object>> getPayUrl(final NiceCiDTO.InputDataXit dataXit, NiceCiDTO.BillHistDTO billHistDTO, final OrgMng orgMng, final KkoPayUrlRespData kkoPayUrlRespData){
// FIXME: 파라메터 확인 필요
Map<String, Object> map = new HashMap<>();
map.put("biller_user_key", dataXit.getDataId());
@ -207,22 +209,25 @@ public class NiceCiAcceptService {
.build();
billHistoryService.insertBillHistory(billHistDTO);
ResponseEntity<String> resEntity = payUseSysApi.payUrl(orgMng.getKkoBpUrlApi(), param,
null);
ResponseEntity<String> resEntity = billKkoPayApi.url(orgMng.getKkoBpBillerCode(), orgMng.getKkoBpAuthorization(),
gson.toJson(param));
// 마스터 상태 실패처리
String rsltStr = resEntity.getBody();
if(resEntity.getStatusCode() != HttpStatus.OK){
billHistDTO.setErrorCode(resEntity.getStatusCode().toString());
//billHistDTO.setErrorCode(EnsErrCd.API_COMM_ERROR.getCode());
billHistDTO.setErrorMessage(resEntity.getBody());
billHistDTO.setErrorCode(EnsErrCd.API_COMM_ERROR.getCode());
billHistDTO.setErrorMessage("["+ BillLogSeCd.VD +"] " + EnsErrCd.API_COMM_ERROR.getCodeNm() + " " + resEntity.getStatusCode().toString());
billHistoryService.updateBillHistory(billHistDTO);
throw new EnsException(EnsErrCd.API_COMM_ERROR, EnsErrCd.API_COMM_ERROR.getCodeNm());
}
String rsltStr = resEntity.getBody();
return BillKkoApiRespDTO.okBuilder()
.data(resEntity.getBody())
.build();
throw new EnsException(EnsErrCd.API_COMM_ERROR, "["+ BillLogSeCd.VD +"] " + EnsErrCd.API_COMM_ERROR.getCodeNm() + " " + resEntity.getStatusCode().toString(), rsltStr);
}
try {
return gson.fromJson(rsltStr, new TypeToken<PayApiRespDTO<Map<String, Object>>>() {}.getType());
} catch (Exception ex) {
billHistDTO.setErrorCode(EnsErrCd.INVALID_RESPONSE.getCode());
billHistDTO.setErrorMessage("["+ BillLogSeCd.VD +"] " + EnsErrCd.INVALID_RESPONSE.getCodeNm());
billHistoryService.updateBillHistory(billHistDTO);
throw new EnsException(EnsErrCd.INVALID_RESPONSE, "["+ BillLogSeCd.VD +"] " + EnsErrCd.INVALID_RESPONSE.getCodeNm(), ex);
}
}
}

Write Preview
Loading…
Cancel
Save