Skip to content

B
business-java
Commit 985bc1d7 authored by pborate's avatar pborate
Browse files
Options

Updated account activity component dao. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180058 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c6a66927
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 118 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java
View file @ 985bc1d7
...@@ -70,13 +70,14 @@ public class AccountActivityDao ...@@ -70,13 +70,14 @@ public class AccountActivityDao
HashMap<String, JSONObject> minMaxBatteryStatus = getBatteryStatus(todayFormat); HashMap<String, JSONObject> minMaxBatteryStatus = getBatteryStatus(todayFormat);
List<String> loginUserList = getLoginUsers(todayFormat); List<String> loginUserList = getLoginUsers(todayFormat);
System.out.println("loginUserList in Admin case:::::"+loginUserList); System.out.println("loginUserList in Admin case:::::"+loginUserList);
JSONObject activityData = new JSONObject(); JSONObject activityData = new JSONObject();
JSONArray deviceTypeList= getDeviceType(loginUserList, todayFormat); JSONArray deviceTypeList= getDeviceType(loginUserList, todayFormat);
System.out.println("device Type::::::"+ deviceTypeList);
JSONObject clientAppList= getClientApp(activityData,loginUserList, todayFormat); JSONObject clientAppList= getClientApp(activityData,loginUserList, todayFormat);
System.out.println("clientAppList Type::::::"+ clientAppList);
JSONObject osNameList= getOsName(activityData,loginUserList, todayFormat); JSONObject osNameList= getOsName(activityData,loginUserList, todayFormat);
System.out.println("osNameList Type::::::"+ osNameList);
System.out.println(" activityData Device data object::::"+activityData); System.out.println(" activityData Device data object::::"+activityData);
activityDataFinal.put("ACTIVITY_GRAPH_DATA",activityData); activityDataFinal.put("ACTIVITY_GRAPH_DATA",activityData);
...@@ -128,31 +129,21 @@ public class AccountActivityDao ...@@ -128,31 +129,21 @@ public class AccountActivityDao
JSONObject selfActivityData = new JSONObject(); JSONObject selfActivityData = new JSONObject();
JSONArray deviceTypeList= getDeviceType(userDataList, todayFormat); JSONArray deviceTypeList= getDeviceType(userDataList, todayFormat);
System.out.println("device Type in else::::::"+ deviceTypeList);
JSONObject clientAppList= getClientApp(selfActivityData,userDataList, todayFormat); JSONObject clientAppList= getClientApp(selfActivityData,userDataList, todayFormat);
System.out.println("clientAppList Type in else::::::"+ clientAppList);
JSONObject osNameList= getOsName(selfActivityData,userDataList, todayFormat); JSONObject osNameList= getOsName(selfActivityData,userDataList, todayFormat);
System.out.println("osNameList Type in else::::::"+ osNameList);
activityDataFinal.put("ACTIVITY_GRAPH_DATA",selfActivityData); activityDataFinal.put("ACTIVITY_GRAPH_DATA",selfActivityData);
System.out.println("minMaxTimeList AFTER>>>"+minMaxTimeList);
System.out.println("minMaxBatteryStatus >>>>>"+minMaxBatteryStatus);
List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today); List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today);
System.out.println("fileDataList AFTER>>>"+fileDataList); System.out.println("fileDataList AFTER>>>"+fileDataList);
JSONObject teamMemberActivityData = new JSONObject(); JSONObject teamMemberActivityData = new JSONObject();
JSONArray teamActivityData = new JSONArray(); JSONArray teamActivityData = new JSONArray();
System.out.println("userDataList AFTER>>>"+userDataList);
System.out.println("userDataList.size AFTER>>>"+userDataList.size());
if(fileDataList.isEmpty()) // For users which is in userDataList didn't perform any userActivity . if(fileDataList.isEmpty()) // For users which is in userDataList didn't perform any userActivity .
{ {
selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode); selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode);
System.out.println("selfActivityData after:::"+selfActivityData);
userDataList.remove(loginCode); userDataList.remove(loginCode);
System.out.println("userDataList in if:::"+userDataList); System.out.println("userDataList in After removing logincode:::"+userDataList);
if(userDataList != null){ if(userDataList != null){
for(String usersId : userDataList){ for(String usersId : userDataList){
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId); teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
...@@ -178,7 +169,6 @@ public class AccountActivityDao ...@@ -178,7 +169,6 @@ public class AccountActivityDao
String fileContents = fileDataObj.optString("fileContents"); String fileContents = fileDataObj.optString("fileContents");
System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]"); System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
fileUsersList.add(userId); fileUsersList.add(userId);
System.out.println("fileList:::"+fileUsersList);
if( userId.equalsIgnoreCase(loginCode)) if( userId.equalsIgnoreCase(loginCode))
{ {
selfActivityData = createActivityData(userId, fileContents); selfActivityData = createActivityData(userId, fileContents);
...@@ -193,7 +183,6 @@ public class AccountActivityDao ...@@ -193,7 +183,6 @@ public class AccountActivityDao
teamActivityData.put(teamMemberActivityData); teamActivityData.put(teamMemberActivityData);
} }
System.out.println("fileUsersList in else::::::::: ["+fileUsersList+"]"); System.out.println("fileUsersList in else::::::::: ["+fileUsersList+"]");
System.out.println("selfActivityData::::::::: ["+selfActivityData+"]");
} }
userDataList.removeAll(fileUsersList); userDataList.removeAll(fileUsersList);
System.out.println("userDataList after:::"+userDataList); System.out.println("userDataList after:::"+userDataList);
...@@ -241,7 +230,6 @@ public class AccountActivityDao ...@@ -241,7 +230,6 @@ public class AccountActivityDao
} }
private JSONArray prepareAllUsersData(JSONArray activityDataFinal) { private JSONArray prepareAllUsersData(JSONArray activityDataFinal) {
System.out.println("Inside prepareAllUsersData ");
//TO GET All Login User Data //TO GET All Login User Data
return activityDataFinal; return activityDataFinal;
} }
...@@ -526,43 +514,6 @@ public class AccountActivityDao ...@@ -526,43 +514,6 @@ public class AccountActivityDao
return activityData; return activityData;
} }
/*
private ActivityTime calcTotalTime(JSONArray prevArray) throws JSONException
{
ActivityTime firstTime = null;
ArrayList<ActivityTime> timeArray = new ArrayList<ActivityTime>();
System.out.println("DATA>>>"+prevArray);
for( int i = 0; i < prevArray.length(); i++ )
{
System.out.println(i);
JSONObject jsonObject1 = prevArray.getJSONObject(i);
String startTime = jsonObject1.getString("ACCESS_START_TIME");
String endTime = jsonObject1.optString("ACCESS_END_TIME");
System.out.println("ACCESS_END_TIME>>"+endTime);
System.out.println("ACCESS_START_TIME>>"+startTime);
ActivityTime actTime = new ActivityTime(startTime, endTime);
timeArray.add(actTime);
System.out.println( "ActivityTime >> " + actTime );
}
int len = timeArray.size();
if( len > 0 )
{
firstTime = timeArray.get(0);
System.out.println(" firstTime >>" + firstTime);
for(int idx = 1; idx < len; idx++)
{
ActivityTime actTime = timeArray.get(idx);
firstTime.addTime(actTime);
System.out.println(" firstTime >" + idx + ">" + firstTime);
}
}
return firstTime;
}
*/
private ActivityTime calcTotalTime(JSONArray prevArray) throws JSONException private ActivityTime calcTotalTime(JSONArray prevArray) throws JSONException
{ {
...@@ -805,15 +756,6 @@ public class AccountActivityDao ...@@ -805,15 +756,6 @@ public class AccountActivityDao
return device; return device;
} }
/*
BROWSER : {
TOTAL : 0,
CHROME : 0,
INTEXP : 0,
FIREFOX : 0,
OTHER : 0
}
*/
public JSONObject getClientApp(JSONObject activityData,List<String> loginUserList,String today) throws JSONException public JSONObject getClientApp(JSONObject activityData,List<String> loginUserList,String today) throws JSONException
{ {
JSONObject clientApp=new JSONObject(); JSONObject clientApp=new JSONObject();
...@@ -880,16 +822,6 @@ public class AccountActivityDao ...@@ -880,16 +822,6 @@ public class AccountActivityDao
return activityData; return activityData;
} }
/*
MOBILE : {
TOTAL: 0,
ANDROID : 0,
IOS : 0,
OTHER : 0
}
*/
public JSONObject getOsName(JSONObject activityData,List<String> loginUserList,String today) throws JSONException public JSONObject getOsName(JSONObject activityData,List<String> loginUserList,String today) throws JSONException
{ {
JSONObject osName=new JSONObject(); JSONObject osName=new JSONObject();
...@@ -1009,7 +941,6 @@ public class AccountActivityDao ...@@ -1009,7 +941,6 @@ public class AccountActivityDao
jsonObject.put("logoutTime", logoutTime); jsonObject.put("logoutTime", logoutTime);
minMaxTimeMap.put(userId, jsonObject); minMaxTimeMap.put(userId, jsonObject);
System.out.println("minMaxTimeList query result:::::::"+minMaxTimeList.size());
System.out.println("minMaxTimeList query id::::::: ["+userId+"] jsonObject ["+jsonObject+"]"); System.out.println("minMaxTimeList query id::::::: ["+userId+"] jsonObject ["+jsonObject+"]");
} }
session.close(); session.close();
...@@ -1058,11 +989,9 @@ public class AccountActivityDao ...@@ -1058,11 +989,9 @@ public class AccountActivityDao
List<Object[]> batteryStatusList= (List<Object[]>)query.list(); List<Object[]> batteryStatusList= (List<Object[]>)query.list();
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
List userList = new ArrayList<>(); List userList = new ArrayList<>();
for(Object[] batteryStatus: batteryStatusList){ for(Object[] batteryStatus: batteryStatusList){
String userId = (String)batteryStatus[0]; String userId = (String)batteryStatus[0];
if(!userList.contains(userId)){ if(!userList.contains(userId)){
jsonObject=new JSONObject(); jsonObject=new JSONObject();
userList.add(userId); userList.add(userId);
...@@ -1076,7 +1005,6 @@ public class AccountActivityDao ...@@ -1076,7 +1005,6 @@ public class AccountActivityDao
jsonObject.put("logoutTime", logoutTime); jsonObject.put("logoutTime", logoutTime);
jsonObject.put("logoutBatteryStatus", logoutBatteryStatus); jsonObject.put("logoutBatteryStatus", logoutBatteryStatus);
minMaxBatteryStatus.put(userId, jsonObject); minMaxBatteryStatus.put(userId, jsonObject);
System.out.println("minMaxBatteryStatus query result:::::::"+minMaxBatteryStatus.size());
System.out.println("minMaxBatteryStatus query result userId ["+userId+"] jsonObject ["+jsonObject+"]"); System.out.println("minMaxBatteryStatus query result userId ["+userId+"] jsonObject ["+jsonObject+"]");
} }
session.close(); session.close();
...@@ -1222,44 +1150,6 @@ public class AccountActivityDao ...@@ -1222,44 +1150,6 @@ public class AccountActivityDao
return buffer.toString(); return buffer.toString();
} }
/*
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 class ActivityTime implements java.io.Serializable
......
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