djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'jenkins_with_weblogic' of ssh://192.168.240.178:18081/eapim/eapim-admin into jenkins_with_weblogic

Browse Source
This commit is contained in:
Rinjae
2025-11-24 18:05:44 +09:00
parent 56dc4350b2 1db5fa65b4
commit e9ea563a70
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstService.java
+13 -4
View File
@@ -11,6 +11,7 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.web.util.HtmlUtils;
import com.eactive.eai.common.util.StringUtil;
import com.eactive.eai.rms.bap.common.base.BapBaseService;
@@ -96,14 +97,18 @@ public class BapSystemInstService extends BapBaseService {
HashMap<String, Object> data = new HashMap<String, Object>();
@SuppressWarnings("unchecked")
HashMap<String, Object> connMap = convertToHashMap((com.google.gson.internal.LinkedTreeMap<String, Object>)connList.get(key));
String lnkgId = StringUtil.getNullStr(connMap.get("LNKGID"));
String lnkgPwd = StringUtil.getNullStr(connMap.get("LNKGPWD"));
data.put("bjobBzwkDstcd" , paramMap.get("bjobBzwkDstcd"));
data.put("osidInstiDstcd" , paramMap.get("osidInstiDstcd"));
data.put("sysLnkgDstcd" , connMap.get("SYSLNKGDSTCD" ));
data.put("rqstRspnsDstcd" , connMap.get("RQSTRSPNSDSTCD" ));
data.put("lnkgIPInfoName" , connMap.get("LNKGIPINFONAME" ));
data.put("lnkgPortInfoName" , connMap.get("LNKGPORTINFONAME" ));
data.put("lnkgID" , StringUtil.getNullStr(connMap.get("LNKGID" )));
data.put("lnkgPwd" , StringUtil.getNullStr(connMap.get("LNKGPWD" )));
data.put("lnkgID" , HtmlUtils.htmlUnescape(lnkgId));
data.put("lnkgPwd" , HtmlUtils.htmlUnescape(lnkgPwd));
data.put("toutVal" , "60");
data.put("tcirtLnkgStusCd" , connMap.get("TCIRTLNKGSTUSCD" ));
data.put("adptrBzwkGroupName", StringUtil.getNullStr( connMap.get("ADPTRBZWKGROUPNAME")));
@@ -149,14 +154,18 @@ public class BapSystemInstService extends BapBaseService {
HashMap<String, Object> data = new HashMap<String, Object>();
@SuppressWarnings("unchecked")
HashMap<String, Object> connMap = convertToHashMap((com.google.gson.internal.LinkedTreeMap<String, Object>)connList.get(key));
String lnkgId = StringUtil.getNullStr(connMap.get("LNKGID"));
String lnkgPwd = StringUtil.getNullStr(connMap.get("LNKGPWD"));
data.put("bjobBzwkDstcd" , paramMap.get("bjobBzwkDstcd"));
data.put("osidInstiDstcd" , paramMap.get("osidInstiDstcd"));
data.put("sysLnkgDstcd" , connMap.get("SYSLNKGDSTCD" ));
data.put("rqstRspnsDstcd" , connMap.get("RQSTRSPNSDSTCD" ));
data.put("lnkgIPInfoName" , connMap.get("LNKGIPINFONAME" ));
data.put("lnkgPortInfoName" , connMap.get("LNKGPORTINFONAME" ));
data.put("lnkgID" , StringUtil.getNullStr(connMap.get("LNKGID" )));
data.put("lnkgPwd" , StringUtil.getNullStr(connMap.get("LNKGPWD" )));
data.put("lnkgID" , HtmlUtils.htmlUnescape(lnkgId));
data.put("lnkgPwd" , HtmlUtils.htmlUnescape(lnkgPwd));
data.put("toutVal" , "60");
data.put("tcirtLnkgStusCd" , connMap.get("TCIRTLNKGSTUSCD" ));
data.put("adptrBzwkGroupName", StringUtil.getNullStr(connMap.get("ADPTRBZWKGROUPNAME")));
src/main/resources/com/eactive/eai/rms/bap/transaction/TransactionTraceMan-oracle.xml
+2 -2
View File
@@ -74,10 +74,10 @@
A.BjobBzwkDstcd = #searchBjobBzwkDstcd#
</isNotEmpty>
<isNotEmpty prepend="AND" property="searchStartTime">
A.FileTrsmtEndHMS &gt; #searchStartTime#
A.FileTrsmtStartHMS &gt; #searchStartTime#
</isNotEmpty>
<isNotEmpty prepend="AND" property="searchEndTime">
A.FileTrsmtEndHMS &lt; #searchEndTime#
A.FileTrsmtStartHMS &lt; #searchEndTime#
</isNotEmpty>
<isNotEmpty prepend="AND" property="searchThisStgePrcssRsultCd">
A.ThisStgePrcssRsultCd = #searchThisStgePrcssRsultCd#