Skip to content

B
business-java
Commit 41232b47 authored by pborate's avatar pborate
Browse files
Options

Updated account activity component 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180913 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f02eafb5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 132 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/utility/ActivityTime.java
View file @ 41232b47
package ibase.dashboard.hibernate.util; package ibase.dashboard.common.hibernate.utility;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
......
webitm-dashboard/ibase/dashboard/common/hibernate/utility/GenericUtil.java
View file @ 41232b47
package ibase.dashboard.hibernate.util; package ibase.dashboard.common.hibernate.utility;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
......
webitm-dashboard/ibase/dashboard/common/hibernate/utility/HibernateUtil.java
View file @ 41232b47
package ibase.dashboard.common.hibernate.utility; package ibase.dashboard.common.hibernate.utility;
import java.io.File;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -11,92 +12,74 @@ import org.hibernate.boot.Metadata; ...@@ -11,92 +12,74 @@ import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources; import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
//import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
//import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
public class HibernateUtil { import ibase.utility.CommonConstants;
public class HibernateUtil
//private static final SessionFactory sessionFactory = buildSessionFactory(); {
private static final SessionFactory sessionFactory; private static SessionFactory sessionFactory = null;
//private static SessionFactory buildSessionFactory()
static static
{ {
try try
{ {
/* //String hibernetCfgPath = "hibernate.cfg.xml";
// For Hibernate 4.x String hibernetCfgPath = CommonConstants.JBOSSHOME+File.separator+"server"+File.separator+"default"+File.separator+"deploy"+File.separator+"ibase.ear"+File.separator+"ibase.war"+File.separator+"setting"+File.separator+"hibernate.cfg.xml";
// 1. configuring hibernate //String hibernetCfgPath ="/home/base/OfficeWork/eclipseWS/PlaceTimeEntityWebService/hibernate.cfg.xml";
Configuration configuration = new Configuration().configure("resource/hibernate.cfg.xml"); System.out.println("path for cfg file is ===="+hibernetCfgPath);
File file = new File(hibernetCfgPath);
// 2. create sessionfactory System.out.println("file.exist():"+file.exists());
ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build(); System.out.println("cfg file ===="+file.getAbsolutePath());
SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry); System.out.println("new Configuration() ===="+new Configuration());
// Create the SessionFactory from hibernate.cfg.xml /*Configuration configuration = new Configuration().configure(file);
return sessionFactory; System.out.println("path for cfg file is ===="+hibernetCfgPath);
*/ ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
sessionFactory = configuration.buildSessionFactory(serviceRegistry);*/
// For Hibernate 5.x StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().configure(new File(hibernetCfgPath)).build();
// 1. configuring hibernate
StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().configure("resource/hibernate.cfg.xml").build();
// 2. create sessionfactory
Metadata metaData = new MetadataSources(standardRegistry).getMetadataBuilder().build(); Metadata metaData = new MetadataSources(standardRegistry).getMetadataBuilder().build();
sessionFactory = metaData.getSessionFactoryBuilder().build(); sessionFactory = metaData.getSessionFactoryBuilder().build();
System.out.println("Session factory created successfully:"+sessionFactory);
} }
catch (Throwable ex) catch (Exception ex)
{ {
// Make sure you log the exception, as it might be swallowed System.out.println("Initial SessionFactory creation failed." + ex);
System.err.println("Initial SessionFactory creation failed." + ex);
throw new ExceptionInInitializerError(ex); throw new ExceptionInInitializerError(ex);
} }
} }
public static SessionFactory getSessionFactory() public static SessionFactory getSessionFactory()
{ {
return sessionFactory; return sessionFactory;
} }
public static void shutdown() public static void shutdown()
{ {
// Close caches and connection pools
getSessionFactory().close(); getSessionFactory().close();
} }
private static final Map<String, SessionFactory> sessionFactories = new HashMap<String, SessionFactory>(); private static final Map<String, SessionFactory> sessionFactories = new HashMap<String, SessionFactory>();
private static SessionFactory buildSessionFactory(String dbName) private static SessionFactory buildSessionFactory(String dbName)
{ {
System.out.println("dbName is ==="+dbName);
try try
{ {
/* //String hibernetCfgPath = "hibernate.cfg.xml";
// For Hibernate 4.x String hibernetCfgPath = CommonConstants.JBOSSHOME+File.separator+"server"+File.separator+"default"+File.separator+"deploy"+File.separator+"ibase.ear"+File.separator+"ibase.war"+File.separator+"setting"+File.separator+"hibernate.cfg.xml";
// 1. configuring hibernate //String hibernetCfgPath ="/home/base/OfficeWork/eclipseWS/PlaceTimeEntityWebService/hibernate.cfg.xml";
Configuration configuration = new Configuration().configure("hibernate.cfg.xml");
// 2. create sessionfactory System.out.println("path for cfg file is ===="+hibernetCfgPath);
ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry);
*/
// For Hibernate 5.x StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().configure(new File(hibernetCfgPath)).build();
// 1. configuring hibernate
StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder().configure("resource/hibernate.cfg.xml").build();
// 2. create sessionfactory
Metadata metaData = new MetadataSources(standardRegistry).getMetadataBuilder().build(); Metadata metaData = new MetadataSources(standardRegistry).getMetadataBuilder().build();
SessionFactory sessionFactory = metaData.getSessionFactoryBuilder().build(); sessionFactory = metaData.getSessionFactoryBuilder().build();
sessionFactories.put(dbName,sessionFactory);
sessionFactories.put(dbName,sessionFactory);
return sessionFactory;
// Create the SessionFactory from hibernate.cfg.xml
return sessionFactory;
} }
catch (final HibernateException e) catch (final HibernateException e)
{ {
// Make sure you log the exception, as it might be swallowed
System.err.println("Initial SessionFactory creation failed." + e); System.err.println("Initial SessionFactory creation failed." + e);
e.printStackTrace(); e.printStackTrace();
throw new ExceptionInInitializerError(e); throw new ExceptionInInitializerError(e);
...@@ -112,18 +95,23 @@ public class HibernateUtil { ...@@ -112,18 +95,23 @@ public class HibernateUtil {
public static SessionFactory getSessionFactory(String dbName) public static SessionFactory getSessionFactory(String dbName)
{ {
System.out.println("Inside getSessionFactory method :::"+dbName);
if( "DEFAULT".equalsIgnoreCase(dbName) ) if( "DEFAULT".equalsIgnoreCase(dbName) )
{ {
if(getSessionFactory().isClosed())
{
buildSessionFactory(dbName);
}
return getSessionFactory(); return getSessionFactory();
} }
else else
{ {
SessionFactory _sessionFactory = sessionFactories.get(dbName); SessionFactory sessionFactory = sessionFactories.get(dbName);
if( _sessionFactory == null ) if( sessionFactory == null || sessionFactory.isClosed() )
{ {
_sessionFactory = buildSessionFactory(dbName); sessionFactory = buildSessionFactory(dbName);
} }
return _sessionFactory; return sessionFactory;
} }
} }
...@@ -133,6 +121,8 @@ public class HibernateUtil { ...@@ -133,6 +121,8 @@ public class HibernateUtil {
getSessionFactory(dbName).close(); getSessionFactory(dbName).close();
} }
/* Added By Saitej Dhaul On 18 Dec 2018 START */
public static String DB_DATE_FORMAT = "yyyy-MM-dd"; public static String DB_DATE_FORMAT = "yyyy-MM-dd";
public static String APPL_DATE_FORMAT = "dd/MM/yyyy"; public static String APPL_DATE_FORMAT = "dd/MM/yyyy";
...@@ -202,4 +192,7 @@ public class HibernateUtil { ...@@ -202,4 +192,7 @@ public class HibernateUtil {
} }
return retDateStr; return retDateStr;
} }
/* Added By Saitej Dhaul On 18 Dec 2018 END */
} }
\ No newline at end of file
webitm-dashboard/ibase/dashboard/common/module-resource/resource/hibernate.cfg.xml
View file @ 41232b47
...@@ -19,13 +19,9 @@ ...@@ -19,13 +19,9 @@
<!-- Drop and re-create the database schema on startup --> <!-- Drop and re-create the database schema on startup -->
<!-- <property name="hibernate.hbm2ddl.auto">update</property> --> <!-- <property name="hibernate.hbm2ddl.auto">update</property> -->
<!-- Map Entity Class --> <!-- Map Entity Class -->
<mapping class="ibase.dashboard.hibernate.bean.DocContents"></mapping> <mapping class="ibase.dashboard.common.hibernate.bean.LoginTrace"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.DocTransLink"></mapping> <mapping class="ibase.dashboard.common.hibernate.bean.Employee"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.RefSer"></mapping> <mapping class="ibase.dashboard.common.hibernate.bean.UserProfile"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.UserDocContent"></mapping> <mapping class="ibase.dashboard.common.hibernate.bean.UserDevice"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.Task"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.LoginTrace"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.Employee"></mapping>
<mapping class="ibase.dashboard.hibernate.bean.UserProfile"></mapping>
</session-factory> </session-factory>
</hibernate-configuration> </hibernate-configuration>
webitm-dashboard/ibase/dashboard/common/webService/AccountActivityService.java
View file @ 41232b47
...@@ -14,7 +14,7 @@ import javax.ws.rs.core.MediaType; ...@@ -14,7 +14,7 @@ import javax.ws.rs.core.MediaType;
import org.json.JSONObject; import org.json.JSONObject;
import ibase.dashboard.hibernate.dao.AccountActivityDao; import ibase.dashboard.common.hibernate.dao.AccountActivityDao;
import ibase.utility.BaseException; import ibase.utility.BaseException;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
...@@ -29,11 +29,11 @@ public class AccountActivityService { ...@@ -29,11 +29,11 @@ public class AccountActivityService {
public String getAccountActivityData(@QueryParam("fromDate") String fromDate, public String getAccountActivityData(@QueryParam("fromDate") String fromDate,
@QueryParam("toDate") String toDate, @QueryParam("toDate") String toDate,
@QueryParam("date") String date, @QueryParam("date") String date,
@QueryParam("startBattery") int startBattery, @QueryParam("startingBattery") int startBattery,
@QueryParam("USER_INFO") String userInfoString) throws Exception @QueryParam("USER_INFO") String userInfoString) throws Exception
{ {
JSONObject accountActivityData = new JSONObject(); JSONObject accountActivityData = new JSONObject();
System.out.println("getAccountActivityData fromDate date [" + fromDate + "]"); System.out.println("getAccountActivityData fromDate date from common dashboard [" + fromDate + "]");
System.out.println("getAccountActivityData toDate date [" + toDate + "]"); System.out.println("getAccountActivityData toDate date [" + toDate + "]");
System.out.println("getAccountActivityData date [" + date + "]"); System.out.println("getAccountActivityData date [" + date + "]");
System.out.println("getAccountActivityData startBattery [" + startBattery + "]"); System.out.println("getAccountActivityData startBattery [" + startBattery + "]");
...@@ -55,11 +55,6 @@ public class AccountActivityService { ...@@ -55,11 +55,6 @@ public class AccountActivityService {
toDate = LocalDate.now().format(formatter1); toDate = LocalDate.now().format(formatter1);
System.out.println("getAccountActivityData toDate is null [" + toDate + "]"); System.out.println("getAccountActivityData toDate is null [" + toDate + "]");
} }
if (startBattery == 0)
{
startBattery = 100;
System.out.println("getAccountActivityData startBattery is null [" + startBattery + "]");
}
if( userInfoString == null ) if( userInfoString == null )
{ {
......
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