Skip to content

B
business-java
Commit 181ce229 authored by prumde's avatar prumde
Browse files
Options

Updated common dashboard jar 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183097 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ad88fe9e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 19 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java
View file @ 181ce229
...@@ -143,9 +143,9 @@ public class AccountActivityDao ...@@ -143,9 +143,9 @@ public class AccountActivityDao
for(JSONObject list : loginUserList){ for(JSONObject list : loginUserList){
SimpleDateFormat newFormat = new SimpleDateFormat("YYYYMMdd"); SimpleDateFormat newFormat = new SimpleDateFormat("YYYYMMdd");
Timestamp loginDate=(Timestamp) list.get("LOGINDATE"); Timestamp loginDate=(Timestamp) list.opt("LOGINDATE");
String loginDateFormat =newFormat.format(loginDate); String loginDateFormat =newFormat.format(loginDate);
String userid=list.getString("USERID"); String userid=list.optString("USERID");
String fileName=userid+"_"+loginDateFormat; String fileName=userid+"_"+loginDateFormat;
System.out.println("fileName in Admin case>>>>"+fileName); System.out.println("fileName in Admin case>>>>"+fileName);
loginlist.add(fileName); loginlist.add(fileName);
...@@ -165,8 +165,8 @@ public class AccountActivityDao ...@@ -165,8 +165,8 @@ public class AccountActivityDao
if(loginlist != null){ if(loginlist != null){
for(String loginId : loginlist){ for(String loginId : loginlist){
activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,loginId); activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,loginId);
System.out.println("activityData LOGIN_BATTERY_STATUS:::"+activityData.getString("LOGIN_BATTERY_STATUS")); System.out.println("activityData LOGIN_BATTERY_STATUS:::"+activityData.optString("LOGIN_BATTERY_STATUS"));
if(startBattery != 0 && activityData.getString("LOGIN_BATTERY_STATUS") != "NA" && activityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && activityData.optString("LOGIN_BATTERY_STATUS") != "NA" && activityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
activityDataFinalArray.put(activityData); activityDataFinalArray.put(activityData);
} }
...@@ -193,7 +193,7 @@ public class AccountActivityDao ...@@ -193,7 +193,7 @@ public class AccountActivityDao
activityData = createActivityData(loginIdFormated, fileContents); activityData = createActivityData(loginIdFormated, fileContents);
activityData = updateMinMaxTime(activityData, minMaxTimeList.get(loginIdFormated)) ; activityData = updateMinMaxTime(activityData, minMaxTimeList.get(loginIdFormated)) ;
activityData = checkUserForBatteryStatus(activityData, minMaxBatteryStatus,loginIdFormated) ; activityData = checkUserForBatteryStatus(activityData, minMaxBatteryStatus,loginIdFormated) ;
if(startBattery != 0 && activityData.getString("LOGIN_BATTERY_STATUS") != "NA" && activityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && activityData.optString("LOGIN_BATTERY_STATUS") != "NA" && activityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
activityDataFinalArray.put(activityData); activityDataFinalArray.put(activityData);
} }
...@@ -209,7 +209,7 @@ public class AccountActivityDao ...@@ -209,7 +209,7 @@ public class AccountActivityDao
for(String loginId : loginlist) for(String loginId : loginlist)
{ {
activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,loginId); activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,loginId);
if(startBattery != 0 && activityData.getString("LOGIN_BATTERY_STATUS") != "NA" && activityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && activityData.optString("LOGIN_BATTERY_STATUS") != "NA" && activityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
activityDataFinalArray.put(activityData); activityDataFinalArray.put(activityData);
} }
...@@ -263,9 +263,10 @@ public class AccountActivityDao ...@@ -263,9 +263,10 @@ public class AccountActivityDao
{ {
JSONArray teamActivityData = new JSONArray(); JSONArray teamActivityData = new JSONArray();
selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode+"_"+date); selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode+"_"+date);
System.out.println("selfActivityData for userData::::"+selfActivityData);
JSONObject selfActivityDataNew = new JSONObject(); JSONObject selfActivityDataNew = new JSONObject();
selfActivityDataNew=selfActivityData; selfActivityDataNew=selfActivityData;
if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && selfActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
selfActivityData=selfActivityData; selfActivityData=selfActivityData;
} }
...@@ -285,7 +286,7 @@ public class AccountActivityDao ...@@ -285,7 +286,7 @@ public class AccountActivityDao
System.out.println("Inside userDataList in After removing logincode:::["+usersId+"] DATE ["+date+"]"); System.out.println("Inside userDataList in After removing logincode:::["+usersId+"] DATE ["+date+"]");
JSONObject teamMemberActivityData = new JSONObject(); JSONObject teamMemberActivityData = new JSONObject();
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId+"_"+date); teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId+"_"+date);
if(startBattery != 0 && teamMemberActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && teamMemberActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
teamActivityData.put(teamMemberActivityData); teamActivityData.put(teamMemberActivityData);
} }
...@@ -338,7 +339,7 @@ public class AccountActivityDao ...@@ -338,7 +339,7 @@ public class AccountActivityDao
System.out.println("selfActivityData after:::"+selfActivityData); System.out.println("selfActivityData after:::"+selfActivityData);
JSONObject selfActivityDataNew = new JSONObject(); JSONObject selfActivityDataNew = new JSONObject();
selfActivityDataNew=selfActivityData; selfActivityDataNew=selfActivityData;
if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && selfActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
selfActivityData=selfActivityData; selfActivityData=selfActivityData;
} }
...@@ -356,7 +357,7 @@ public class AccountActivityDao ...@@ -356,7 +357,7 @@ public class AccountActivityDao
JSONObject teamMemberActivityData = new JSONObject(); JSONObject teamMemberActivityData = new JSONObject();
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId); teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
if(startBattery != 0 && teamMemberActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && teamMemberActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
teamActivityData.put(teamMemberActivityData); teamActivityData.put(teamMemberActivityData);
} }
...@@ -398,7 +399,7 @@ public class AccountActivityDao ...@@ -398,7 +399,7 @@ public class AccountActivityDao
System.out.println("selfActivityData ELSE FOR::::::::: "+selfActivityData); System.out.println("selfActivityData ELSE FOR::::::::: "+selfActivityData);
JSONObject selfActivityDataNew = new JSONObject(); JSONObject selfActivityDataNew = new JSONObject();
selfActivityDataNew=selfActivityData; selfActivityDataNew=selfActivityData;
if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && selfActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
selfActivityData=selfActivityData; selfActivityData=selfActivityData;
} }
...@@ -417,7 +418,7 @@ public class AccountActivityDao ...@@ -417,7 +418,7 @@ public class AccountActivityDao
teamMemberActivityData = createActivityData(userId+"_"+activityDate, fileContents); teamMemberActivityData = createActivityData(userId+"_"+activityDate, fileContents);
teamMemberActivityData = checkUserForMinMaxTime(teamMemberActivityData,minMaxTimeList,userId+"_"+activityDate) ; teamMemberActivityData = checkUserForMinMaxTime(teamMemberActivityData,minMaxTimeList,userId+"_"+activityDate) ;
teamMemberActivityData = checkUserForBatteryStatus(teamMemberActivityData, minMaxBatteryStatus,userId+"_"+activityDate) ; teamMemberActivityData = checkUserForBatteryStatus(teamMemberActivityData, minMaxBatteryStatus,userId+"_"+activityDate) ;
if(startBattery != 0 && teamMemberActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && teamMemberActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
teamActivityData.put(teamMemberActivityData); teamActivityData.put(teamMemberActivityData);
} }
...@@ -441,7 +442,7 @@ public class AccountActivityDao ...@@ -441,7 +442,7 @@ public class AccountActivityDao
selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId); selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
JSONObject selfActivityDataNew = new JSONObject(); JSONObject selfActivityDataNew = new JSONObject();
selfActivityDataNew=selfActivityData; selfActivityDataNew=selfActivityData;
if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && selfActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
selfActivityData=selfActivityData; selfActivityData=selfActivityData;
} }
...@@ -460,7 +461,7 @@ public class AccountActivityDao ...@@ -460,7 +461,7 @@ public class AccountActivityDao
JSONObject teamMemberActivityData = new JSONObject(); JSONObject teamMemberActivityData = new JSONObject();
teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId); teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
if(startBattery != 0 && teamMemberActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA") if(startBattery != 0 && teamMemberActivityData.optString("LOGIN_BATTERY_STATUS") != "NA" && teamMemberActivityData.optString("LOGOUT_BATTERY_STATUS") != "NA")
{ {
teamActivityData.put(teamMemberActivityData); teamActivityData.put(teamMemberActivityData);
} }
...@@ -500,13 +501,13 @@ public class AccountActivityDao ...@@ -500,13 +501,13 @@ public class AccountActivityDao
{ {
activityData.put("LOGIN_TIME", genUtil.checkNull(minMaxTimeObj.opt("loginTime"))); activityData.put("LOGIN_TIME", genUtil.checkNull(minMaxTimeObj.opt("loginTime")));
activityData.put("LOGOUT_TIME", genUtil.checkNull(minMaxTimeObj.opt("logoutTime"))); activityData.put("LOGOUT_TIME", genUtil.checkNull(minMaxTimeObj.opt("logoutTime")));
System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj); System.out.println("minMaxTimeList query result:::::::"+activityData);
return activityData; return activityData;
} }
{ {
activityData.put("LOGIN_TIME", "NA"); activityData.put("LOGIN_TIME", "NA");
activityData.put("LOGOUT_TIME", "NA"); activityData.put("LOGOUT_TIME", "NA");
System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj); System.out.println("minMaxTimeList query result:::::::"+activityData);
return activityData; return activityData;
} }
} }
...@@ -543,14 +544,14 @@ public class AccountActivityDao ...@@ -543,14 +544,14 @@ public class AccountActivityDao
{ {
activityData.put("LOGIN_BATTERY_STATUS", genUtil.checkNull(minMaxBatteryStatus.opt("loginBatteryStatus"))); activityData.put("LOGIN_BATTERY_STATUS", genUtil.checkNull(minMaxBatteryStatus.opt("loginBatteryStatus")));
activityData.put("LOGOUT_BATTERY_STATUS",genUtil.checkNull(minMaxBatteryStatus.opt("logoutBatteryStatus"))); activityData.put("LOGOUT_BATTERY_STATUS",genUtil.checkNull(minMaxBatteryStatus.opt("logoutBatteryStatus")));
System.out.println("minMaxBatteryStatus query result:::::::"+minMaxBatteryStatus); System.out.println("minMaxBatteryStatus query result:::::::"+activityData);
return activityData; return activityData;
} }
else else
{ {
activityData.put("LOGIN_BATTERY_STATUS", "NA"); activityData.put("LOGIN_BATTERY_STATUS", "NA");
activityData.put("LOGOUT_BATTERY_STATUS","NA"); activityData.put("LOGOUT_BATTERY_STATUS","NA");
System.out.println("minMaxBatteryStatus else query result:::::::"+minMaxBatteryStatus); System.out.println("minMaxBatteryStatus else query result:::::::"+activityData);
return activityData; return activityData;
} }
} }
...@@ -811,7 +812,7 @@ public class AccountActivityDao ...@@ -811,7 +812,7 @@ public class AccountActivityDao
if( len > 0 ) if( len > 0 )
{ {
JSONObject jsonObjectStart = prevArray.getJSONObject(0); JSONObject jsonObjectStart = prevArray.getJSONObject(0);
startTime = jsonObjectStart.getString("ACCESS_START_TIME"); startTime = jsonObjectStart.optString("ACCESS_START_TIME");
JSONObject jsonObjectEnd = prevArray.getJSONObject( len - 1 ); JSONObject jsonObjectEnd = prevArray.getJSONObject( len - 1 );
endTime = jsonObjectEnd.optString("ACCESS_END_TIME"); endTime = jsonObjectEnd.optString("ACCESS_END_TIME");
......
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