Commit 48842906 authored by prumde's avatar prumde

Commented UserEventLog and corrected check of UserInfo

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@195024 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b6b2ff92
...@@ -52,23 +52,25 @@ public class DashboardService { ...@@ -52,23 +52,25 @@ public class DashboardService {
UserEventLogEJB userEventLogEJB=new UserEventLogEJB(); UserEventLogEJB userEventLogEJB=new UserEventLogEJB();
Date startTime=new Date(); Date startTime=new Date();
String argParam=""; String argParam="";
userInfo.setSessionId( sessionId );
System.out.println("session id ");
System.out.println("user info:::::"+userInfo);
String sessionID=userInfo.getSesstionId();
System.out.println("sessionID info:::::"+sessionID);
String editorId="" + new Date().getTime();
System.out.println("getDashboardMetadata ["+CommonConstants.JBOSSHOME+"] dashboardFileName[" + dashboardFileName + "] ");
String dashboardMetadataFilePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "dashboard" + File.separator + "metadataxml" + File.separator +dashboardFileName+".xml";
System.out.println("Final File Path =" + dashboardMetadataFilePath);
DashboardUtil util = new DashboardUtil();
userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive", startTime,
null, argParam,"" , "Pending", "Dashboard" ) ;
System.out.println("Dashboard Service end set event log");
boolean fileCheck=false;
if(userInfo != null ) { if(userInfo != null ) {
userInfo.setSessionId( sessionId );
System.out.println("session id ");
System.out.println("user info:::::"+userInfo);
String sessionID=userInfo.getSesstionId();
System.out.println("sessionID info:::::"+sessionID);
String editorId="" + new Date().getTime();
System.out.println("getDashboardMetadata ["+CommonConstants.JBOSSHOME+"] dashboardFileName[" + dashboardFileName + "] ");
String dashboardMetadataFilePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "dashboard" + File.separator + "metadataxml" + File.separator +dashboardFileName+".xml";
System.out.println("Final File Path =" + dashboardMetadataFilePath);
DashboardUtil util = new DashboardUtil();
// Commented by Prajyot on 29-Dec-2018
//userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive", startTime,
// null, argParam,"" , "Pending", "Dashboard" ) ;
System.out.println("Dashboard Service end set event log");
boolean fileCheck=false;
String userTranDB =userInfo.getTransDB(); String userTranDB =userInfo.getTransDB();
if(userTranDB !=null) { if(userTranDB !=null) {
System.out.println("user trandb "+userTranDB); System.out.println("user trandb "+userTranDB);
...@@ -92,14 +94,16 @@ public class DashboardService { ...@@ -92,14 +94,16 @@ public class DashboardService {
dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath,userInfo); dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath,userInfo);
dashboardMetadata.put("status","success" ); dashboardMetadata.put("status","success" );
} }
// Commented by Prajyot on 29-Dec-2018
//userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
// new Date(), argParam,"" , "Success","Dashboard");
} }
else { else {
dashboardMetadata.put("status","failure" ); dashboardMetadata.put("status","failure" );
dashboardMetadata.put("message","Unauthorised access" ); dashboardMetadata.put("message","Unauthorised access" );
} }
userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
new Date(), argParam,"" , "Success","Dashboard");
System.out.println("Dashboard Service end update event log"); System.out.println("Dashboard Service end update event log");
System.out.println("dashboard service final data "+dashboardMetadata.toString()); System.out.println("dashboard service final data "+dashboardMetadata.toString());
return dashboardMetadata.toString(); return dashboardMetadata.toString();
......
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