Download as
Browse Code »

Commit afcdcd4cefa4f7842ed452c166b8d66257e19ec9

Authored by maycon.silva
2 parents b2f9f192 1a6482d9
Exists in master

Merge branch 'desenvolvimento' of http://ferramentasgo.centralit.com.br:8080/scm… 

…/git/cit-grp-ecm into desenvolvimento

# Conflicts:
#	cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
#	cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
Showing 7 changed files with 27 additions and 22 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java
  Diff comments   View file @afcdcd4
... ... @@ -3,9 +3,6 @@ package br.com.centralit.api.dao.impl;
3 3 import java.util.Collection;
4 4 import java.util.LinkedList;
5 5  
6   -import org.hibernate.Criteria;
7   -import org.hibernate.Session;
8   -import org.hibernate.criterion.Restrictions;
9 6 import org.springframework.stereotype.Repository;
10 7  
11 8 import br.com.centralit.api.dao.CredencialProcessoDao;
... ... @@ -14,9 +11,7 @@ import br.com.centralit.api.viewHelper.GrupoUsuarioVH;
14 11 import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
15 12 import br.com.centralit.framework.dao.arquitetura.SearchSeven;
16 13 import br.com.centralit.framework.model.Grupo;
17   -import br.com.centralit.framework.model.Privilegio;
18 14 import br.com.centralit.framework.model.Usuario;
19   -import br.com.centralit.framework.util.UtilColecao;
20 15 import br.com.centralit.framework.util.UtilObjeto;
21 16  
22 17 /**
... ... @@ -144,7 +139,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements
144 139  
145 140 return this.searchUnique(searchSeven, persistentClass);
146 141 }
147   -
  142 +
148 143 /**
149 144 * <p>
150 145 * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a>
... ... @@ -200,7 +195,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements
200 195  
201 196 searchSeven.addFilterEqual("usuario.id", idUsuario);
202 197  
203   - return UtilObjeto.isReferencia(this.search(searchSeven));
  198 + return UtilObjeto.isReferencia(this.searchUnique(searchSeven));
204 199 }
205 200  
206 201 /**
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java
  Diff comments   View file @afcdcd4
... ... @@ -9,6 +9,7 @@ import javax.persistence.ManyToOne;
9 9  
10 10 import br.com.centralit.framework.json.Views;
11 11 import br.com.centralit.framework.model.Unidade;
  12 +import br.com.centralit.framework.model.Usuario;
12 13 import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit;
13 14  
14 15 import com.fasterxml.jackson.annotation.JsonView;
... ... @@ -57,6 +58,14 @@ public class UnidadeProcesso extends PersistentObjectAudit {
57 58 @JsonView({ Views.GenericView.class })
58 59 private Long id;
59 60  
  61 + /** Atributo eviarEmail. */
  62 + @JsonView({ Views.EnviarProcessoView.class })
  63 + private Boolean enviarEmail;
  64 +
  65 + /** Atributo concluido. */
  66 + @JsonView({ Views.EnviarProcessoView.class })
  67 + private Boolean concluido;
  68 +
60 69 /** Atributo processo. */
61 70 @ManyToOne(fetch = FetchType.LAZY)
62 71 @JsonView({ Views.EnviarProcessoView.class })
... ... @@ -67,12 +76,10 @@ public class UnidadeProcesso extends PersistentObjectAudit {
67 76 @JsonView({ Views.EnviarProcessoView.class })
68 77 private Unidade unidade;
69 78  
70   - /** Atributo eviarEmail. */
71   - @JsonView({ Views.EnviarProcessoView.class })
72   - private Boolean enviarEmail;
73   -
  79 + /** Atributo usuarioResponsavel. */
  80 + @ManyToOne(fetch = FetchType.LAZY)
74 81 @JsonView({ Views.EnviarProcessoView.class })
75   - private Boolean concluido;
  82 + private Usuario usuarioResponsavel;
76 83  
77 84 /**
78 85 * Retorna o valor do atributo <code>id</code>
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
  Diff comments   View file @afcdcd4
... ... @@ -107,7 +107,8 @@ public class AnexoGedServiceImpl extends GenericServiceImpl&lt;AnexoGed, Long&gt; impl
107 107  
108 108 documentoGed.setConteudo(this.gedFileService.doOcr(anexo));
109 109  
110   - solrService.addDocumento(documentoGed);
  110 +
  111 + this.solrService.addDocumento(documentoGed);
111 112  
112 113 anexo.setDocumentoGed(documentoGed);
113 114  
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
  Diff comments   View file @afcdcd4
... ... @@ -176,7 +176,9 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl&lt;DocumentoGed, Lo
176 176 entity.setConteudo(this.decrypted(entity.getConteudoCriptografado()));
177 177 }
178 178  
179   - /* this.saveSolr(entity);*/
  179 +
  180 + this.saveSolr(entity);
  181 +
180 182  
181 183 this.verificaTemporalidadeProcesso(entity);
182 184  
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
  Diff comments   View file @afcdcd4
... ... @@ -224,12 +224,12 @@ public class InicializarEcmServiceImpl extends UtilStartup {
224 224 menuProcessoFinalizado.setIncludes(this.gerarArquivosMenu(menuProcessoFinalizado, this.CIT_ECM_WEB_ANGULAR, "ProcessoFinalizado", false, true, false));
225 225 this.menuService.mergeIfNotExist(menuProcessoFinalizado);
226 226  
227   - Pagina pgProcessoDocumentoSigiloso = new Pagina("Processos e Documentos Sigilosos", "/cit-ecm-web/html/classificarProcessoDocumento/classificarProcessoDocumentoList.html");
228   - pgProcessoDocumentoSigiloso = this.paginaService.saveIfNotExist(pgProcessoDocumentoSigiloso);
229   -
230   - Menu menuProcessoDocumentoSigiloso = new Menu("Processos e Documentos Sigilosos", pgProcessoDocumentoSigiloso, menuProcesso, 2, 4, null, null, null, null, modulo, "CLASSIFICAR_PROCESSO_DOCUMENTO");
231   - menuProcessoDocumentoSigiloso.setIncludes(this.gerarArquivosMenu(menuProcessoDocumentoSigiloso, this.CIT_ECM_WEB_ANGULAR, "ClassificarDocumentoProcesso", true, true, true));
232   - this.menuService.mergeIfNotExist(menuProcessoDocumentoSigiloso);
  227 +// Pagina pgProcessoDocumentoSigiloso = new Pagina("Processos e Documentos Sigilosos", "/cit-ecm-web/html/classificarProcessoDocumento/classificarProcessoDocumentoList.html");
  228 +// pgProcessoDocumentoSigiloso = this.paginaService.saveIfNotExist(pgProcessoDocumentoSigiloso);
  229 +//
  230 +// Menu menuProcessoDocumentoSigiloso = new Menu("Processos e Documentos Sigilosos", pgProcessoDocumentoSigiloso, menuProcesso, 2, 4, null, null, null, null, modulo, "CLASSIFICAR_PROCESSO_DOCUMENTO");
  231 +// menuProcessoDocumentoSigiloso.setIncludes(this.gerarArquivosMenu(menuProcessoDocumentoSigiloso, this.CIT_ECM_WEB_ANGULAR, "ClassificarDocumentoProcesso", true, true, true));
  232 +// this.menuService.mergeIfNotExist(menuProcessoDocumentoSigiloso);
233 233  
234 234 }
235 235  
... ...
cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp
  Diff comments   View file @afcdcd4
... ... @@ -73,7 +73,7 @@
73 73 <tr ng-repeat="credencialProcesso in credenciais">
74 74  
75 75 <td class="text-center"><i class="{{credencialProcesso.icon}}" title="{{credencialProcesso.grupo ? $translate.instant('LABEL.GRUPO') : $translate.instant('LABEL.USUARIO')}}"></i></td>
76   - <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}{{credencialProcesso.version}}</td>
  76 + <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}</td>
77 77 <td class="text-center">{{credencialProcesso.usuario.unidade.nome}}</td>
78 78 <td class="text-center">{{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}}</td>
79 79 <td class="text-center">
... ...
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp
  Diff comments   View file @afcdcd4
... ... @@ -65,7 +65,7 @@
65 65 <sec:authorize access="permiteRenunciar()">
66 66 <li><a href="javascript: return false;" ng-click='exibirDialogConfirmacaoRemoverCredencial()'><i class="fa fa-user-times">&nbsp </i> <translate>ECM.LABEL.RENUNCIAR_CREDENCIAL</translate> </a></li>
67 67 </sec:authorize>
68   - <li><a href="#void" ng-click='classificarDocumentoProceso();'><i class="fa fa fa-eye">&nbsp </i> <translate>ECM.LABEL.VALIDAR_NIVEL_ACESSO</translate> </a></li>
  68 +<!-- <li><a href="#void" ng-click='classificarDocumentoProceso();'><i class="fa fa fa-eye">&nbsp </i> <translate>ECM.LABEL.VALIDAR_NIVEL_ACESSO</translate> </a></li> -->
69 69  
70 70 </ul>
71 71 </div>
... ...