changes in battery usage and edetailing report

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

webitm-dashboard/ibase/dashboard/sfa/ejb/BatteryUsageEJB.java

@@ -16,6 +16,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.ejb.Stateless;
 
 @Stateless
@@ -24,9 +26,10 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 	
 	@SuppressWarnings("unchecked")
 	@Override
-	public String getBatteryUsageData(String dataSourceName, String minBatteryStatus) throws RemoteException 
+	public String getBatteryUsageData(String dataSourceName, String loginCode,  String minBatteryStatus, String fromDate, String toDate, String teamArgs) throws RemoteException 
 	{
-		System.out.println("dataSourceName["+dataSourceName+"]minBatteryStatus["+minBatteryStatus+"]");
+		System.out.println("dataSourceName["+dataSourceName+"loginCode["+loginCode+"]fromDate["+fromDate+"[toDate"+toDate+"teamArgs["+teamArgs+"]");
+
 	//	JSONObject batteryUsgDataJsn = new JSONObject();
 		JSONArray batteryUsgArrJsn = new JSONArray(); 
 		ResultSet rs = null;
@@ -38,6 +41,10 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 		{
 			conn        = connDriver.getConnectDB(dataSourceName);
 			connDriver  = null;
+			if( checkNull( teamArgs ).length()>0 )
+			{
+				loginCode = teamArgs;
+			}
 			String dbName = CommonConstants.DB_NAME;
 			String sqlOpr = "trunc";
 			if( dbName.equalsIgnoreCase("db2"))
@@ -45,7 +52,7 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 				sqlOpr ="date";
 			}
 			
-			 sql = " select (emp.emp_fname || ' ' || emp.emp_lname) AS \"MR NAME\", A.LOGIN_BATTERY_STAT AS \"BATTERY %\""
+			/* sql = " select (emp.emp_fname || ' ' || emp.emp_lname) AS \"MR NAME\", A.LOGIN_BATTERY_STAT AS \"BATTERY %\""
 					 +" from employee emp,logintrace A,users usr,"
 					 +" (select rtrim(userid) as userid, min(LOGINTIME) as LOGINTIME from logintrace"
 					 +" where trunc(LOGINTIME) =?"
@@ -54,13 +61,26 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 					 +" and login_battery_stat <?"
 					 +" group by userid)B where A.userid= B.userid"
 					 +" and A.LOGINTIME = B.LOGINTIME and B.userid = rtrim(usr.code)"
-					 +" and usr.emp_code = emp.emp_code order by (emp.emp_fname || ' ' || emp.emp_lname)";
+					 +" and usr.emp_code = emp.emp_code order by (emp.emp_fname || ' ' || emp.emp_lname)";*/
+			 
+			 sql = " select employee.hobby1  AS REGION, (select emp_fname ||' '|| emp_lname from employee where emp_code = supervisor.emp_code)" +
+					 " AS SUPERVISOR_NAME, (select descr from station where stan_code = abm.stan_code__hq) AS ABM_HQ,"+
+					 " (select descr from station where stan_code = emp.stan_code__hq) AS ESI_HQ,"+
+					 " employee.emp_code AS ESI_EMP_CODE, employee.designation AS ESI_DSG, employee.emp_fname ||' '|| employee.emp_lname AS MR_NAME,"+
+					 " A.LOGINTIME AS LOGIN_DATE, A.LOGIN_BATTERY_STAT AS \"BATTERY %\" FROM employee employee"+ 
+					 " LEFT OUTER JOIN org_structure emp ON employee.emp_code = emp.emp_code"+
+					 " LEFT OUTER JOIN org_structure abm ON emp.pos_code__repto = abm.pos_code LEFT OUTER JOIN org_structure supervisor"+
+					 " ON abm.pos_code__repto = supervisor.pos_code, logintrace A, users usr, (SELECT rtrim(userid) AS userid,"+
+					 " MIN(LOGINTIME) AS LOGINTIME FROM logintrace WHERE "+sqlOpr+"(LOGINTIME) >= ?"+
+					 " AND "+sqlOpr+"(LOGINTIME) < ? AND LOGIN_STATUS= 'T' AND LOGIN_BATTERY_STAT IS NOT NULL"+
+					 " AND login_battery_stat  <? GROUP BY userid)B WHERE A.userid = B.userid AND A.LOGINTIME  = B.LOGINTIME"+
+					 " AND B.userid = rtrim(usr.code) AND usr.emp_code = employee.emp_code AND employee.emp_code in "+getFormattedUserId(loginCode )+" ORDER BY (employee.emp_fname || ' ' || employee.emp_lname)";
 			
 			System.out.println("battery sql["+sql+"]");
 			pstmt =  conn.prepareStatement( sql );
 			
-			E12GenericUtility genericUtility = new E12GenericUtility();
-			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			//E12GenericUtility genericUtility = new E12GenericUtility();
+			/*SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String loginDate = sdf.format(new java.util.Date());
 			System.out.println("loginDate121["+loginDate+"]");
 			loginDate = genericUtility.getValidDateTimeString( loginDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
@@ -75,8 +95,44 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 		    else
 		    {
 		    	pstmt.setString(2, "100");
+		    }*/
+		    
+		    System.out.println("fromDate["+fromDate+"]");
+			System.out.println("toDate["+toDate+"]");
+			E12GenericUtility genericUtility = new E12GenericUtility();
+			SimpleDateFormat applFormat = new SimpleDateFormat( genericUtility.getApplDateFormat() );
+			Date applFrmDate = null;
+			Date applToDate = null;
+			if( checkNull(fromDate).length()>0 || checkNull(toDate).length()>0 )
+			{
+				applFrmDate = applFormat.parse(fromDate);
+				applToDate = applFormat.parse(toDate);
+				long millis = applToDate.getTime();
+				millis += 24 * 60 * 60 * 1000;
+				applToDate = new Date( millis );
+				System.out.println("applToDate+1["+applToDate+"]");
+			}
+			else
+			{
+				 applFrmDate = applFormat.parse( applFormat.format(new java.util.Date() ));
+				 applToDate = applFormat.parse( applFormat.format( new java.util.Date() ));
+				 long millis = applToDate.getTime();
+				 millis += 24 * 60 * 60 * 1000;
+				 applToDate = new Date( millis );
+				 System.out.println("applToDate+1["+applToDate+"]");
+			}
+			pstmt.setTimestamp(1, new java.sql.Timestamp( applFrmDate.getTime() ));
+			pstmt.setTimestamp(2, new java.sql.Timestamp( applToDate.getTime() ));
+		    
+			if( checkNull(minBatteryStatus).length()>0 )
+		    {
+		    	pstmt.setString(3, minBatteryStatus);
 		    }
-			
+		    else
+		    {
+		    	pstmt.setString(3, "100");
+		    }
+		    
 			rs = pstmt.executeQuery();
 			System.out.println("122");
 			
@@ -84,30 +140,28 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 			{
 				JSONObject batteryUsgDataJsn = new JSONObject();
 				System.out.println("while rs");
-				String mrName = checkNull(rs.getString("MR NAME"));
-				int batteryPercent = rs.getInt("BATTERY %");
 				
-				System.out.println("mrName["+mrName+"]");
-				System.out.println("batteryPercent["+batteryPercent+"]");
-				batteryUsgDataJsn.put("MR NAME", mrName);
-				batteryUsgDataJsn.put("BATTERY", batteryPercent);
+				batteryUsgDataJsn.put("region", checkNull( rs.getString("REGION") ));
+				batteryUsgDataJsn.put("supervisor_name", checkNull( rs.getString("SUPERVISOR_NAME") ));
+				batteryUsgDataJsn.put("abm_HQ", checkNull( rs.getString("ABM_HQ") ));
+				batteryUsgDataJsn.put("esi_HQ", checkNull( rs.getString("ESI_HQ") ));
+				batteryUsgDataJsn.put("esi_emp_code", checkNull( rs.getString("ESI_EMP_CODE") ));
+				batteryUsgDataJsn.put("esi_Dsg", checkNull( rs.getString("ESI_DSG")) );
+				batteryUsgDataJsn.put("mr_name", checkNull( rs.getString("MR_NAME")) ); 
+				
+				String event_date = checkNull(rs.getString( "LOGIN_DATE" ));
+				SimpleDateFormat dbFormat = new SimpleDateFormat( genericUtility.getDBDateFormat() );
+				Date eventDate = dbFormat.parse( event_date );
+				event_date = applFormat.format( eventDate );
+				batteryUsgDataJsn.put("date", event_date); 
+				
+				int batteryPercent = rs.getInt("BATTERY %");
+				batteryUsgDataJsn.put("battery", batteryPercent );
+				System.out.println("batteryUsgDataJsn["+batteryUsgDataJsn+"]");
 				batteryUsgArrJsn.add( batteryUsgDataJsn );
 			}
 			System.out.println("jsonObject1111131["+batteryUsgArrJsn+"]");
             
-			/*batteryUsgDataJsn = new JSONObject();
-			
-			    JSONObject newJson = new JSONObject();
-			    newJson.put("MR NAME","vishal");
-			    newJson.put("BATTERY %","3");
-			    
-			    JSONObject newJson1 = new JSONObject();
-			    newJson1.put("MR NAME","prasad");
-			    newJson1.put("BATTERY %","4");
-			
-			batteryUsgDataJsn.put("0", newJson);
-			batteryUsgDataJsn.put("1", newJson1);*/
-			
 			if (rs!= null)
 			{   
 				rs.close();  
@@ -126,7 +180,7 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 		} 
 		catch (Exception e) 
 		{
-			e.printStackTrace();
+			System.out.println("Exception in battery Usage EJB["+e.getMessage()+"]");
 			//throw new ITMException(e);
 			JSONObject errMsgJson = new JSONObject();
 			errMsgJson.put("result", getResponseMessage("No Data Found ! ","Failure") );
@@ -173,7 +227,7 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
    			return str.trim() ;
    		}
    	}
-	
+	@SuppressWarnings("unchecked")
 	private JSONObject getResponseMessage(String successResponse, String status) 
 	{
 		JSONObject respMessage = new JSONObject();
@@ -188,4 +242,42 @@ public class BatteryUsageEJB extends ValidatorEJB implements BatteryUsageEJBLoca
 		}
 		return respMessage;
 	}
+	
+	public static String getFormattedUserId( String userId )
+	{
+		StringBuffer userIdSql = new StringBuffer();
+		try
+		{
+			System.out.println("@@@ getFormattedProfileId userId:::["+userId+"]");
+			if( userId.contains(",") )
+			{
+				userIdSql.append("(");
+				String[] pArr = userId.split(",");
+				for( int i = 0; i < pArr.length; i++ )
+				{
+					if( i == pArr.length - 1 )
+					{
+						userIdSql.append("'"+pArr[i]+"'");
+					}
+					else
+					{
+						userIdSql.append("'"+pArr[i]+"',");
+					}
+				}
+				userIdSql.append(")");
+			}
+			else
+			{
+				userIdSql.append("('"+userId+"')");
+			}
+			System.out.println("@@@ getFormattedProfileId profileIdSql:::["+userIdSql.toString()+"]");
+		}
+		catch( Exception e )
+		{
+			System.out.println("Exception : [E12GenericUtility][getFormattedProfileId] :==>\n"+e.getMessage());
+			e.printStackTrace();
+		}
+		return userIdSql.toString();
+	}
+
 }

webitm-dashboard/ibase/dashboard/sfa/ejb/BatteryUsageEJBLocal.java

@@ -8,8 +8,7 @@ import javax.ejb.Local;
 
 @Local
 public  interface BatteryUsageEJBLocal extends ValidatorLocal
-
 {
-	public String getBatteryUsageData(String dataSourceName, String minBatteryStatus)throws RemoteException, ITMException;
+	public String getBatteryUsageData(String dataSourceName, String loginCode,String minBatteryStatus, String fromDate, String toDate, String teamArgs) throws RemoteException;
 }
 

webitm-dashboard/ibase/dashboard/sfa/ejb/BatteryUsageEJBRemote.java

@@ -10,6 +10,6 @@ import javax.ejb.Remote;
 
 public interface BatteryUsageEJBRemote extends ValidatorRemote
 {
-	public String getBatteryUsageData(String dataSourceName, String minBatteryStatus)throws RemoteException, ITMException;
-}
+	public String getBatteryUsageData(String dataSourceName, String loginCode,String minBatteryStatus, String fromDate, String toDate, String teamArgs) throws RemoteException;
 
+}
\ No newline at end of file