Merge branch 'devs/bap-monitoring' into 'jenkins_with_weblogic'
거래 추적 검색 쿼리 수정, 시스템 대외기관 연결정보 이스케이프 처리 See merge request eapim/eapim-admin!19
This commit is contained in:
@@ -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")));
|
||||
|
||||
+2
-2
@@ -74,10 +74,10 @@
|
||||
A.BjobBzwkDstcd = #searchBjobBzwkDstcd#
|
||||
</isNotEmpty>
|
||||
<isNotEmpty prepend="AND" property="searchStartTime">
|
||||
A.FileTrsmtEndHMS > #searchStartTime#
|
||||
A.FileTrsmtStartHMS > #searchStartTime#
|
||||
</isNotEmpty>
|
||||
<isNotEmpty prepend="AND" property="searchEndTime">
|
||||
A.FileTrsmtEndHMS < #searchEndTime#
|
||||
A.FileTrsmtStartHMS < #searchEndTime#
|
||||
</isNotEmpty>
|
||||
<isNotEmpty prepend="AND" property="searchThisStgePrcssRsultCd">
|
||||
A.ThisStgePrcssRsultCd = #searchThisStgePrcssRsultCd#
|
||||
|
||||
Reference in New Issue
Block a user