Merge branch 'master' of http://ferramentasgo.centralit.com.br:8080/scm/git/cit-grp-corporativo

erick.sato
2 parents 9850db3b cab41cc0
Showing 6 changed files with 78 additions and 1 deletions Show diff stats
cit-core/src/main/java/br/com/centralit/framework/dao/arquitetura/CitGenericDAO.java
cit-core/src/main/java/br/com/centralit/framework/dao/arquitetura/CitGenericDAOImpl.java
cit-core/src/main/java/br/com/centralit/framework/model/Configuracao.java
cit-core/src/main/java/br/com/centralit/framework/service/arquitetura/GenericService.java
cit-core/src/main/java/br/com/centralit/framework/service/arquitetura/GenericServiceImpl.java
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
@@ -2,6 +2,7 @@ package br.com.centralit.framework.dao.arquitetura;
  
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
  
 import br.com.centralit.framework.model.arquitetura.PersistentObject;
  
@@ -23,6 +24,14 @@ public interface CitGenericDAO extends GenericDAO&lt;PersistentObject, Long&gt; {
 	public <RT> SearchResult<RT> searchAndCount(ISearch search, Class classs);
  
 	public <RT> RT searchUnique(ISearch search, Class classs);
+	
+	public Object singleResultNativeQuery(String sql);
+	
+	public Object resultListNativeQuery(String sql);
+	
+	public Object singleResultNativeQuery(String sql,Map<String, Object> params);
+	
+	public Object resultListNativeQuery(String sql,Map<String, Object> params);
  
 	/**
 	 * M&eacute;todo respons&aacute;vel por buscar uma lista de entidades por id.
@@ -3,16 +3,20 @@ package br.com.centralit.framework.dao.arquitetura;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
  
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
  
+import net.sf.ehcache.search.impl.ResultImpl;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.hibernate.Criteria;
 import org.hibernate.Session;
+import org.hibernate.jpa.QueryHints;
 import org.springframework.beans.factory.annotation.Autowired;
  
 import br.com.centralit.framework.model.arquitetura.PersistentObject;
@@ -331,6 +335,36 @@ public class CitGenericDAOImpl extends GenericDAOImpl&lt;PersistentObject, Long&gt; im
  
 		}
 	}
+	
+	@Override
+	public Object resultListNativeQuery(String sql,Map<String, Object> params){
+		Query query = em().createNativeQuery(sql);
+		setParameterS(query, params);
+		return query.getResultList();
+	}
+	
+	@Override
+	public Object resultListNativeQuery(String sql){
+		return resultListNativeQuery(sql,null);
+	}
+	
+	@Override
+	public Object singleResultNativeQuery(String sql,Map<String, Object> params){
+		Query query = em().createNativeQuery(sql);
+		setParameterS(query, params);
+		return query.getSingleResult();
+	}
+	
+	@Override
+	public Object singleResultNativeQuery(String sql){
+		return singleResultNativeQuery(sql,null);
+	}
+	
+	private void setParameterS(Query query, Map<String, Object> parans){
+		if(parans != null)
+			for(String key : parans.keySet())
+				query.setParameter(key, parans.get(key));
+	}
  
 	@Override
 	public PersistentObject buscarUltimoRegistroComOrdenadoParametrizada(String property, Long idOrganizacao) {
@@ -65,7 +65,7 @@ public class Configuracao extends PersistentObjectAudit {
 	@JsonView({ Views.ConfiguracaoView.class })
 	private List<ConfiguracaoParametroSistema> parametros;
  
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.EAGER)
 	@JsonView({ Views.ConfiguracaoView.class })
 	private AnexoImagem anexoImagem;
  
@@ -3,6 +3,7 @@ package br.com.centralit.framework.service.arquitetura;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
  
 import org.springframework.validation.Validator;
  
@@ -43,6 +44,14 @@ public interface GenericService&lt;T, PK extends Serializable&gt; {
 	public T mergeValidate(T entity, Validator customValidator);
  
 	public T saveValidate(T entity, Validator customValidator);
+	
+	public Object singleResultNativeQuery(String sql);
+	
+	public Object resultListNativeQuery(String sql);
+	
+	public Object singleResultNativeQuery(String sql,Map<String, Object> params);
+	
+	public Object resultListNativeQuery(String sql,Map<String, Object> params);
  
 	/**
 	 * <p>
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
  
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -297,6 +298,22 @@ public class GenericServiceImpl&lt;T, PK extends Serializable&gt; implements GenericSe
  
 		return this.save(entity);
 	}
+	
+	public Object singleResultNativeQuery(String sql){
+		return dao.singleResultNativeQuery(sql);
+	}
+	
+	public Object resultListNativeQuery(String sql){
+		return dao.resultListNativeQuery(sql);
+	}
+	
+	public Object singleResultNativeQuery(String sql,Map<String, Object> params){
+		return dao.singleResultNativeQuery(sql, params);
+	}
+	
+	public Object resultListNativeQuery(String sql,Map<String, Object> params){
+		return dao.resultListNativeQuery(sql, params);
+	}
  
 	/**
 	 * Método responsável por retornar o tipo da entidade Generics
@@ -657,6 +657,14 @@ public class UtilDate {
 	public static String formatarData(Date data) {
 		return formatarData(data, "dd/MM/yyyy");
 	}
+	
+	public static String formatarData(Object object){
+		Date date = null;
+		if(object !=null && object instanceof Timestamp)
+			date = (Timestamp) object;
+		
+		return date != null ? formatarData(date, "dd/MM/yyyy") : null;
+	}
  
 	public static String formatarDataEntreVirgula(Date data) {
 		return formatarData(data, "yyyy, MM, dd");
...	...	@@ -2,6 +2,7 @@ package br.com.centralit.framework.dao.arquitetura;
2	2
3	3	import java.util.Collection;
4	4	import java.util.List;
	5	+import java.util.Map;
5	6
6	7	import br.com.centralit.framework.model.arquitetura.PersistentObject;
7	8
...	...	@@ -23,6 +24,14 @@ public interface CitGenericDAO extends GenericDAO<PersistentObject, Long> {
23	24	public <RT> SearchResult<RT> searchAndCount(ISearch search, Class classs);
24	25
25	26	public <RT> RT searchUnique(ISearch search, Class classs);
	27	+
	28	+ public Object singleResultNativeQuery(String sql);
	29	+
	30	+ public Object resultListNativeQuery(String sql);
	31	+
	32	+ public Object singleResultNativeQuery(String sql,Map<String, Object> params);
	33	+
	34	+ public Object resultListNativeQuery(String sql,Map<String, Object> params);
26	35
27	36	/**
28	37	* Método responsável por buscar uma lista de entidades por id.
...	...
...	...	@@ -3,16 +3,20 @@ package br.com.centralit.framework.dao.arquitetura;
3	3	import java.util.Arrays;
4	4	import java.util.Collection;
5	5	import java.util.List;
	6	+import java.util.Map;
6	7
7	8	import javax.persistence.EntityManager;
8	9	import javax.persistence.NoResultException;
9	10	import javax.persistence.PersistenceContext;
10	11	import javax.persistence.Query;
11	12
	13	+import net.sf.ehcache.search.impl.ResultImpl;
	14	+
12	15	import org.apache.commons.lang3.StringUtils;
13	16	import org.apache.log4j.Logger;
14	17	import org.hibernate.Criteria;
15	18	import org.hibernate.Session;
	19	+import org.hibernate.jpa.QueryHints;
16	20	import org.springframework.beans.factory.annotation.Autowired;
17	21
18	22	import br.com.centralit.framework.model.arquitetura.PersistentObject;
...	...	@@ -331,6 +335,36 @@ public class CitGenericDAOImpl extends GenericDAOImpl<PersistentObject, Long> im
331	335
332	336	}
333	337	}
	338	+
	339	+ @Override
	340	+ public Object resultListNativeQuery(String sql,Map<String, Object> params){
	341	+ Query query = em().createNativeQuery(sql);
	342	+ setParameterS(query, params);
	343	+ return query.getResultList();
	344	+ }
	345	+
	346	+ @Override
	347	+ public Object resultListNativeQuery(String sql){
	348	+ return resultListNativeQuery(sql,null);
	349	+ }
	350	+
	351	+ @Override
	352	+ public Object singleResultNativeQuery(String sql,Map<String, Object> params){
	353	+ Query query = em().createNativeQuery(sql);
	354	+ setParameterS(query, params);
	355	+ return query.getSingleResult();
	356	+ }
	357	+
	358	+ @Override
	359	+ public Object singleResultNativeQuery(String sql){
	360	+ return singleResultNativeQuery(sql,null);
	361	+ }
	362	+
	363	+ private void setParameterS(Query query, Map<String, Object> parans){
	364	+ if(parans != null)
	365	+ for(String key : parans.keySet())
	366	+ query.setParameter(key, parans.get(key));
	367	+ }
334	368
335	369	@Override
336	370	public PersistentObject buscarUltimoRegistroComOrdenadoParametrizada(String property, Long idOrganizacao) {
...	...
...	...	@@ -65,7 +65,7 @@ public class Configuracao extends PersistentObjectAudit {
65	65	@JsonView({ Views.ConfiguracaoView.class })
66	66	private List<ConfiguracaoParametroSistema> parametros;
67	67
68		- @ManyToOne(fetch = FetchType.LAZY)
	68	+ @ManyToOne(fetch = FetchType.EAGER)
69	69	@JsonView({ Views.ConfiguracaoView.class })
70	70	private AnexoImagem anexoImagem;
71	71
...	...
...	...	@@ -3,6 +3,7 @@ package br.com.centralit.framework.service.arquitetura;
3	3	import java.io.Serializable;
4	4	import java.util.Collection;
5	5	import java.util.List;
	6	+import java.util.Map;
6	7
7	8	import org.springframework.validation.Validator;
8	9
...	...	@@ -43,6 +44,14 @@ public interface GenericService<T, PK extends Serializable> {
43	44	public T mergeValidate(T entity, Validator customValidator);
44	45
45	46	public T saveValidate(T entity, Validator customValidator);
	47	+
	48	+ public Object singleResultNativeQuery(String sql);
	49	+
	50	+ public Object resultListNativeQuery(String sql);
	51	+
	52	+ public Object singleResultNativeQuery(String sql,Map<String, Object> params);
	53	+
	54	+ public Object resultListNativeQuery(String sql,Map<String, Object> params);
46	55
47	56	/**
48	57	* <p>
...	...
...	...	@@ -7,6 +7,7 @@ import java.util.ArrayList;
7	7	import java.util.Collection;
8	8	import java.util.List;
9	9	import java.util.Locale;
	10	+import java.util.Map;
10	11
11	12	import org.apache.commons.logging.Log;
12	13	import org.apache.commons.logging.LogFactory;
...	...	@@ -297,6 +298,22 @@ public class GenericServiceImpl<T, PK extends Serializable> implements GenericSe
297	298
298	299	return this.save(entity);
299	300	}
	301	+
	302	+ public Object singleResultNativeQuery(String sql){
	303	+ return dao.singleResultNativeQuery(sql);
	304	+ }
	305	+
	306	+ public Object resultListNativeQuery(String sql){
	307	+ return dao.resultListNativeQuery(sql);
	308	+ }
	309	+
	310	+ public Object singleResultNativeQuery(String sql,Map<String, Object> params){
	311	+ return dao.singleResultNativeQuery(sql, params);
	312	+ }
	313	+
	314	+ public Object resultListNativeQuery(String sql,Map<String, Object> params){
	315	+ return dao.resultListNativeQuery(sql, params);
	316	+ }
300	317
301	318	/**
302	319	* Método responsável por retornar o tipo da entidade Generics
...	...
...	...	@@ -657,6 +657,14 @@ public class UtilDate {
657	657	public static String formatarData(Date data) {
658	658	return formatarData(data, "dd/MM/yyyy");
659	659	}
	660	+
	661	+ public static String formatarData(Object object){
	662	+ Date date = null;
	663	+ if(object !=null && object instanceof Timestamp)
	664	+ date = (Timestamp) object;
	665	+
	666	+ return date != null ? formatarData(date, "dd/MM/yyyy") : null;
	667	+ }
660	668
661	669	public static String formatarDataEntreVirgula(Date data) {
662	670	return formatarData(data, "yyyy, MM, dd");
...	...