Skip to content

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

Updated common dashboar jar changes 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183683 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 331271e6
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 12 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java
View file @ 003b1a8a
......@@ -927,6 +927,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
return loginTraceList;
}
......@@ -958,10 +962,15 @@ public class AccountActivityDao
}
session.close();
} catch (HibernateException e) {
}
catch (HibernateException e) {
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
return employee;
}
......@@ -996,6 +1005,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
System.out.println("userDetailList >>>>>>>>>"+userDetailList);
return userDetailList;
}
......@@ -1053,6 +1066,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
System.out.println("deviceTypeList >>>>>>>>>"+deviceTypeList);
return device;
}
......@@ -1136,6 +1153,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
return activityData;
}
......@@ -1212,6 +1233,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
return activityData;
}
......@@ -1258,6 +1283,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
System.out.println("getLoginUsers >>>>>>>>>"+allLoginUsers);
return allLoginUsers;
}
......@@ -1313,7 +1342,8 @@ public class AccountActivityDao
{
System.out.println("HibernateException :");
System.out.println(e.getMessage());
} catch (JSONException e) {
}
catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
......@@ -1405,6 +1435,10 @@ public class AccountActivityDao
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
System.out.println("minMaxBatteryStatus >>>>>>>>>"+minMaxBatteryStatus.toString());
return minMaxBatteryStatus;
}
......
webitm-dashboard/ibase/dashboard/common/hibernate/dao/DashboardUtil.java
View file @ 003b1a8a
......@@ -28,12 +28,13 @@ import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.DBAccessRemote;
import ibase.webitm.utility.ITMException;
import ibase.system.config.AppConnectParm;
import javax.naming.InitialContext;
public class DashboardUtil
{
private static String siteTranDB = "DEFAULT";
public JSONObject getDashboardConfig(String dashboardFileName,UserInfoBean userInfo)
{
//JSONObject dashboardConfig = new JSONObject();
......@@ -164,14 +165,22 @@ public class DashboardUtil
if(datasourceVal instanceof JSONArray) {
datasource= dashboardConfig.optJSONArray("datasource");
System.out.println("datasource ::::["+datasource+"] datasource length ["+datasource.length()+"]");
dashboardConfig.put("datasource", datasource);
}
else {
JSONObject datasourceObj= dashboardConfig.optJSONObject("datasource");
datasource.put(datasourceObj);
System.out.println("datasource obj::::"+datasource);
dashboardConfig.put("datasource", datasource);
}
System.out.println("getDataModelData datasource"+datasource);
JSONArray datasourceFinal=new JSONArray();
for(int i = 0, size = datasource.length(); i < size; i++) {
JSONObject datasourceObj=datasource.optJSONObject(i);
datasourceObj=getDataModelData(datasourceObj);
datasourceFinal.put(datasourceObj);
}
System.out.println("datasource after::: "+datasourceFinal);
dashboardConfig.put("datasource", datasourceFinal);
}
if(dashboardConfig.has("filters")) {
......@@ -194,11 +203,49 @@ public class DashboardUtil
//return dashboardConfig;
}
private JSONObject getDataModelData(JSONObject datasourceObj) {
System.out.println("datasource index::::value::::"+datasourceObj);
if(datasourceObj != null) {
String dataSourceType=datasourceObj.optString("dataSourceType");
String value=datasourceObj.optString("value");
if(dataSourceType.equalsIgnoreCase("dataModel")) {
try
{
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
// 2. Create Query
Query query = session.createSQLQuery(" select scope_name from data_model_input"
+ " where data_model='"+value+"'");
System.out.println("query for getdatmodeldata "+query.getFirstResult());
List<String> result= (List<String>)query.list();
System.out.println("result for getdatmodeldata "+result);
for(String resultFinal: result) {
datasourceObj.put("scopeKey", checkNull(resultFinal));
}
}
catch (HibernateException e)
{
System.out.println("HibernateException :");
System.out.println(e.getMessage());
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
}
}
System.out.println("datasource::::"+datasourceObj);
// TODO Auto-generated method stub
return datasourceObj;
}
public JSONObject getColumnsData(JSONObject componentData,UserInfoBean userInfo) throws NamingException, Exception{
JSONArray finalDataArray = new JSONArray();
String componentType=componentData.optString("component_type");
System.out.println("componentType:::"+componentType);
/*
String responseStr = "";
String objName=componentData.optString("obj_name");
......@@ -211,7 +258,7 @@ public class DashboardUtil
System.out.println("response for dbAccess"+responseStr);
}
*/
if(componentType.equalsIgnoreCase("pivot-grid")) {
JSONObject pivotTableData=new JSONObject();
pivotTableData=getPivotTableData(componentData);
......@@ -701,6 +748,28 @@ public class DashboardUtil
}
}
public JSONObject xmlToJson(String transData) throws JSONException
{
try
{
E12GenericUtility utility = new E12GenericUtility();
Document dashboardDom = utility.parseString(transData);
NodeList rootNodeList = dashboardDom.getElementsByTagName("Root");
Node rootNode = null;
if( rootNodeList != null && rootNodeList.getLength() > 0 ){
rootNode = rootNodeList.item(0);
return (JSONObject) xmlToJson(rootNode);
}
}
catch (ITMException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
return null;
}
}
webitm-dashboard/ibase/dashboard/common/webService/AccountActivityService.java
View file @ 003b1a8a
......@@ -13,9 +13,12 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import ibase.dashboard.common.hibernate.dao.AccountActivityDao;
import ibase.dashboard.common.hibernate.dao.DashboardUtil;
import ibase.utility.BaseException;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
......@@ -30,11 +33,30 @@ public class AccountActivityService {
@Produces(MediaType.APPLICATION_JSON)
public String getAccountActivityData(@QueryParam("fromDate") String fromDate,
@QueryParam("toDate") String toDate,
@QueryParam("date") String date,
@QueryParam("activityDate") String date,
@QueryParam("startingBattery") int startBattery,
@QueryParam("USER_INFO") String userInfoString) throws Exception
@QueryParam("USER_INFO") String userInfoString,
@QueryParam("TRANS_DATA") String transData) throws Exception
{
JSONObject accountActivityData = new JSONObject();
System.out.println("trans_data in account acitivity"+transData);
if(transData != null)
{
DashboardUtil util = new DashboardUtil();
JSONObject data = util.xmlToJson(transData);
System.out.println("acount activity json>>" + data);
if(data != null) {
JSONObject filterData=new JSONObject();
filterData=data.optJSONObject("Detail1");
if(filterData != null) {
System.out.println("filterData from account activity "+filterData);
fromDate=filterData.optString("fromDate");
toDate=filterData.optString("toDate");
startBattery=filterData.optInt("startingBattery");
System.out.println("filterData from account activity fromDate[ "+fromDate+"] toDate ["+toDate+"] startBattery["+startBattery+"]");
}
}
}
System.out.println("getAccountActivityData fromDate date from common dashboard [" + fromDate + "]");
System.out.println("getAccountActivityData toDate date [" + toDate + "]");
System.out.println("getAccountActivityData date [" + date + "]");
......@@ -46,14 +68,14 @@ public class AccountActivityService {
toDate = date;
System.out.println("getAccountActivityData date not null [" + fromDate + "] toDate ["+toDate+"]");
}
if (fromDate == null)
if (fromDate == null || fromDate == "" )
{
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
fromDate = sdf.format(new java.util.Date());
System.out.println("getAccountActivityData fromDate is null [" + fromDate + "]");
}
if (toDate == null)
if (toDate == null || toDate == "")
{
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
toDate = sdf.format(new java.util.Date());
......@@ -77,6 +99,7 @@ public class AccountActivityService {
String userId = "";
String profileId = "";
JSONObject accountActivityData = new JSONObject();
System.out.println("getAccountActivityData userInfoString [" + userInfoString + "]");
if (userInfoString != null)
{
......@@ -93,6 +116,11 @@ public class AccountActivityService {
{
e.printStackTrace();
}
catch (Exception e) {
System.out.println("HibernateException E:");
System.out.println(e.getMessage());
}
}
System.out.println("getAccountActivityData accountActivityData : " + accountActivityData.toString());
return accountActivityData.toString();
......
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