Skip to content

B
business-java
Commit 210a509e authored by ptajane's avatar ptajane
Browse files
Options

//Changed By Pankaj T. on 26-07-19 for API authentication pass site_code... 

//Changed By Pankaj T. on 26-07-19 for API authentication pass site_code through API, if site_code passed from API is null then use login user site_code

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204111 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 856d211e
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 4 deletions
webitm-dis/ibase/webitm/ejb/dis/SCMWebServiceDao.java
View file @ 210a509e
...@@ -33,7 +33,7 @@ public class SCMWebServiceDao extends ValidatorEJB ...@@ -33,7 +33,7 @@ public class SCMWebServiceDao extends ValidatorEJB
{ {
E12GenericUtility e12GenericUtility = new E12GenericUtility(); E12GenericUtility e12GenericUtility = new E12GenericUtility();
public String addTransaction(String dataXML, String userCode) throws ITMException public String addTransaction(String dataXML, String userCode, String passWD, String authenticationStatus) throws ITMException
{ {
String retString = ""; String retString = "";
ITMUploadFileEJB imtUploadFileRemote = null; ITMUploadFileEJB imtUploadFileRemote = null;
...@@ -54,8 +54,12 @@ public class SCMWebServiceDao extends ValidatorEJB ...@@ -54,8 +54,12 @@ public class SCMWebServiceDao extends ValidatorEJB
System.out.println("SCMWebServiceDao.addTransaction().userCode["+userCode+"]"); System.out.println("SCMWebServiceDao.addTransaction().userCode["+userCode+"]");
dbAccessEJBLocal = new DBAccessEJB(); dbAccessEJBLocal = new DBAccessEJB();
userInfoBean = dbAccessEJBLocal.createUserInfo(userCode); //userInfoBean = dbAccessEJBLocal.createUserInfo(userCode);
//Changed by Pankaj T. on 26-07-19 for creating user_info from authentication response - start
Document document = new E12GenericUtility().parseString( authenticationStatus );
userInfoBean = createUserInfo(userCode, passWD, document);
System.out.println("SCMWebServiceDao.addTransaction() siteCode from userInfo: [" +userInfoBean.getSiteCode()+ "]");
//Changed by Pankaj T. on 26-07-19 for creating user_info from authentication response - end
if(dataXML != null && dataXML.trim().length() > 0) if(dataXML != null && dataXML.trim().length() > 0)
{ {
dataXMLDom = e12GenericUtility.parseString(dataXML); dataXMLDom = e12GenericUtility.parseString(dataXML);
...@@ -460,4 +464,138 @@ public class SCMWebServiceDao extends ValidatorEJB ...@@ -460,4 +464,138 @@ public class SCMWebServiceDao extends ValidatorEJB
tempNode = null; tempNode = null;
} }
//Added By PriyankaC on 10April [END] //Added By PriyankaC on 10April [END]
//Added by Pankaj T. on 26-07-19 for creating user_info from authentication response - start
private ibase.utility.UserInfoBean createUserInfo( String user, String passwd, Document document ) throws ITMException
{
ibase.utility.UserInfoBean userInfo = null;
try
{
userInfo = new ibase.utility.UserInfoBean();
userInfo.setLoginPwd( passwd );
String temp = null;
if (document.getElementsByTagName("USER_CODE").item(0) != null) {
userInfo.setLoginCode(temp = document.getElementsByTagName("USER_CODE").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("ENTRY_ID").item(0) != null) {
userInfo.setEntryId(temp = document.getElementsByTagName("ENTRY_ID").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("ENTRY_TYPE").item(0) != null) {
userInfo.setEntryType(temp = document.getElementsByTagName("ENTRY_TYPE").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("PROFILE_ID").item(0) != null)
{
userInfo.setProfileId(document.getElementsByTagName("PROFILE_ID").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("EMP_CODE").item(0) != null)
{
userInfo.setEmpCode(document.getElementsByTagName("EMP_CODE").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("EMP_FNAME").item(0) != null)
{
userInfo.setEmpFName(document.getElementsByTagName("EMP_FNAME").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("EMP_MNAME").item(0) != null)
{
userInfo.setEmpMName(document.getElementsByTagName("EMP_MNAME").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("EMP_LNAME").item(0) != null)
{
userInfo.setEmpLName(document.getElementsByTagName("EMP_LNAME").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("SITE_CODE").item(0) != null)
{
userInfo.setSiteCode(document.getElementsByTagName("SITE_CODE").item(0).getFirstChild().getNodeValue());
}
if (document.getElementsByTagName("IS_BI_USER").item(0) != null)
{
userInfo.setIsBIUser(document.getElementsByTagName("IS_BI_USER").item(0).getFirstChild().getNodeValue());
}
if ( document.getElementsByTagName( "PROFILE_ID__RES" ).item(0) != null && document.getElementsByTagName( "PROFILE_ID__RES" ).item(0).getFirstChild() != null )
{
userInfo.setProfileIdRes(document.getElementsByTagName( "PROFILE_ID__RES" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "LOGGER_TYPE" ).item(0) != null && document.getElementsByTagName( "LOGGER_TYPE" ).item(0).getFirstChild() != null )
{
userInfo.setLoggerType(document.getElementsByTagName( "LOGGER_TYPE" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "STAN_CD__HQ_DESCR" ).item(0) != null && document.getElementsByTagName( "STAN_CD__HQ_DESCR" ).item(0).getFirstChild() != null )
{
userInfo.setStanCode(document.getElementsByTagName( "STAN_CD__HQ_DESCR" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "DESIGNATION" ).item(0) != null && document.getElementsByTagName( "DESIGNATION" ).item(0).getFirstChild() != null )
{
userInfo.setDesignation(document.getElementsByTagName( "DESIGNATION" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "DATE_JOIN" ).item(0) != null && document.getElementsByTagName( "DATE_JOIN" ).item(0).getFirstChild() != null )
{
userInfo.setDateJoin(document.getElementsByTagName( "DATE_JOIN" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "TRANS_DB" ).item(0) != null && document.getElementsByTagName( "TRANS_DB" ).item(0).getFirstChild() != null )
{
userInfo.setTransDB(document.getElementsByTagName( "TRANS_DB" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "USER_THEME" ).item(0) != null && document.getElementsByTagName( "USER_THEME" ).item(0).getFirstChild() != null )
{
userInfo.setUserTheme( document.getElementsByTagName( "USER_THEME" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "UX_INTERFACE" ).item(0) != null && document.getElementsByTagName( "UX_INTERFACE" ).item(0).getFirstChild() != null )
{
userInfo.setUxInterface( document.getElementsByTagName( "UX_INTERFACE" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "USER_GEO_FENCE_ENABLED" ).item(0) != null && document.getElementsByTagName( "USER_GEO_FENCE_ENABLED" ).item(0).getFirstChild() != null )
{
userInfo.setUserGeoFence( document.getElementsByTagName( "USER_GEO_FENCE_ENABLED" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "USER_NAME" ).item(0) != null && document.getElementsByTagName( "USER_NAME" ).item(0).getFirstChild() != null )
{
userInfo.setUserName(document.getElementsByTagName( "USER_NAME" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "IS_PASSWORD_STORE" ).item(0) != null && document.getElementsByTagName( "IS_PASSWORD_STORE" ).item(0).getFirstChild() != null )
{
userInfo.setIsPasswordStore(document.getElementsByTagName( "IS_PASSWORD_STORE" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "DEFAULT_MENU" ).item(0) != null && document.getElementsByTagName( "DEFAULT_MENU" ).item(0).getFirstChild() != null )
{
userInfo.setDefaultMenu(document.getElementsByTagName( "DEFAULT_MENU" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "FEATURES" ).item(0) != null && document.getElementsByTagName( "FEATURES" ).item(0).getFirstChild() != null )
{
userInfo.setFeatures( document.getElementsByTagName( "FEATURES" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "ENTERPRISE" ).item(0) != null && document.getElementsByTagName( "ENTERPRISE" ).item(0).getFirstChild() != null )
{
userInfo.setEnterprise( document.getElementsByTagName( "ENTERPRISE" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "USER_GEO_POS_OPTION" ).item(0) != null && document.getElementsByTagName( "USER_GEO_POS_OPTION" ).item(0).getFirstChild() != null )
{
userInfo.setGeoPosOption(( document.getElementsByTagName( "USER_GEO_POS_OPTION" ).item(0).getFirstChild().getNodeValue()) );
}
if ( document.getElementsByTagName( "ENTERPRISE_DESCR" ).item(0) != null && document.getElementsByTagName( "ENTERPRISE_DESCR" ).item(0).getFirstChild() != null )
{
userInfo.setEnterpriseDescr( document.getElementsByTagName( "ENTERPRISE_DESCR" ).item(0).getFirstChild().getNodeValue() );
}
if ( document.getElementsByTagName( "NETWORK_OPTION" ).item(0) != null && document.getElementsByTagName( "NETWORK_OPTION" ).item(0).getFirstChild() != null )
{
userInfo.setUserNetworkOption(( document.getElementsByTagName( "NETWORK_OPTION" ).item(0).getFirstChild().getNodeValue()) );
}
if ( document.getElementsByTagName( "IS_ALLOW_OFFLINE_EDIT" ).item(0) != null && document.getElementsByTagName( "IS_ALLOW_OFFLINE_EDIT" ).item(0).getFirstChild() != null )
{
userInfo.setIsAllowOfflineEdit(( document.getElementsByTagName( "IS_ALLOW_OFFLINE_EDIT" ).item(0).getFirstChild().getNodeValue()) );
}
if ( document.getElementsByTagName( "IS_ALLOW_OFFLINE_DELETE" ).item(0) != null && document.getElementsByTagName( "IS_ALLOW_OFFLINE_DELETE" ).item(0).getFirstChild() != null )
{
userInfo.setIsAllowOfflineDelete(( document.getElementsByTagName( "IS_ALLOW_OFFLINE_DELETE" ).item(0).getFirstChild().getNodeValue()) );
}
}
catch( Exception e )
{
System.out.println("SCMWebServiceDao.createUserInfo() Exception: createUserInfo:==>\n"+e);
throw new ITMException( e );
}
System.out.println("SCMWebServiceDao.createUserInfo() UserInfoBean Created....." );
return userInfo;
}
//Added by Pankaj T. on 26-07-19 for creating user_info from authentication response - end
} }
webitm-dis/ibase/webitm/servlet/dis/SCMWebService.java
View file @ 210a509e
...@@ -67,6 +67,7 @@ public class SCMWebService ...@@ -67,6 +67,7 @@ public class SCMWebService
String userLanguage = commonDBAccessLocal.getDBColumnValue( "USERS", "USER_LANG","WHERE CODE = "+"'" +userCode+"'" ); String userLanguage = commonDBAccessLocal.getDBColumnValue( "USERS", "USER_LANG","WHERE CODE = "+"'" +userCode+"'" );
String userCountry = commonDBAccessLocal.getDBColumnValue( "USERS", "USER_COUNTRY", "WHERE CODE = "+"'" +userCode+"'" ); String userCountry = commonDBAccessLocal.getDBColumnValue( "USERS", "USER_COUNTRY", "WHERE CODE = "+"'" +userCode+"'" );
String passWD = commonDBAccessLocal.getDBColumnValue( "USERS", "PASS_WD","WHERE CODE = "+"'" +userCode+"'" );
if( userLanguage != null && userCountry != null ) if( userLanguage != null && userCountry != null )
{ {
langAndCountryList.add( userLanguage ); langAndCountryList.add( userLanguage );
...@@ -80,7 +81,7 @@ public class SCMWebService ...@@ -80,7 +81,7 @@ public class SCMWebService
return Response.status(HttpServletResponse.SC_UNAUTHORIZED).entity(retString).build(); return Response.status(HttpServletResponse.SC_UNAUTHORIZED).entity(retString).build();
} }
retString = scmWSDao.addTransaction(dataXML, userCode); retString = scmWSDao.addTransaction(dataXML, userCode, passWD, xmlInfoStr);
} }
catch(Exception e) catch(Exception e)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment