Skip to content

B
business-java
Commit c0e713a0 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@179918 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 17c3eec3
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 72 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java
View file @ c0e713a0
......@@ -39,6 +39,7 @@ import ibase.dashboard.common.hibernate.bean.UserProfile;
import ibase.dashboard.common.hibernate.utility.HibernateUtil;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
//import jersey.repackaged.com.google.common.collect.Lists;
//6DBC5A495F0F2C5371D59DC89EB06F41
public class AccountActivityDao
......@@ -49,7 +50,6 @@ public class AccountActivityDao
public String getUserActivityData(String loginCode, String profileId)throws Exception
{
JSONArray activityDataFinal = new JSONArray();
System.out.println("getUserActivityData>>>");
profileId=profileId.trim();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYYMMdd");
......@@ -60,34 +60,48 @@ public class AccountActivityDao
String todayFormat = LocalDate.now().format(formatter1);
System.out.println("today1 date ["+todayFormat+"]");
/* FOR MIN MAX LOGIN TIME , LOGOUT TIME AND BATTERY STATUS
HashMap<String, JSONObject> minMaxTimeList= getMinMaxTime(todayFormat);
System.out.println("minMaxTimeList::::::: ["+minMaxTimeList+"]");
HashMap<String, JSONObject> batteryStatus = getBatteryStatus(todayFormat);
System.out.println("batteryStatus::::::: ["+batteryStatus+"]");
*/
if( "ADMIN".equalsIgnoreCase(profileId) || "ADM".equalsIgnoreCase(profileId) )
{
List<JSONObject> fileDataList= getUserActivityFileData(null,today);
System.out.println("getUserActivityData>>>"+ fileDataList);
HashMap<String, JSONObject> minMaxTimeList= getMinMaxTime(todayFormat,null);
HashMap<String, JSONObject> minMaxBatteryStatus = getBatteryStatus(todayFormat);
List<String> loginUserList = getLoginUsers(todayFormat);
JSONObject activityData = new JSONObject();
System.out.println("loginUserList in Admin case:::::"+loginUserList);
if(fileDataList.isEmpty()){
if(loginUserList != null){
for(String usersId : loginUserList){
activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,usersId);
activityDataFinal.put(activityData);
}
}
System.out.println("activityDataFinal for if"+activityDataFinal);
}
else
{
List<String> fileUsersList = new ArrayList<String>();
for(JSONObject fileDataObj : fileDataList )
{
String userId = fileDataObj.optString("userId");
String activityDate = fileDataObj.optString("activityDate");
String fileContents = fileDataObj.optString("fileContents");
fileUsersList.add(userId);
System.out.println("fileUsersList in Admin case::::::::: "+fileUsersList);
System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
JSONObject activityData = createActivityData(userId, fileContents);
activityData = createActivityData(userId, fileContents);
activityData = updateMinMaxTime(activityData, minMaxTimeList.get(userId)) ;
activityData = checkUserForBatteryStatus(activityData, minMaxBatteryStatus,userId) ;
activityDataFinal.put(activityData);
}
loginUserList.removeAll(fileUsersList);
System.out.println("loginUserList after:::"+loginUserList);
for(String usersId : loginUserList)
{
activityData=fileNotFoundUsers(activityData,minMaxTimeList,minMaxBatteryStatus,usersId);
activityDataFinal.put(activityData);
}
}
activityDataFinal = prepareAllUsersData(activityDataFinal);
}
......@@ -95,13 +109,10 @@ public class AccountActivityDao
{
List<String> userDataList = getUserDetails(loginCode,profileId);
System.out.println("userDataList AFTER>>>"+userDataList);
HashMap<String, JSONObject> minMaxTimeList= getMinMaxTime(todayFormat,userDataList);
HashMap<String, JSONObject> minMaxBatteryStatus = getBatteryStatus(todayFormat);
System.out.println("minMaxTimeList AFTER>>>"+minMaxTimeList);
System.out.println("minMaxBatteryStatus >>>>>"+minMaxBatteryStatus);
List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today);
......@@ -188,10 +199,8 @@ public class AccountActivityDao
activityDataFinal.put(selfActivityData);
}
}
activityDataFinal = prepareTeamUsersData(activityDataFinal);
}
System.out.println("activityDataFinal data " + activityDataFinal.toString());
return activityDataFinal.toString();
}
......@@ -205,15 +214,12 @@ public class AccountActivityDao
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;
}
......@@ -231,9 +237,7 @@ public class AccountActivityDao
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
......@@ -248,7 +252,6 @@ public class AccountActivityDao
else
{
activityData = updateMinMaxTime(activityData, null) ;
return activityData;
}
......@@ -298,12 +301,6 @@ public class AccountActivityDao
activityData.put("DESIGNATION", employee.getDesignation());
activityData.put("USER_ID", userCode);
}
// if(minMaxTimeObj != null)
// {
// activityData.put("LOGIN_TIME", minMaxTimeObj.opt("loginTime"));
// activityData.put("LOGOUT_TIME", minMaxTimeObj.opt("logoutTime"));
// System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj);
// }
return activityData;
}
......@@ -688,10 +685,6 @@ public class AccountActivityDao
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
// 2. Create Query
// Query query = session.createQuery("FROM Employee WHERE empCode IN ( "
// + " SELECT empCode FROM UserProfile WHERE userCode='BASE'");
Query query = session.createQuery("FROM Employee e WHERE e.empCode IN ( "
+ " SELECT u.empCode "
+ " FROM UserProfile u "
......@@ -733,19 +726,53 @@ public class AccountActivityDao
System.out.println("query result:::::::"+userDetailList);
System.out.println("query result:::::::"+userDetailList.size());
session.close();
}
catch (HibernateException e)
{
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
System.out.println("userDetailList >>>>>>>>>"+userDetailList);
return userDetailList;
}
/* TODO FOR DEVICE TYPE
/* Query query = session.createQuery("FROM UserProfile WHERE empCode IN ( "
+ " SELECT empCode"
+ " FROM Employee START WITH empCode = "
+ " ( SELECT empCode FROM UserProfile "
+ " WHERE userCode='"+userId+"'"
+ " )"
+ " CONNECT BY prior empCode = reportTo ) ");
JSONArray deviceTypeList= getDeviceType(loginCode, todayFormat);
System.out.println("device Type::::::"+ deviceTypeList);
public JSONArray getDeviceType(String userId,String today) throws JSONException
{
HashMap<String, JSONObject> deviceTypeList = new HashMap<String, JSONObject> ();
JSONArray device=new JSONArray();
try
{
// 1. Get Session object
System.out.println("Inside getUserDetails userId: [" + userId + "]");
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
// 2. Create Query
Query query = session.createSQLQuery("select count(1), DEVICE_TYPE "
+ "from logintrace where to_char(LOGINTIME, 'dd-MM-yy')= '"+today+"'"
+ " and userid ='"+userId+"'"
+ " and LOGIN_STATUS = 'T'"
+ " group by DEVICE_TYPE "
+ "");
System.out.println("Inside getUserDetails query: [" + query + "]");
userDetailList = query.getResultList();
System.out.println("getLogDetails: getUserDetails [" + userDetailList + "]"); */
System.out.println("query result>>>>>"+query);
List<Object[]> deviceList= (List<Object[]>)query.list();
for(Object[] minMaxTime: deviceList){
BigDecimal count = (BigDecimal)minMaxTime[0];
String deviceType = (String) minMaxTime[1];
JSONObject jsonObject = new JSONObject();
jsonObject.put("DEVICE_TYPE", deviceType);
jsonObject.put("DEVICE_COUNT", count);
device.put(jsonObject);
// deviceTypeList.put(userId, jsonObject);
System.out.println("minMaxTimeList query id::::::: ["+userId+"] jsonObject ["+jsonObject+"]");
}
System.out.println("deviceTypeList result:::::::"+device);
session.close();
......@@ -755,8 +782,38 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
System.out.println("userDetailList >>>>>>>>>"+userDetailList);
return userDetailList;
System.out.println("deviceTypeList >>>>>>>>>"+deviceTypeList);
return device;
}
*/
public List<String> getLoginUsers(String today)
{
List<String> allLoginUsers = null;
try
{
// 1. Get Session object
System.out.println("Inside getUserDetails userId: [" + today + "]");
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
// 2. Create Query
Query query = session.createSQLQuery("select distinct userid from logintrace"
+ " where to_char(LOGINTIME, 'dd-MM-yy')= '"+today+"'"
+ "and LOGIN_STATUS = 'T'");
System.out.println("query result>>>>>"+query);
allLoginUsers = query.getResultList();
System.out.println("getLoginUsers result:::::::"+allLoginUsers+"size::::"+allLoginUsers.size());
session.close();
}
catch (HibernateException e)
{
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
System.out.println("getLoginUsers >>>>>>>>>"+allLoginUsers);
return allLoginUsers;
}
public HashMap<String, JSONObject> getMinMaxTime(String today, List<String> userDataList )
......@@ -811,8 +868,6 @@ public class AccountActivityDao
public HashMap<String, JSONObject> getBatteryStatus(String todayFormat) throws JSONException
{
HashMap<String, JSONObject> minMaxBatteryStatus = new HashMap<String, JSONObject>();
//List<Object[]> batteryStatusList = null;
try
{
// 1. Get Session object
......@@ -862,21 +917,14 @@ public class AccountActivityDao
minMaxBatteryStatus.put(userId, jsonObject);
System.out.println("minMaxBatteryStatus query result:::::::"+minMaxBatteryStatus.size());
System.out.println("minMaxBatteryStatus query result userId ["+userId+"] jsonObject ["+jsonObject+"]");
}
session.close();
}
catch (HibernateException e)
{
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
// catch (JSONException e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
System.out.println("minMaxBatteryStatus >>>>>>>>>"+minMaxBatteryStatus.toString());
return minMaxBatteryStatus;
}
......@@ -1168,6 +1216,3 @@ class ActivityTime implements java.io.Serializable
}
}
// select designation from employee where emp_code in(SELECT emp_code FROM USERS
// WHERE CODE='BASE');
// http://192.168.0.220:9090/ibase/plugin/api/logintrace/6DBC5A495F0F2C5371D59DC89EB06F41
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