Skip to content

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

Updated account activity dao 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179865 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d759e059
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 31 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java
View file @ c0a68f24
...@@ -105,48 +105,88 @@ public class AccountActivityDao ...@@ -105,48 +105,88 @@ public class AccountActivityDao
System.out.println("minMaxBatteryStatus >>>>>"+minMaxBatteryStatus); System.out.println("minMaxBatteryStatus >>>>>"+minMaxBatteryStatus);
List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today); List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today);
System.out.println("fileDataList AFTER>>>"+fileDataList);
JSONObject selfActivityData = null; JSONObject selfActivityData = new JSONObject();
JSONObject teamMemberActivityData = new JSONObject();
JSONArray teamActivityData = new JSONArray(); JSONArray teamActivityData = new JSONArray();
System.out.println("userDataList AFTER>>>"+userDataList); System.out.println("userDataList AFTER>>>"+userDataList);
for(JSONObject fileDataObj : fileDataList ) System.out.println("userDataList.size AFTER>>>"+userDataList.size());
if(fileDataList.isEmpty()){
selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode);
System.out.println("selfActivityData after:::"+selfActivityData);
userDataList.remove(loginCode);
System.out.println("userDataList in if:::"+userDataList);
if(userDataList != null){
for(String usersId : userDataList){
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
teamActivityData.put(teamMemberActivityData);
}
if(teamActivityData.length()>0){
selfActivityData.put("TEAM", teamActivityData);
}
}
activityDataFinal.put(selfActivityData);
System.out.println("activityDataFinal for if"+activityDataFinal);
}
else
{ {
String userId = fileDataObj.optString("userId"); List<String> fileUsersList = new ArrayList<String>();
String activityDate = fileDataObj.optString("activityDate"); for(JSONObject fileDataObj : fileDataList )
String fileContents = fileDataObj.optString("fileContents");
System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
if( userId.equalsIgnoreCase(loginCode) )
{ {
selfActivityData = createActivityData(userId, fileContents); System.out.println("Inside file else:::"+userDataList);
selfActivityData = updateMinMaxTime(selfActivityData, minMaxTimeList.get(userId)) ; String userId = fileDataObj.optString("userId");
selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,userId) ; String activityDate = fileDataObj.optString("activityDate");
String fileContents = fileDataObj.optString("fileContents");
System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
fileUsersList.add(userId);
System.out.println("fileList:::"+fileUsersList);
if( userId.equalsIgnoreCase(loginCode))
{
selfActivityData = createActivityData(userId, fileContents);
selfActivityData = checkUserForMinMaxTime(selfActivityData, minMaxTimeList,userId) ;
selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,userId) ;
}
else
{
teamMemberActivityData = createActivityData(userId, fileContents);
teamMemberActivityData = checkUserForMinMaxTime(teamMemberActivityData,minMaxTimeList,userId) ;
teamMemberActivityData = checkUserForBatteryStatus(teamMemberActivityData, minMaxBatteryStatus,userId) ;
teamActivityData.put(teamMemberActivityData);
}
System.out.println("fileUsersList in else::::::::: ["+fileUsersList+"]");
System.out.println("selfActivityData::::::::: ["+selfActivityData+"]");
} }
else userDataList.removeAll(fileUsersList);
System.out.println("userDataList after:::"+userDataList);
for(String usersId : userDataList)
{ {
JSONObject teamMemberActivityData = createActivityData(userId, fileContents); if( usersId.equalsIgnoreCase(loginCode))
teamMemberActivityData = updateMinMaxTime(teamMemberActivityData,minMaxTimeList.get(userId)) ; {
teamMemberActivityData = checkUserForBatteryStatus(teamMemberActivityData, minMaxBatteryStatus,userId) ; selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
System.out.println("selfActivityData after:::"+selfActivityData);
teamActivityData.put(teamMemberActivityData); }
else {
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
teamActivityData.put(teamMemberActivityData);
System.out.println("teamActivityData after:::"+teamActivityData);
}
} }
System.out.println("selfActivityData::::::::: ["+selfActivityData+"]"); if(fileDataList != null && fileDataList.size() > 0 )
}
if(fileDataList != null && fileDataList.size() > 0 )
{
if( selfActivityData == null )
{ {
selfActivityData = getUserDetail(new JSONObject(), loginCode); if( selfActivityData == null )
selfActivityData = updateMinMaxTime(selfActivityData, minMaxTimeList.get(loginCode)) ; {
selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,loginCode) ; selfActivityData = getUserDetail(new JSONObject(), loginCode);
selfActivityData = updateMinMaxTime(selfActivityData, minMaxTimeList.get(loginCode)) ;
} selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,loginCode) ;
if(teamActivityData.length()>0){ }
selfActivityData.put("TEAM", teamActivityData); if(teamActivityData.length()>0){
selfActivityData.put("TEAM", teamActivityData);
}
activityDataFinal.put(selfActivityData);
} }
activityDataFinal.put(selfActivityData);
} }
activityDataFinal = prepareTeamUsersData(activityDataFinal); activityDataFinal = prepareTeamUsersData(activityDataFinal);
...@@ -156,6 +196,13 @@ public class AccountActivityDao ...@@ -156,6 +196,13 @@ public class AccountActivityDao
return activityDataFinal.toString(); return activityDataFinal.toString();
} }
private JSONObject fileNotFoundUsers(JSONObject selfActivityData,HashMap<String, JSONObject> minMaxTimeList,HashMap<String, JSONObject> minMaxBatteryStatus,String usersId) throws JSONException {
selfActivityData = getUserDetail(new JSONObject(), usersId);
selfActivityData = checkUserForMinMaxTime(selfActivityData, minMaxTimeList,usersId) ;
selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,usersId) ;
return selfActivityData;
}
private JSONArray prepareAllUsersData(JSONArray activityDataFinal) { private JSONArray prepareAllUsersData(JSONArray activityDataFinal) {
System.out.println("Inside prepareAllUsersData "); System.out.println("Inside prepareAllUsersData ");
...@@ -172,13 +219,41 @@ public class AccountActivityDao ...@@ -172,13 +219,41 @@ public class AccountActivityDao
private JSONObject updateMinMaxTime(JSONObject activityData, JSONObject minMaxTimeObj) throws JSONException private JSONObject updateMinMaxTime(JSONObject activityData, JSONObject minMaxTimeObj) throws JSONException
{ {
if(minMaxTimeObj !=null)
{
activityData.put("LOGIN_TIME", checkNull(minMaxTimeObj.opt("loginTime"))); activityData.put("LOGIN_TIME", checkNull(minMaxTimeObj.opt("loginTime")));
activityData.put("LOGOUT_TIME", checkNull(minMaxTimeObj.opt("logoutTime"))); activityData.put("LOGOUT_TIME", checkNull(minMaxTimeObj.opt("logoutTime")));
System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj); System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj);
return activityData; return activityData;
}
{
activityData.put("LOGIN_TIME", "NA");
activityData.put("LOGOUT_TIME", "NA");
System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj);
return activityData;
}
} }
private JSONObject checkUserForMinMaxTime(JSONObject activityData,HashMap<String, JSONObject> minMaxTimeObj,String userId) throws JSONException
{
System.out.println("checkUserForMinMaxTime activity data::::"+activityData);
System.out.println("checkUser checkUserForMinMaxTime:::::::userId ["+userId+"] minMaxTimeObj"+minMaxTimeObj);
if(minMaxTimeObj.get(userId) != null)
{
activityData = updateMinMaxTime(activityData, minMaxTimeObj.get(userId)) ;
return activityData;
}
else
{
activityData = updateMinMaxTime(activityData, null) ;
return activityData;
}
}
private JSONObject updateMinMaxBatteryStatus(JSONObject activityData, JSONObject minMaxBatteryStatus) throws JSONException private JSONObject updateMinMaxBatteryStatus(JSONObject activityData, JSONObject minMaxBatteryStatus) throws JSONException
{ {
if(minMaxBatteryStatus !=null) if(minMaxBatteryStatus !=null)
......
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