Merge remote-tracking branch 'origin/main'

dev
kjh 1 year ago
commit df651ce0c8

@ -1,7 +1,7 @@
package kr.xit.ens.pplus.mapper;
import java.util.List;
import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.pplus.PplusDTO.BatchAcceptRequest;
/**
@ -20,5 +20,5 @@ import kr.xit.biz.ens.model.pplus.PplusDTO.BatchAcceptRequest;
* </pre>
*/
public interface IPplusMapper {
List<BatchAcceptRequest> selectPostPlusSendTgts(final CmmEnsRequestDTO dto);
List<BatchAcceptRequest> selectPostPlusSendTgts(final SndngMssageParam dto);
}

@ -1,6 +1,6 @@
package kr.xit.ens.pplus.service;
import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpCommonResponse;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpStatusRequest;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpStatusResponse;
@ -21,6 +21,6 @@ import kr.xit.biz.ens.model.pplus.PplusDTO.PpStatusResponse;
* </pre>
*/
public interface IPplusService {
PpCommonResponse sendBulks(final CmmEnsRequestDTO reqDTO);
PpCommonResponse sendBulks(final SndngMssageParam reqDTO);
PpStatusResponse statusBulks(final PpStatusRequest reqDTO);
}

@ -5,8 +5,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO;
import kr.xit.biz.ens.model.cmm.CmmEnsRlaybsnmDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.pplus.PplusDTO.BatchAcceptRequest;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpAcceptReqDataDtl;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpAcceptReqDataMst;
@ -72,7 +72,7 @@ public class PplusService extends EgovAbstractServiceImpl implements IPplusServi
@Override
@TraceLogging
public PpCommonResponse sendBulks(final CmmEnsRequestDTO reqDTO) {
public PpCommonResponse sendBulks(final SndngMssageParam reqDTO) {
final List<BatchAcceptRequest> tgtList = mapper.selectPostPlusSendTgts(reqDTO);

@ -2,8 +2,7 @@ package kr.xit.ens.pplus.web;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpAcceptRequest;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.pplus.PplusDTO.PpStatusRequest;
import kr.xit.core.model.ApiResponseDTO;
import kr.xit.core.model.IApiResponse;
@ -64,7 +63,7 @@ public class PplusController {
@Operation(summary = "우편제작접수", description = "우편제작접수 요청<br><a href='/pstFile.html'>우편제작접수</a>")
@PostMapping(value = "/accept", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
//@PostMapping(value = "/accept", produces = MediaType.APPLICATION_JSON_VALUE)
public IApiResponse send(@ModelAttribute final CmmEnsRequestDTO paramDTO) {
public IApiResponse send(@ModelAttribute final SndngMssageParam paramDTO) {
return ApiResponseDTO.success(service.sendBulks(paramDTO));
}

@ -3,7 +3,7 @@ package kr.xit.batch.ens.task.cmm;
import static egovframework.com.cmm.util.EgovStringUtil.cutString;
import kr.xit.biz.common.ApiConstants;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.core.biz.batch.model.BatchCmmDTO.BatchLock;
import kr.xit.core.spring.util.BatchSpringUtils;
import lombok.AccessLevel;
@ -70,7 +70,7 @@ public class TaskCmmUtils {
sndngProcessSttus = MDC.get("sndngProcessSttus");
}
BatchSpringUtils.getEnsBatchExtractService().updateErrorLog(
EnsDTO.SndngMssageParam.builder()
SndngMssageParam.builder()
.unitySndngMastrId(unitySndngMastrId)
.sndngMastrId(sndngMastrId)
.newSndngProcessSttus(sndngProcessSttus)

@ -3,8 +3,8 @@ package kr.xit.biz.ens.mapper;
import java.util.List;
import java.util.Optional;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.EnsKtBcDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.cntc.CntcDTO;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkStatus;
import kr.xit.biz.ens.model.kakao.KkopayDocDTO.OneTimeToken;
@ -40,7 +40,7 @@ public interface IEnsBatchMapper {
* @return List<EnsDTO.SndngMssageParam>
* </pre>
*/
<T> List<EnsDTO.SndngMssageParam> selectAcceptTgts(final T t);
<T> List<SndngMssageParam> selectAcceptTgts(final T t);
/**
* <pre>
*
@ -95,7 +95,7 @@ public interface IEnsBatchMapper {
* @return List<EnsDTO.SndngMssageParam>
* </pre>
*/
<T> List<EnsDTO.SndngMssageParam> selectMakeTgts(final T t);
<T> List<SndngMssageParam> selectMakeTgts(final T t);
/**
* <pre>
@ -244,7 +244,7 @@ public interface IEnsBatchMapper {
* @return List<EnsDTO.SndngMssageParam>
* </pre>
*/
<T> List<EnsDTO.SndngMssageParam> selectSendBulkTgts(final T t);
<T> List<SndngMssageParam> selectSendBulkTgts(final T t);
/**
* <pre>
@ -285,7 +285,7 @@ public interface IEnsBatchMapper {
* @return EnsDTO.SndngMssageParam
* </pre>
*/
<T> Optional<EnsDTO.SndngMssageParam> selectSndProcessStatus(final T t);
<T> Optional<SndngMssageParam> selectSndProcessStatus(final T t);
/**
* <pre>
@ -328,7 +328,7 @@ public interface IEnsBatchMapper {
* @return List<EnsDTO.SndngMssageParam>
* </pre>
*/
<T> List<EnsDTO.SndngMssageParam> selectStatusBulkTgts(final T t);
<T> List<SndngMssageParam> selectStatusBulkTgts(final T t);
/**
* <pre>
@ -338,7 +338,7 @@ public interface IEnsBatchMapper {
* @return List<String>
* </pre>
*/
List<String> selectKakaoStatusTgts(final EnsDTO.BatchEnsRequest dto);
List<String> selectKakaoStatusTgts(final SndngMssageParam dto);
/**
* <pre>
@ -371,8 +371,8 @@ public interface IEnsBatchMapper {
/**
* -
* - tb_cntc_sndng_result, tb_ens_kakao_my_doc
* @param dto
* @return
* @param dto SndngResult
* @return int
*/
int updateCntcSndngResultByKkoMyDoc(final CntcDTO.SndngResult dto);

@ -50,69 +50,6 @@ public class EnsDTO {
private String sndngProcessSttus;
}
@Data
@NoArgsConstructor
@AllArgsConstructor
@SuperBuilder
public static class SndngMssageParam extends BatchEnsRequest {
private String signguCode;
private String ffnlgCode;
private String profile;
/**
* id
*/
private String unitySndngMastrId;
/**
* id
*/
private String unitySndngDetailId;
/**
* id
*/
private String sndngMastrId;
/**
* ID
*/
private String sndngDetailId;
/**
* 릿ID
*/
private String tmplatId;
/**
*
*/
private int sndngCo;
/**
*
*/
private String newSndngProcessSttus;
private String try1;
private String try2;
private String try3;
private int tryCnt;
private int trySeq;
private String sndngSeCode;
private String sndngDt;
private String sndngDt2;
private String sndngDt3;
private String try2Minute;
private String try3Minute;
private String errorMssage;
private String errorCode;
private String resultCd;
private String resultDt;
private String url;
}
@Data
@NoArgsConstructor
@AllArgsConstructor

@ -13,7 +13,7 @@ import kr.xit.biz.common.ApiConstants;
import kr.xit.biz.common.ApiConstants.SndngSeCode;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.core.exception.BizRuntimeException;
import kr.xit.core.support.utils.Checks;
import kr.xit.core.support.utils.DateUtils;

@ -4,7 +4,7 @@ import java.util.List;
import kr.xit.biz.common.ApiConstants;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.core.exception.BizRuntimeException;
import lombok.RequiredArgsConstructor;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;

@ -10,7 +10,7 @@ import kr.xit.biz.common.ApiConstants;
import kr.xit.biz.common.ApiConstants.SndngSeCode;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.cntc.CntcDTO;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkSendResponses;
import kr.xit.biz.sms.service.ISmsMessageService;
@ -101,7 +101,7 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
*/
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void sendEgreen(final EnsDTO.SndngMssageParam dto) {
public void sendEgreen(final SndngMssageParam dto) {
final List<EnsDTO.PostSndng> list = mapper.selectPostTgts(dto);
final String filePath = fileRoot + filePost;
final String fileName = list.get(0).getConKey() + ".txt";
@ -110,7 +110,7 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
throw BizRuntimeException.create("우편 파일 생성 실패");
}
EnsDTO.SndngMssageParam paramDTO = EnsDTO.SndngMssageParam.builder()
SndngMssageParam paramDTO = SndngMssageParam.builder()
.unitySndngMastrId(list.get(0).getUnitySndngMastrId())
.sndngMastrId(list.get(0).getSndngMastrId())
.newSndngProcessSttus(list.get(0).getSndngProcessSttus())
@ -126,13 +126,13 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
*/
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void sendSms(final EnsDTO.SndngMssageParam dto) {
public void sendSms(final SndngMssageParam dto) {
final List<EnsDTO.SmsSndng> list = mapper.selectSmsSendTgts(dto);
// Orcale DB - 서비스 분리
smsService.sendSmsList(list);
EnsDTO.SndngMssageParam paramDTO = EnsDTO.SndngMssageParam.builder()
SndngMssageParam paramDTO = SndngMssageParam.builder()
.unitySndngMastrId(list.get(0).getUnitySndngMastrId())
.sndngMastrId(list.get(0).getSndngMastrId())
.newSndngProcessSttus(list.get(0).getSndngProcessSttus())
@ -158,7 +158,7 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
public void updateSndngMstFailStatus(final String mstId, final SndngSeCode seCode, final String stsErrMsg) {
// FIXME :: stsErrMsg 메세지 확인 필
EnsDTO.SndngMssageParam dto = mapper.selectSndProcessStatus(mstId)
SndngMssageParam dto = mapper.selectSndProcessStatus(mstId)
.orElseThrow(() -> BizRuntimeException.create(stsErrMsg));
String newSndngProcessSttus;
@ -170,7 +170,7 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
newSndngProcessSttus = "send-fail1";
}
EnsDTO.SndngMssageParam paramDTO = EnsDTO.SndngMssageParam.builder()
SndngMssageParam paramDTO = SndngMssageParam.builder()
.unitySndngMastrId(dto.getUnitySndngMastrId())
.sndngMastrId(dto.getSndngMastrId())
.newSndngProcessSttus(newSndngProcessSttus)
@ -196,9 +196,9 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
public void updateSendSndngMstStatus(final String mstId,
final String unitySndMstId, final SndngSeCode seCode, final String stsErrMsg) {
EnsDTO.SndngMssageParam dto = mapper.selectSndProcessStatus(mstId)
SndngMssageParam dto = mapper.selectSndProcessStatus(mstId)
.orElseThrow(() -> BizRuntimeException.create(stsErrMsg));
EnsDTO.SndngMssageParam paramDTO = EnsDTO.SndngMssageParam.builder()
SndngMssageParam paramDTO = SndngMssageParam.builder()
.sndngMastrId(mstId)
.unitySndngMastrId(unitySndMstId)
.newSndngProcessSttus(dto.getNewSndngProcessSttus())
@ -214,7 +214,7 @@ public class EnsBatchExtractService extends EgovAbstractServiceImpl implements
* @see TaskCmmUtils#taskEnsBatchServiceUpdateErrorLog
*/
@Transactional
public void updateErrorLog(final EnsDTO.SndngMssageParam dto) {
public void updateErrorLog(final SndngMssageParam dto) {
if ("SndngAcceptJob".equals(dto.getErrorCode())) {
mapper.updateProcessSttusCntcSndngMst(dto);
} else if ("SndngMakeJob".equals(dto.getErrorCode())) {

@ -6,7 +6,7 @@ import kr.xit.biz.common.ApiConstants.SignguCode;
import kr.xit.biz.common.ApiConstants.SndngSeCode;
import kr.xit.biz.ens.mapper.IEnsBatchMapper;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.core.exception.BizRuntimeException;
import kr.xit.core.support.utils.Checks;
import lombok.RequiredArgsConstructor;

@ -16,8 +16,8 @@ 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.EnsDTO.SendKakaoTgt;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.EnsKtBcDTO;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.kakao.KkopayDocAttrDTO.Receiver;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkSendReq;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkSendRequests;

@ -9,7 +9,7 @@ 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.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.cntc.CntcDTO;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkStatusRequests;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkStatusResponses;

@ -2,8 +2,7 @@ package kr.xit.biz.ens.service;
import java.util.List;
import kr.xit.biz.common.ApiConstants.SndngSeCode;
import kr.xit.biz.ens.model.EnsDTO;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.kakao.KkopayDocBulkDTO.BulkSendResponses;
/**
@ -39,5 +38,5 @@ public interface IEnsBatchExtractService {
//-----------------------------------------------------------------------------------------------------------------
void updateSendSndngMstStatus(final String mstId, final String unitySndMstId, final SndngSeCode seCode, final String stsErrMsg);
void updateErrorLog(final EnsDTO.SndngMssageParam dto);
void updateErrorLog(final SndngMssageParam dto);
}

@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import kr.xit.biz.ens.model.EnsDTO.SmsSndng;
import kr.xit.biz.ens.model.EnsDTO.SndngMssageParam;
import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.service.EnsBatchExtractService;
import kr.xit.biz.sms.service.ISmsMessageService;
import kr.xit.core.model.ApiResponseDTO;

@ -6,7 +6,7 @@
<!-- =================================================================================== -->
<!-- ================================ accept =========================================== -->
<!-- =================================================================================== -->
<select id="selectAcceptTgts" resultType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<select id="selectAcceptTgts" resultType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-mysql-mapper|selectAcceptTgts-통합 발송 접수 대상 조회|julim */
SELECT tcsm.unity_sndng_mastr_id
, tcsm.tmplat_id
@ -138,7 +138,7 @@
<!-- =================================================================================== -->
<!-- ================================ make ============================================= -->
<!-- =================================================================================== -->
<select id="selectMakeTgts" resultType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<select id="selectMakeTgts" resultType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-mysql-mapper|selectMakeTgts-통합발송 생성 대상 조회|julim */
SELECT unity_sndng_mastr_id
, tmplat_id
@ -569,7 +569,7 @@
<!-- =================================================================================== -->
<!-- ================================ send ============================================= -->
<!-- =================================================================================== -->
<select id="selectSendBulkTgts" resultType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<select id="selectSendBulkTgts" resultType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-mysql-mapper|selectSendBulkTgts-발송 대상 조회|julim */
SELECT tesm.sndng_mastr_id
, tesm.unity_sndng_mastr_id
@ -771,7 +771,7 @@
ORDER BY tekbd.sndng_detail_id
</select>
<select id="selectSndProcessStatus" resultType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<select id="selectSndProcessStatus" resultType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-mysql-mapper|selectSndProcessStatus-발송상태정보조회|julim */
SELECT tesm.sndng_mastr_id
, tesm.unity_sndng_mastr_id
@ -840,7 +840,7 @@
WHERE unity_sndng_mastr_id = #{unitySndngMastrId}
</update>
<update id="updateKtBcMst" parameterType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<update id="updateKtBcMst" parameterType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-kt-mysql-mapper|updateKtBcMst-kt 메세지 수신결과 마스터 반영|julim */
UPDATE tb_ens_kt_bc_mastr
SET result_cd = #{resultCd}
@ -859,7 +859,7 @@
<!-- =================================================================================== -->
<!-- ================================ status ============================================= -->
<!-- =================================================================================== -->
<select id="selectStatusBulkTgts" resultType="kr.xit.biz.ens.model.EnsDTO$SndngMssageParam">
<select id="selectStatusBulkTgts" resultType="kr.xit.biz.ens.model.cmm.SndngMssageParam">
/** ens-mysql-mapper|selectStatusBulkTgts-상태 요청 대상 조회|julim */
SELECT tesm.sndng_mastr_id
, tesm.unity_sndng_mastr_id

@ -0,0 +1,84 @@
package kr.xit.biz.ens.model.cmm;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* <pre>
* description :
*
* packageName : kr.xit.biz.ens.model.cmm
* fileName : SndngMssageParam
* author : limju
* date : 2023-11-01
* ======================================================================
*
* ----------------------------------------------------------------------
* 2023-11-01 limju
*
* </pre>
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@SuperBuilder
public class SndngMssageParam {
private String signguCode;
private String ffnlgCode;
private String profile;
/**
* id
*/
private String unitySndngMastrId;
/**
* id
*/
private String unitySndngDetailId;
/**
* id
*/
private String sndngMastrId;
/**
* ID
*/
private String sndngDetailId;
/**
* 릿ID
*/
private String tmplatId;
/**
*
*/
private int sndngCo;
private String sndngProcessSttus;
/**
*
*/
private String newSndngProcessSttus;
private String try1;
private String try2;
private String try3;
private int tryCnt;
private int trySeq;
private String sndngSeCode;
private String sndngDt;
private String sndngDt2;
private String sndngDt3;
private String try2Minute;
private String try3Minute;
private String errorMssage;
private String errorCode;
private String resultCd;
private String resultDt;
private String url;
}
Loading…
Cancel
Save