Updated account activity component.

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

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

 package ibase.dashboard.common.hibernate.dao;
 
 import java.io.File;
+
 import java.io.FileFilter;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -31,6 +32,7 @@ import ibase.dashboard.common.hibernate.utility.HibernateUtil;
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.dashboard.common.hibernate.utility.*;
+
 //import jersey.repackaged.com.google.common.collect.Lists;
 
 //6DBC5A495F0F2C5371D59DC89EB06F41
@@ -49,19 +51,30 @@ public class AccountActivityDao
 	 */
 	public JSONObject getUserActivityData(String loginCode, String profileId,String fromDate,String toDate, int startBattery)throws Exception
 	{
+		E12GenericUtility genericUtility = new E12GenericUtility();
+		String sourceDateFormat=genericUtility.getApplDateFormat();
+		String targetDateFormat=genericUtility.getDBDateFormat();
+		System.out.println("getUserActivityData>>> from common dashboard::::: source format ["+sourceDateFormat+"] target format ["+targetDateFormat+"]");
 		System.out.println("getUserActivityData>>> from common dashboard:::::");
 		System.out.println("fromDate ["+fromDate+"] toDate ["+toDate+"] startBattery ["+startBattery+"]");
 		JSONObject activityDataFinal = new JSONObject();
 		JSONArray activityDataFinalArray = new JSONArray();
 		profileId=profileId.trim();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYYMMdd");
-		String today = LocalDate.now().format(formatter);
-		System.out.println("today date ["+today+"]");
-		String format="dd-MM-yy";
-		String format1="YYYYMMdd";
-		List<String> dateListQuery= genUtil.getDateList(fromDate,toDate,format);
-		System.out.println("dateListQuery::::"+dateListQuery);
-		List<String> dateListFile= genUtil.getDateList(fromDate,toDate,format1);
+
+		String format1="yyyyMMdd";
+		List<String> dateListFile= genUtil.getDateList(fromDate,toDate,sourceDateFormat,format1);
+		
+		SimpleDateFormat app = new SimpleDateFormat(genericUtility.getApplDateFormat());
+		SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
+		
+		Date startDate = (Date) app.parse(fromDate);
+		Date endDate = (Date) app.parse(toDate);
+		
+		fromDate=sdf.format(startDate);
+		toDate=sdf.format(endDate);
+			
+
+		System.out.println("fromDate :::::["+fromDate+"] toDate ["+toDate+"] startBattery ["+startBattery+"]");
 		
 		System.out.println("dateListFile::::"+dateListFile);
 
@@ -249,7 +262,20 @@ public class AccountActivityDao
 			{
 				JSONArray teamActivityData = new JSONArray();
 				selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode+"_"+date);
-				
+				JSONObject selfActivityDataNew = new JSONObject();
+				selfActivityDataNew=selfActivityData;
+				if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA")
+				{
+					selfActivityData=selfActivityData;
+				}
+				else
+				{
+					selfActivityData=new JSONObject();
+				}
+				if(startBattery == 0 )
+				{
+					selfActivityData=selfActivityDataNew;
+				}
 				userDataList.remove(loginCode);
 				System.out.println("userDataList in After removing logincode:::"+userDataList);
 				if(userDataList != null){
@@ -268,17 +294,15 @@ public class AccountActivityDao
 						}
 					}
 					System.out.println("teamActivityData::::: ["+teamActivityData+"]");
+
 					if(teamActivityData.length()>0)
 					{
 						selfActivityData.put("TEAM", teamActivityData);				
 					}
 				}
-				if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA")
-				{
-					activityDataFinalArray.put(selfActivityData);
-				}
-				if(startBattery == 0 )
-				{
+				
+				if(selfActivityData.length() != 0) {
+					System.out.println("selfActivityData final if  inside :::"+selfActivityData);
 					activityDataFinalArray.put(selfActivityData);
 				}
 
@@ -312,6 +336,7 @@ public class AccountActivityDao
 							selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
 							System.out.println("selfActivityData after:::"+selfActivityData);
 							JSONObject selfActivityDataNew = new JSONObject();
+							selfActivityDataNew=selfActivityData;
 							if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA")
 							{
 								selfActivityData=selfActivityData;
@@ -342,6 +367,10 @@ public class AccountActivityDao
 							System.out.println("teamActivityData after:::"+teamActivityData);
 						}
 					}
+					if(selfActivityData.length() != 0) {
+						System.out.println("selfActivityData final if else inside :::"+selfActivityData);
+						activityDataFinalArray.put(selfActivityData);
+					}
 					if(teamActivityData.length()>0)
 					{
 						selfActivityData.put("TEAM", teamActivityData);				
@@ -367,6 +396,7 @@ public class AccountActivityDao
 								selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,userId+"_"+activityDate) ;					
 								System.out.println("selfActivityData ELSE FOR::::::::: "+selfActivityData);
 								JSONObject selfActivityDataNew = new JSONObject();
+								selfActivityDataNew=selfActivityData;
 								if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA")
 								{
 									selfActivityData=selfActivityData;
@@ -409,6 +439,7 @@ public class AccountActivityDao
 						{
 							selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
 							JSONObject selfActivityDataNew = new JSONObject();
+							selfActivityDataNew=selfActivityData;
 							if(startBattery != 0 && selfActivityData.getString("LOGIN_BATTERY_STATUS") != "NA" && selfActivityData.getString("LOGOUT_BATTERY_STATUS") != "NA")
 							{
 								selfActivityData=selfActivityData;
@@ -443,7 +474,7 @@ public class AccountActivityDao
 					{
 						selfActivityData.put("TEAM", teamActivityData);				
 					}
-					System.out.println("selfActivityData beforeeeee :::"+selfActivityData);
+					System.out.println("selfActivityData ELSE beforeeeee  :::"+selfActivityData);
 					if(selfActivityData.length() != 0){
 						System.out.println("selfActivityData final inside :::"+selfActivityData);
 						activityDataFinalArray.put(selfActivityData);
@@ -992,7 +1023,7 @@ public class AccountActivityDao
 			// 2. Create Query
 			Query query = session.createSQLQuery("select count(1), DEVICE_TYPE"
 					+ " from logintrace"
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T' "
 					+   whereClausePart
 					+ " and device_type is not null group by DEVICE_TYPE "
@@ -1051,7 +1082,7 @@ public class AccountActivityDao
 			// 2. Create Query
 			Query query = session.createSQLQuery("select count(1), CLIENT_APP"
 					+ " from logintrace"
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T'"
 					+  startBatteryClause
 					+   whereClausePart
@@ -1134,7 +1165,7 @@ public class AccountActivityDao
 			// 2. Create Query
 			Query query = session.createSQLQuery("select count(1), OS_NAME"
 					+ " from logintrace"
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T'"
 					+  startBatteryClause
 					+   whereClausePart
@@ -1200,7 +1231,7 @@ public class AccountActivityDao
 			// 2. Create Query
 			Query query = session.createSQLQuery("select userid ,trunc(LOGINTIME) logintime"
 					+ " from logintrace"
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T'"
 					+ " group by userid, trunc(LOGINTIME) "
 					+ " order by userid");
@@ -1253,7 +1284,7 @@ public class AccountActivityDao
 			// 2. Create Query
 			Query query = session.createSQLQuery("select userid, min(LOGINTIME) as LOGINTIME , max(LOGOUTTIME)as LOGOUTTIME"
 					+ " from logintrace "
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T' "
 					+  whereClausePart
 					+ "group by userid, trunc(LOGINTIME) "
@@ -1324,7 +1355,7 @@ public class AccountActivityDao
 					+ "("
 					+ "	select userid, min(LOGINTIME) as LOGINTIME , max(LOGOUTTIME)as LOGOUTTIME"
 					+ " from logintrace"
-					+ " where trunc(LOGINTIME) between '"+fromDate+"' and '"+toDate+"'"
+					+ " where trunc(LOGINTIME) between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')"
 					+ " and LOGIN_STATUS = 'T'"
 					+ " and LOGIN_BATTERY_STAT is not null "
 					+ " and LOGOUT_BATTERY_STAT is not null"

webitm-dashboard/ibase/dashboard/common/hibernate/utility/GenericUtil.java

@@ -11,10 +11,10 @@ import java.util.List;
 
 public class GenericUtil 
 {
-	public List<String> getDateList(String fromDate, String toDate, String format) throws ParseException 
+	public List<String> getDateList(String fromDate, String toDate, String sourceDateFormat, String targetDateFormat) throws ParseException 
 	{
-		SimpleDateFormat newFormat = new SimpleDateFormat(format);
-		DateFormat formatter = new SimpleDateFormat("dd-MM-yy");
+		SimpleDateFormat newFormat = new SimpleDateFormat(targetDateFormat);
+		DateFormat formatter = new SimpleDateFormat(sourceDateFormat);
 		
 		Date startDate = (Date) formatter.parse(fromDate);
 		Date endDate = (Date) formatter.parse(toDate);

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

 package ibase.dashboard.common.webService;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
@@ -16,6 +17,7 @@ import org.json.JSONObject;
 
 import ibase.dashboard.common.hibernate.dao.AccountActivityDao;
 import ibase.utility.BaseException;
+import ibase.utility.E12GenericUtility;
 import ibase.utility.UserInfoBean;
 
 @Path("/accountActivity")
@@ -37,6 +39,7 @@ public class AccountActivityService {
 		System.out.println("getAccountActivityData toDate date [" + toDate + "]");
 		System.out.println("getAccountActivityData  date [" + date + "]");
 		System.out.println("getAccountActivityData startBattery [" + startBattery + "]");
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		
 		if(date != null){
 			fromDate = date;
@@ -45,14 +48,15 @@ public class AccountActivityService {
 		}
 		if (fromDate == null) 
 		{
-			DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("dd-MM-YY");
-			fromDate = LocalDate.now().format(formatter1);
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			fromDate = sdf.format(new java.util.Date());
 			System.out.println("getAccountActivityData fromDate is null [" + fromDate + "]");
 		}
+		
 		if (toDate == null) 
 		{
-			DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("dd-MM-YY");
-			toDate = LocalDate.now().format(formatter1);
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			toDate = sdf.format(new java.util.Date());
 			System.out.println("getAccountActivityData toDate is null [" + toDate + "]");
 		}