Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d81aeeef67 | |||
| 5dae063fe5 | |||
| 024b24af49 | |||
| 6807e2b947 | |||
| 56fc66faa0 | |||
| 126f41624d | |||
| ae6ed9b262 | |||
| 6f5af2ac69 |
@@ -427,15 +427,15 @@ public class BaseFCProcess extends Process {
|
|||||||
public void setGUID() throws Exception {
|
public void setGUID() throws Exception {
|
||||||
InterfaceMapper mapper = this.resEaiMsg.getMapper();
|
InterfaceMapper mapper = this.resEaiMsg.getMapper();
|
||||||
StandardMessage standardMessage = this.resEaiMsg.getStandardMessage();
|
StandardMessage standardMessage = this.resEaiMsg.getStandardMessage();
|
||||||
String guid = mapper.getGuid(standardMessage);
|
// String guid = mapper.getGuid(standardMessage);
|
||||||
String guidseq = mapper.getGuidSeq(standardMessage);
|
// String guidseq = mapper.getGuidSeq(standardMessage);
|
||||||
|
//
|
||||||
if (logger.isDebug())
|
// if (logger.isDebug())
|
||||||
logger.debug(guidLogPrefix + " REQ Current GUID [" + guid + "][" + guidseq + "]");
|
// logger.debug(guidLogPrefix + " REQ Current GUID [" + guid + "][" + guidseq + "]");
|
||||||
mapper.nextGuidSeq(standardMessage);
|
// mapper.nextGuidSeq(standardMessage);
|
||||||
guidseq = mapper.getGuidSeq(standardMessage);
|
// guidseq = mapper.getGuidSeq(standardMessage);
|
||||||
if (logger.isDebug())
|
// if (logger.isDebug())
|
||||||
logger.debug(guidLogPrefix + " REQ ADD PATHSEQ GUID [" + guid + "][" + guidseq + "]");
|
// logger.debug(guidLogPrefix + " REQ ADD PATHSEQ GUID [" + guid + "][" + guidseq + "]");
|
||||||
|
|
||||||
String svcTsmtUsgTp = this.reqEaiMsg.getSvcTsmtUsgTp(); // 기동 호출방식
|
String svcTsmtUsgTp = this.reqEaiMsg.getSvcTsmtUsgTp(); // 기동 호출방식
|
||||||
String psvItfTp = this.reqEaiMsg.getCurrentSvcMsg().getPsvItfTp(); // 수동 호출방식
|
String psvItfTp = this.reqEaiMsg.getCurrentSvcMsg().getPsvItfTp(); // 수동 호출방식
|
||||||
|
|||||||
@@ -368,6 +368,9 @@ public class RequestProcessor extends RequestProcessorSupport {
|
|||||||
logUnknownMessage(vo,orgMessage);
|
logUnknownMessage(vo,orgMessage);
|
||||||
throw new RequestProcessorException(vo.getRspErrorMsg());
|
throw new RequestProcessorException(vo.getRspErrorMsg());
|
||||||
}else {
|
}else {
|
||||||
|
// TODO : DJErp - 표준전문의 InterfaceID는 SEND_RECV_DIVISION, IN_EX_DIVISION 포함해야 할지에 따라 결정
|
||||||
|
// mapper.setInterfaceId(standardMessage, eaiSvcCd);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MCI Sync-Async 응답을 대표인터페이스로 구현하기 위해 추가
|
* MCI Sync-Async 응답을 대표인터페이스로 구현하기 위해 추가
|
||||||
* 조건)MCI 거래 && 일반거래 && 응답 거래
|
* 조건)MCI 거래 && 일반거래 && 응답 거래
|
||||||
@@ -1301,17 +1304,17 @@ public class RequestProcessor extends RequestProcessorSupport {
|
|||||||
STDMessageKeys.SEND_RECV_CD_SEND.equals(returnType) ) {
|
STDMessageKeys.SEND_RECV_CD_SEND.equals(returnType) ) {
|
||||||
try {
|
try {
|
||||||
retEaiMsg.setLogPssSno(400);
|
retEaiMsg.setLogPssSno(400);
|
||||||
String retGuid = mapper.getGuid(retEaiMsg.getStandardMessage());
|
// String retGuid = mapper.getGuid(retEaiMsg.getStandardMessage());
|
||||||
String retGuidSeq = mapper.getGuidSeq(retEaiMsg.getStandardMessage());
|
// String retGuidSeq = mapper.getGuidSeq(retEaiMsg.getStandardMessage());
|
||||||
String newGuid = retGuid + StringUtils.defaultString(StringUtils.leftPad(retGuidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0'));
|
// String newGuid = retGuid + StringUtils.defaultString(StringUtils.leftPad(retGuidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0'));
|
||||||
mapper.setGuid(retEaiMsg.getStandardMessage(), newGuid);
|
// mapper.setGuid(retEaiMsg.getStandardMessage(), newGuid);
|
||||||
mapper.setSendTime(retEaiMsg.getStandardMessage(), DatetimeUtil.getCurrentTimeMillis());
|
mapper.setSendTime(retEaiMsg.getStandardMessage(), DatetimeUtil.getCurrentTimeMillis());
|
||||||
|
|
||||||
EAILogSender.send(retEaiMsg, null);
|
EAILogSender.send(retEaiMsg, null);
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
vo.setRspErrorCode("RECEAIIRP100");
|
vo.setRspErrorCode("RECEAIIRP100");
|
||||||
vo.setRspErrorMsg(ExceptionUtil.make(e, vo.getRspErrorCode(), new String[]{vo.getEaiSvcCd()} ));
|
vo.setRspErrorMsg(ExceptionUtil.make(e, vo.getRspErrorCode(), new String[]{vo.getEaiSvcCd()} ));
|
||||||
if (logger.isError()) logger.error(guidLogPrefix + " : " + vo.getRspErrorMsg());
|
if (logger.isError()) logger.error(guidLogPrefix + " : " + vo.getRspErrorMsg(), e);
|
||||||
}
|
}
|
||||||
if (logger.isInfo()) logger.info(guidLogPrefix + " : LOG(" + eaiMsg.getLogPssSno() + ") EAIMessage : "+eaiMsg.getEAISvcCd());
|
if (logger.isInfo()) logger.info(guidLogPrefix + " : LOG(" + eaiMsg.getLogPssSno() + ") EAIMessage : "+eaiMsg.getEAISvcCd());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -783,12 +783,15 @@ public class StandardItem implements Serializable, Cloneable {
|
|||||||
if(p>0) sb.append(",");
|
if(p>0) sb.append(",");
|
||||||
sb.append("{");
|
sb.append("{");
|
||||||
while(keyIter.hasNext()) {
|
while(keyIter.hasNext()) {
|
||||||
if(ai>0) sb.append(",");
|
|
||||||
String key = keyIter.next();
|
String key = keyIter.next();
|
||||||
StandardItem item = group.get(key);
|
StandardItem item = group.get(key);
|
||||||
if(showPretty) sb.append("\n");
|
String itemPart = item.toJson(showPretty, withBizData);
|
||||||
sb.append(item.toJson(showPretty, withBizData));
|
if(StringUtils.isNotEmpty(itemPart)) {
|
||||||
ai++;
|
if(ai>0) sb.append(",");
|
||||||
|
if(showPretty) sb.append("\n");
|
||||||
|
sb.append(itemPart);
|
||||||
|
ai++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(showPretty) {
|
if(showPretty) {
|
||||||
@@ -1020,20 +1023,15 @@ public class StandardItem implements Serializable, Cloneable {
|
|||||||
totalSize += getLength();
|
totalSize += getLength();
|
||||||
break;
|
break;
|
||||||
case StandardType.GROUP :
|
case StandardType.GROUP :
|
||||||
// skip variable group
|
// skip inactive/conditional group (size==0 means not activated)
|
||||||
if( getSize() == 0
|
if( getSize() == 0 ) {
|
||||||
//카카오뱅크 => 카카오카드 400응답시 아래 로직을 추가해야 전체건수에서 메시지부가 처리됨
|
|
||||||
//메시지부 size 0 refPath refValue 사용 해서 있고 없고 처리
|
|
||||||
&& (StringUtils.isBlank(getRefPath())
|
|
||||||
|| StringUtils.isBlank(getRefValue()))
|
|
||||||
) {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (isHidden) break;
|
if (isHidden) break;
|
||||||
keyIter = childs.keySet().iterator();
|
keyIter = childs.keySet().iterator();
|
||||||
while(keyIter.hasNext()) {
|
while(keyIter.hasNext()) {
|
||||||
String key = keyIter.next();
|
String key = keyIter.next();
|
||||||
StandardItem item = childs.get(key);
|
StandardItem item = childs.get(key);
|
||||||
totalSize +=item.getBytesDataLength(charset);
|
totalSize +=item.getBytesDataLength(charset);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -1120,20 +1118,15 @@ public class StandardItem implements Serializable, Cloneable {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case StandardType.GROUP :
|
case StandardType.GROUP :
|
||||||
// skip variable group
|
// skip inactive/conditional group (size==0 means not activated)
|
||||||
if( getSize() == 0
|
if( getSize() == 0 ) {
|
||||||
//카카오뱅크 => 카카오카드 400응답시 아래 로직을 추가해야 전체건수에서 메시지부가 처리됨
|
|
||||||
//메시지부 size 0 refPath refValue 사용 해서 있고 없고 처리
|
|
||||||
&& (StringUtils.isBlank(getRefPath())
|
|
||||||
|| StringUtils.isBlank(getRefValue()))
|
|
||||||
) {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (isHidden) break;
|
if (isHidden) break;
|
||||||
keyIter = childs.keySet().iterator();
|
keyIter = childs.keySet().iterator();
|
||||||
while(keyIter.hasNext()) {
|
while(keyIter.hasNext()) {
|
||||||
String key = keyIter.next();
|
String key = keyIter.next();
|
||||||
StandardItem item = childs.get(key);
|
StandardItem item = childs.get(key);
|
||||||
bos.write(item.toByteArray(withBizData,charset)); //하위로 내려갈때 withBizDat 값이 없어져서 추가 jun's 20231101
|
bos.write(item.toByteArray(withBizData,charset)); //하위로 내려갈때 withBizDat 값이 없어져서 추가 jun's 20231101
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ reader.XML=com.eactive.eai.message.parser.XmlReader
|
|||||||
reader.FLAT=com.eactive.eai.message.parser.FlatReader
|
reader.FLAT=com.eactive.eai.message.parser.FlatReader
|
||||||
*/
|
*/
|
||||||
public static String STANDARD_MESSAGE_CONFIG = "standard.message.config";
|
public static String STANDARD_MESSAGE_CONFIG = "standard.message.config";
|
||||||
private String DEFAULT_CONFIG_PATH = "./resources/standard-message-config.properties";
|
private String DEFAULT_CONFIG_PATH = "./standard-message-config.properties";
|
||||||
private String DEFAULT_CONFIG_FILE = "standard-message-config.properties";
|
private String DEFAULT_CONFIG_FILE = "standard-message-config.properties";
|
||||||
|
|
||||||
private String LAYOUT_FILE_TYPE = "layout.file.type";
|
private String LAYOUT_FILE_TYPE = "layout.file.type";
|
||||||
|
|||||||
@@ -359,10 +359,10 @@ public abstract class DefaultProcess extends Process {
|
|||||||
|
|
||||||
// GUID SET
|
// GUID SET
|
||||||
mapper.nextGuidSeq(standardMessage);
|
mapper.nextGuidSeq(standardMessage);
|
||||||
String guid = mapper.getGuid(standardMessage);
|
// String guid = mapper.getGuid(standardMessage);
|
||||||
String guidSeq = mapper.getGuidSeq(standardMessage);
|
// String guidSeq = mapper.getGuidSeq(standardMessage);
|
||||||
mapper.setGuid(standardMessage,
|
// mapper.setGuid(standardMessage,
|
||||||
guid + StringUtils.defaultString(StringUtils.leftPad(guidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0')));
|
// guid + StringUtils.defaultString(StringUtils.leftPad(guidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0')));
|
||||||
|
|
||||||
// 시스템구분
|
// 시스템구분
|
||||||
// stdmsg.setData("stdheader.Inter_chn", EAIServerManager.getInstance().getSystemGubun());
|
// stdmsg.setData("stdheader.Inter_chn", EAIServerManager.getInstance().getSystemGubun());
|
||||||
@@ -776,7 +776,7 @@ public abstract class DefaultProcess extends Process {
|
|||||||
}
|
}
|
||||||
standardMessage.setBizData(this.resObject, this.inboundCharset);
|
standardMessage.setBizData(this.resObject, this.inboundCharset);
|
||||||
try {
|
try {
|
||||||
mapper.nextGuidSeq(standardMessage);
|
//mapper.nextGuidSeq(standardMessage);
|
||||||
mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV);
|
mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV);
|
||||||
StandardMessageManager standardManager = StandardMessageManager.getInstance();
|
StandardMessageManager standardManager = StandardMessageManager.getInstance();
|
||||||
standardManager.getMessageCoordinator().coordinateSetStandardMessageError(standardMessage, mapper,
|
standardManager.getMessageCoordinator().coordinateSetStandardMessageError(standardMessage, mapper,
|
||||||
|
|||||||
Reference in New Issue
Block a user