Updated account activity dao and account activity service.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179328 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java

@@ -31,6 +31,7 @@ import ibase.dashboard.common.hibernate.bean.Employee;
 import ibase.dashboard.common.hibernate.bean.LoginTrace;
 import ibase.dashboard.common.hibernate.bean.UserProfile;
 import ibase.dashboard.common.hibernate.utility.HibernateUtil;
+import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 
 //6DBC5A495F0F2C5371D59DC89EB06F41
@@ -41,7 +42,6 @@ public class AccountActivityDao
 
 	public String getUserActivityData(String loginCode, String profileId)throws Exception
 	{
-		
 		JSONArray activityDataFinal = new JSONArray();
 		
 		System.out.println("getUserActivityData>>>");
@@ -51,16 +51,19 @@ public class AccountActivityDao
 		{
 			List<JSONObject> fileDataList= getUserActivityFileData(null, "", "");
 			System.out.println("getUserActivityData>>>"+ fileDataList);
-				for(JSONObject fileDataObj : fileDataList )
-				{
-					String userId = fileDataObj.optString("userId");
-					String activityDate = fileDataObj.optString("activityDate");
-					String fileContents = fileDataObj.optString("fileContents");
-					System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
-	
-					JSONObject activityData = createActivityData(userId, fileContents);
-					activityDataFinal.put(activityData);
-				}
+			for(JSONObject fileDataObj : fileDataList )
+			{
+				String userId = fileDataObj.optString("userId");
+				String activityDate = fileDataObj.optString("activityDate");
+				String fileContents = fileDataObj.optString("fileContents");
+				System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
+
+				JSONObject activityData = createActivityData(userId, fileContents);
+				activityDataFinal.put(activityData);
+			}
+			
+			activityDataFinal = prepareAllUsersData(activityDataFinal);
+			
 		}
 		else
 		{
@@ -101,12 +104,27 @@ public class AccountActivityDao
 				activityDataFinal.put(selfActivityData);
 			}
 			
+			activityDataFinal = prepareTeamUsersData(activityDataFinal);
 		}
 		
 		System.out.println("activityDataFinal data " + activityDataFinal.toString());
 		return activityDataFinal.toString();
 	}
 
+	private JSONArray prepareAllUsersData(JSONArray activityDataFinal) {
+		System.out.println("Inside prepareAllUsersData ");
+		
+		//TO GET All Login User Data 
+		return activityDataFinal;
+	}
+
+	private JSONArray prepareTeamUsersData(JSONArray activityDataFinal) {
+
+		//TO GET Team Login User Data 
+		
+		return activityDataFinal;
+	}
+
 	private JSONObject getUserDetail(JSONObject activityData, String userCode) throws JSONException
 	{
 		List<Employee> employeeDataList = getUserDesignation(userCode);
@@ -646,6 +664,43 @@ public class AccountActivityDao
 		return filesArrayList;
 	}
 
+/*
+	private JSONArray processData(JSONArray activityDataFinal)
+	{
+	   for( var activity of accData )
+	   {
+	       processActData(activity);
+	   }
+	   return activityDataFinal;
+	}
+
+	private void processActData(JSONObject activity)
+	{
+	   //CLIENT_APP , DEVICE_TYPE
+	   //console.log('activity', activity);
+	   if( activity.optJSONArray("SESSIONS") != null && activity.optJSONArray("SESSIONS").length() > 0)
+	   {
+	       //console.log('SESSIONS', activity.SESSIONS.length);
+		   int len = activity.optJSONArray("SESSIONS").length();
+	       for(int idx = 0; idx < len; idx ++)
+	       {
+	    	   JSONObject session = activity.optJSONArray("SESSIONS").optJSONObject(idx);
+	           String deviceType = session.DEVICE_TYPE.toUpperCase();
+	           String clientApp = session.CLIENT_APP.toUpperCase();
+	           //console.log('activity.NAME', activity.NAME,'session.DEVICE_TYPE', session.DEVICE_TYPE,'session.CLIENT_APP', session.CLIENT_APP);
+	           DATA[deviceType].TOTAL = checkIntNull( DATA[deviceType].TOTAL ) + 1;
+	           DATA[deviceType][clientApp] = checkIntNull( DATA[deviceType][clientApp] ) + 1;
+	           //console.log('DATA',deviceType, clientApp, DATA[deviceType].TOTAL, DATA[deviceType][clientApp]);
+	       }
+	   }
+	   if( activity.TEAM && activity.TEAM.length > 0)
+	   {
+	       //console.log('TEAM', activity.TEAM.length);
+	       processData(activity.TEAM);
+	   }
+	}
+	*/
+
 }
 
 class ActivityTime implements java.io.Serializable 

webitm-dashboard/ibase/dashboard/common/webService/AccountActivityService.java

 package ibase.dashboard.common.webService;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import ibase.dashboard.common.hibernate.dao.AccountActivityDao;