djb-eapim/elink-online-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/standard-message-djb' into master

Browse Source
This commit is contained in:
curry772
2026-04-21 16:00:25 +09:00
parent ffb1c69855 ae6ed9b262
commit 126f41624d
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/flowcontroller/BaseFCProcess.java
+9 -9
View File
@@ -427,15 +427,15 @@ public class BaseFCProcess extends Process {
public void setGUID() throws Exception {
InterfaceMapper mapper = this.resEaiMsg.getMapper();
StandardMessage standardMessage = this.resEaiMsg.getStandardMessage();
String guid = mapper.getGuid(standardMessage);
String guidseq = mapper.getGuidSeq(standardMessage);
if (logger.isDebug())
logger.debug(guidLogPrefix + " REQ Current GUID [" + guid + "][" + guidseq + "]");
mapper.nextGuidSeq(standardMessage);
guidseq = mapper.getGuidSeq(standardMessage);
if (logger.isDebug())
logger.debug(guidLogPrefix + " REQ ADD PATHSEQ GUID [" + guid + "][" + guidseq + "]");
// String guid = mapper.getGuid(standardMessage);
// String guidseq = mapper.getGuidSeq(standardMessage);
//
// if (logger.isDebug())
// logger.debug(guidLogPrefix + " REQ Current GUID [" + guid + "][" + guidseq + "]");
// mapper.nextGuidSeq(standardMessage);
// guidseq = mapper.getGuidSeq(standardMessage);
// if (logger.isDebug())
// logger.debug(guidLogPrefix + " REQ ADD PATHSEQ GUID [" + guid + "][" + guidseq + "]");
String svcTsmtUsgTp = this.reqEaiMsg.getSvcTsmtUsgTp(); // 기동 호출방식
String psvItfTp = this.reqEaiMsg.getCurrentSvcMsg().getPsvItfTp(); // 수동 호출방식
src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
+6 -6
View File
@@ -1292,17 +1292,17 @@ public class RequestProcessor extends RequestProcessorSupport {
STDMessageKeys.SEND_RECV_CD_SEND.equals(returnType) ) {
try {
retEaiMsg.setLogPssSno(400);
String retGuid = mapper.getGuid(retEaiMsg.getStandardMessage());
String retGuidSeq = mapper.getGuidSeq(retEaiMsg.getStandardMessage());
String newGuid = retGuid + StringUtils.defaultString(StringUtils.leftPad(retGuidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0'));
mapper.setGuid(retEaiMsg.getStandardMessage(), newGuid);
mapper.setSendTime(retEaiMsg.getStandardMessage(), DatetimeUtil.getCurrentTimeMillis());
//String retGuid = mapper.getGuid(retEaiMsg.getStandardMessage());
//String retGuidSeq = mapper.getGuidSeq(retEaiMsg.getStandardMessage());
//String newGuid = retGuid + StringUtils.defaultString(StringUtils.leftPad(retGuidSeq, UUIDGenerator.GUID_SEQ_LENGTH, '0'));
//mapper.setGuid(retEaiMsg.getStandardMessage(), newGuid);
//mapper.setSendTime(retEaiMsg.getStandardMessage(), DatetimeUtil.getCurrentTimeMillis());
EAILogSender.send(retEaiMsg, null);
} catch(Exception e) {
vo.setRspErrorCode("RECEAIIRP100");
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());
}
src/main/java/com/eactive/eai/message/StandardItem.java
+7 -4
View File
@@ -783,12 +783,15 @@ public class StandardItem implements Serializable, Cloneable {
if(p>0) sb.append(",");
sb.append("{");
while(keyIter.hasNext()) {
if(ai>0) sb.append(",");
String key = keyIter.next();
StandardItem item = group.get(key);
if(showPretty) sb.append("\n");
sb.append(item.toJson(showPretty, withBizData));
ai++;
String itemPart = item.toJson(showPretty, withBizData);
if(StringUtils.isNotEmpty(itemPart)) {
if(ai>0) sb.append(",");
if(showPretty) sb.append("\n");
sb.append(itemPart);
ai++;
}
}
if(showPretty) {
src/main/java/com/eactive/eai/message/manager/StandardMessageManager.java
+1 -1
View File
@@ -47,7 +47,7 @@ reader.XML=com.eactive.eai.message.parser.XmlReader
reader.FLAT=com.eactive.eai.message.parser.FlatReader
*/
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 LAYOUT_FILE_TYPE = "layout.file.type";
src/main/java/com/eactive/eai/outbound/DefaultProcess.java
+1 -1
View File
@@ -776,7 +776,7 @@ public abstract class DefaultProcess extends Process {
}
standardMessage.setBizData(this.resObject, this.inboundCharset);
try {
mapper.nextGuidSeq(standardMessage);
//mapper.nextGuidSeq(standardMessage);
mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV);
StandardMessageManager standardManager = StandardMessageManager.getInstance();
standardManager.getMessageCoordinator().coordinateSetStandardMessageError(standardMessage, mapper,