From 03f6ea91a89f2d62b1bf30096d39a62db8b90054 Mon Sep 17 00:00:00 2001 From: rogerio.costa Date: Wed, 6 Apr 2016 15:08:51 -0300 Subject: [PATCH] #4199 Change Request. Atribuir Processos a um usuário. --- cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java | 1 - cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java | 4 ---- cit-ecm-api/src/main/java/br/com/centralit/api/security/CustomExpressionHandler.java | 32 +++++++++++++++++++++++++++++++- cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/CredencialProcessoServiceImpl.java | 28 ++++++++++++++++++++++++++++ cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++-------- cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java | 2 ++ cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js | 2 -- cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TemplatePadraoController.js | 9 ++++++--- cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html | 4 +--- cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp | 5 +++-- cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeInformacaoProcesso.html | 5 +---- cit-ecm-web/src/main/webapp/html/templatePadrao/templatePadraoEdit.html | 23 ++++++++++++++++------- 12 files changed, 122 insertions(+), 35 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java index 579b7f5..f09ecbe 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java @@ -46,7 +46,6 @@ import br.com.centralit.framework.util.UtilObjeto; * @author rogerio.costa * */ -@SuppressWarnings("unchecked") @Repository("credencialProcessoDao") public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements CredencialProcessoDao { diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java index f27b9dc..0344c78 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java @@ -195,12 +195,8 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD criteriaPrivilegio.add(Restrictions.eq("grupoUsuario.usuario.id", idUsuario)); - search.getFilters().add(Filter.in("sigilo.id", criteriaPrivilegio.list())); - - - return super.searchAndCount(search); } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/security/CustomExpressionHandler.java b/cit-ecm-api/src/main/java/br/com/centralit/api/security/CustomExpressionHandler.java index 07fcd56..f2ba0ab 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/security/CustomExpressionHandler.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/security/CustomExpressionHandler.java @@ -11,10 +11,40 @@ import org.springframework.security.web.access.expression.WebSecurityExpressionR import br.com.centralit.api.service.CredencialProcessoService; /** - * @author Rob Winch + *

+ * + *

+ * + *

+ * Company: Central IT - Governança Corporativa - + *

+ * + *

+ * Title: + *

+ * + *

+ * Description: + *

+ * + *

+ * Iniciativa(s): NUMERO_INICIATIVA + *

+ * + *

+ * Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO + *

+ * + * @since 05/04/2016 - 14:09:28 + * + * @version 1.0.0 + * + * @author rogerio.costa + * */ public class CustomExpressionHandler extends DefaultWebSecurityExpressionHandler { + /** Atributo credencialProcessoService. */ @Autowired private CredencialProcessoService credencialProcessoService; diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/CredencialProcessoServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/CredencialProcessoServiceImpl.java index a72381c..e5d9540 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/CredencialProcessoServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/CredencialProcessoServiceImpl.java @@ -1,5 +1,6 @@ package br.com.centralit.api.service.impl; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -216,6 +217,33 @@ public class CredencialProcessoServiceImpl extends GenericServiceImplRegra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO *

* + * Método responsável por retornar os privilegios através do sigilo + * + * @author rogerio.costa + * + * @param sigilo + * @return Collection + */ + private Collection getRolesPorSigilo(Sigilo sigilo) { + + Collection roles = new ArrayList(); + // Cria uma lista de privilegios relacionados ao sigilo do processo + for (SigiloPrivilegio sigiloPrivilegio : sigilo.getSigiloPrivilegios()) { + + roles.add(sigiloPrivilegio.getPrivilegio().getNome()); + } + return roles; + } + + /** + *

+ * Iniciativa(s): NUMERO_INICIATIVA + *

+ * + *

+ * Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO + *

+ * * Método responsável por resolver as propriedades transiente * * @author rogerio.costa diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java index b7fea17..3a9cdbd 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java @@ -176,7 +176,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl + * Iniciativa(s): NUMERO_INICIATIVA + *

+ * + *

+ * Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO + *

+ * + * Método responsável por substituir os parametros dinamicos do documento + * + * @author rogerio.costa + * + * @param entity + */ + private void substituirParametrosDinamicos(DocumentoGed entity) { + + entity.setConteudo(entity.getConteudo().replace("@numeroDocumento@", entity.getNumero())); } @Override @@ -556,18 +581,19 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl{0}"; + }; }]); diff --git a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html index 9110821..5a03b3c 100644 --- a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html +++ b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html @@ -49,7 +49,7 @@
+ ng-custom-maxlength="255" ng-type="text" ng-disabled="!edit || (documentoGed.formaCriacao.codigo == 1 && documentoGed.tipoDocumento.formaNumeracao.codigo != 2)" />
@@ -60,8 +60,6 @@
- -
diff --git a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp index efce791..ffcb503 100644 --- a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp +++ b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.jsp @@ -38,7 +38,6 @@ ECM.LABEL.CONCLUIR -
- - - \ No newline at end of file diff --git a/cit-ecm-web/src/main/webapp/html/templatePadrao/templatePadraoEdit.html b/cit-ecm-web/src/main/webapp/html/templatePadrao/templatePadraoEdit.html index d4b2b6b..b6c0c8c 100644 --- a/cit-ecm-web/src/main/webapp/html/templatePadrao/templatePadraoEdit.html +++ b/cit-ecm-web/src/main/webapp/html/templatePadrao/templatePadraoEdit.html @@ -63,14 +63,14 @@
- +
- +
@@ -83,15 +83,24 @@
-
+
+ +
+
+ +
-