From 4c092b18d5bd00d015fc5bd901603c7244e2118e Mon Sep 17 00:00:00 2001 From: erick.sato Date: Fri, 20 May 2016 08:18:51 -0300 Subject: [PATCH] [Redmine #5004]Auditoria atendimento de requisiçaõ de consumo --- cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java | 5 +++++ cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java | 5 +++++ cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java | 7 +++++++ cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java | 5 +++++ cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java | 2 ++ 5 files changed, 24 insertions(+), 0 deletions(-) diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java index 3b5f7c4..d137da2 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java @@ -18,6 +18,9 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; +import org.hibernate.envers.AuditTable; +import org.hibernate.envers.Audited; + import br.com.centralit.api.framework.json.ViewsAlmoxarifado; import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; import br.com.centralit.framework.json.JsonCalendarSimpleDateSerializer; @@ -61,6 +64,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; * @author rogerio.costa * */ +@Audited +@AuditTable(value = "alm_rc_atendimento_aud") @Entity @Table(name="alm_rc_atendimento") @JsonIgnoreProperties({"$selecionarRequisicoes", "$dataFinalizacao"}) diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java index 58e13d1..dcfed61 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java @@ -11,6 +11,9 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import org.hibernate.envers.AuditTable; +import org.hibernate.envers.Audited; + import br.com.centralit.api.framework.json.ViewsAlmoxarifado; import br.com.centralit.framework.json.Views; import br.com.centralit.framework.model.arquitetura.PersistentObjectAuditOrganizacao; @@ -50,6 +53,8 @@ import com.fasterxml.jackson.annotation.JsonView; * @author rogerio.costa * */ +@Audited +@AuditTable(value = "alm_rc_atenditem_aud") @Entity @Table(name="alm_rc_atendimentoitem") @JsonIgnoreProperties({"$info", "$verInfo", "$quantidade", "$locaisEstoque", "$hasError"}) diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java index f3fd497..ecc6343 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java @@ -16,6 +16,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.hibernate.envers.AuditTable; +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; + import br.com.centralit.api.framework.json.ViewsAdmMateriais; import br.com.centralit.api.framework.json.ViewsAlmoxarifado; import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; @@ -61,6 +65,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; * @author rogerio.costa * */ +@Audited +@AuditTable(value = "alm_requisicaoconsumo_aud") @Entity @Table(name="alm_requisicaoconsumo") @JsonIgnoreProperties({"$checked"}) @@ -125,6 +131,7 @@ public class RequisicaoConsumo extends PersistentObjectAuditOrganizacao { private String numeroRequisicao; /** Atributo observacoes. */ + @NotAudited @OneToMany(fetch = FetchType.LAZY, mappedBy = "requisicaoConsumo", cascade = CascadeType.ALL, orphanRemoval = true) @JsonView({ ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumo.class }) private Collection observacoes; diff --git a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java index 7a5e594..532016b 100644 --- a/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java +++ b/cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java @@ -10,6 +10,9 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import org.hibernate.envers.AuditTable; +import org.hibernate.envers.Audited; + import br.com.centralit.api.framework.json.ViewsAdmMateriais; import br.com.centralit.api.framework.json.ViewsAlmoxarifado; import br.com.centralit.framework.json.Views; @@ -51,6 +54,8 @@ import com.fasterxml.jackson.annotation.JsonView; * @author rogerio.costa * */ +@Audited +@AuditTable(value = "alm_rc_item_aud") @JsonIgnoreProperties({ "$quantidadeAtendida", "$quantidadeADevolver", "$TIPO_DECIMAL", "$index" }) @Entity @Table(name="alm_rc_item") diff --git a/cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java b/cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java index 82210f5..1324c55 100644 --- a/cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java +++ b/cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java @@ -327,6 +327,8 @@ public class StartupListenerAlmoxarifado extends UtilStartup implements Applicat internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.STATUS_ATUAL", "Status atual", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.FILTRAR", "Filtrar", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.LIMPAR_BUSCA_AVANCADA", "Limpar busca avançada", dominio, modulo)); + + internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.ATENDIMENTO_REQUISICAO", "Atendimento de requisição consumo", dominio, modulo)); } private void gerarValidacao(Dominio dominio, Modulo modulo, List internacionalizacaoList) { -- libgit2 0.21.2