Commit 4c092b18d5bd00d015fc5bd901603c7244e2118e
1 parent
eed71063
Exists in
master
[Redmine #5004]Auditoria atendimento de requisiçaõ de consumo
Showing
5 changed files
with
24 additions
and
0 deletions
Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumo.java
@@ -18,6 +18,9 @@ import javax.persistence.Temporal; | @@ -18,6 +18,9 @@ import javax.persistence.Temporal; | ||
18 | import javax.persistence.TemporalType; | 18 | import javax.persistence.TemporalType; |
19 | import javax.persistence.Transient; | 19 | import javax.persistence.Transient; |
20 | 20 | ||
21 | +import org.hibernate.envers.AuditTable; | ||
22 | +import org.hibernate.envers.Audited; | ||
23 | + | ||
21 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; | 24 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; |
22 | import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; | 25 | import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; |
23 | import br.com.centralit.framework.json.JsonCalendarSimpleDateSerializer; | 26 | import br.com.centralit.framework.json.JsonCalendarSimpleDateSerializer; |
@@ -61,6 +64,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; | @@ -61,6 +64,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
61 | * @author rogerio.costa | 64 | * @author rogerio.costa |
62 | * | 65 | * |
63 | */ | 66 | */ |
67 | +@Audited | ||
68 | +@AuditTable(value = "alm_rc_atendimento_aud") | ||
64 | @Entity | 69 | @Entity |
65 | @Table(name="alm_rc_atendimento") | 70 | @Table(name="alm_rc_atendimento") |
66 | @JsonIgnoreProperties({"$selecionarRequisicoes", "$dataFinalizacao"}) | 71 | @JsonIgnoreProperties({"$selecionarRequisicoes", "$dataFinalizacao"}) |
cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java
@@ -11,6 +11,9 @@ import javax.persistence.JoinColumn; | @@ -11,6 +11,9 @@ import javax.persistence.JoinColumn; | ||
11 | import javax.persistence.ManyToOne; | 11 | import javax.persistence.ManyToOne; |
12 | import javax.persistence.Table; | 12 | import javax.persistence.Table; |
13 | 13 | ||
14 | +import org.hibernate.envers.AuditTable; | ||
15 | +import org.hibernate.envers.Audited; | ||
16 | + | ||
14 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; | 17 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; |
15 | import br.com.centralit.framework.json.Views; | 18 | import br.com.centralit.framework.json.Views; |
16 | import br.com.centralit.framework.model.arquitetura.PersistentObjectAuditOrganizacao; | 19 | import br.com.centralit.framework.model.arquitetura.PersistentObjectAuditOrganizacao; |
@@ -50,6 +53,8 @@ import com.fasterxml.jackson.annotation.JsonView; | @@ -50,6 +53,8 @@ import com.fasterxml.jackson.annotation.JsonView; | ||
50 | * @author rogerio.costa | 53 | * @author rogerio.costa |
51 | * | 54 | * |
52 | */ | 55 | */ |
56 | +@Audited | ||
57 | +@AuditTable(value = "alm_rc_atenditem_aud") | ||
53 | @Entity | 58 | @Entity |
54 | @Table(name="alm_rc_atendimentoitem") | 59 | @Table(name="alm_rc_atendimentoitem") |
55 | @JsonIgnoreProperties({"$info", "$verInfo", "$quantidade", "$locaisEstoque", "$hasError"}) | 60 | @JsonIgnoreProperties({"$info", "$verInfo", "$quantidade", "$locaisEstoque", "$hasError"}) |
cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumo.java
@@ -16,6 +16,10 @@ import javax.persistence.Table; | @@ -16,6 +16,10 @@ import javax.persistence.Table; | ||
16 | import javax.persistence.Temporal; | 16 | import javax.persistence.Temporal; |
17 | import javax.persistence.TemporalType; | 17 | import javax.persistence.TemporalType; |
18 | 18 | ||
19 | +import org.hibernate.envers.AuditTable; | ||
20 | +import org.hibernate.envers.Audited; | ||
21 | +import org.hibernate.envers.NotAudited; | ||
22 | + | ||
19 | import br.com.centralit.api.framework.json.ViewsAdmMateriais; | 23 | import br.com.centralit.api.framework.json.ViewsAdmMateriais; |
20 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; | 24 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; |
21 | import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; | 25 | import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; |
@@ -61,6 +65,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; | @@ -61,6 +65,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
61 | * @author rogerio.costa | 65 | * @author rogerio.costa |
62 | * | 66 | * |
63 | */ | 67 | */ |
68 | +@Audited | ||
69 | +@AuditTable(value = "alm_requisicaoconsumo_aud") | ||
64 | @Entity | 70 | @Entity |
65 | @Table(name="alm_requisicaoconsumo") | 71 | @Table(name="alm_requisicaoconsumo") |
66 | @JsonIgnoreProperties({"$checked"}) | 72 | @JsonIgnoreProperties({"$checked"}) |
@@ -125,6 +131,7 @@ public class RequisicaoConsumo extends PersistentObjectAuditOrganizacao { | @@ -125,6 +131,7 @@ public class RequisicaoConsumo extends PersistentObjectAuditOrganizacao { | ||
125 | private String numeroRequisicao; | 131 | private String numeroRequisicao; |
126 | 132 | ||
127 | /** Atributo observacoes. */ | 133 | /** Atributo observacoes. */ |
134 | + @NotAudited | ||
128 | @OneToMany(fetch = FetchType.LAZY, mappedBy = "requisicaoConsumo", cascade = CascadeType.ALL, orphanRemoval = true) | 135 | @OneToMany(fetch = FetchType.LAZY, mappedBy = "requisicaoConsumo", cascade = CascadeType.ALL, orphanRemoval = true) |
129 | @JsonView({ ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumo.class }) | 136 | @JsonView({ ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumo.class }) |
130 | private Collection<RequisicaoObservacao> observacoes; | 137 | private Collection<RequisicaoObservacao> observacoes; |
cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/RequisicaoConsumoItem.java
@@ -10,6 +10,9 @@ import javax.persistence.Id; | @@ -10,6 +10,9 @@ import javax.persistence.Id; | ||
10 | import javax.persistence.ManyToOne; | 10 | import javax.persistence.ManyToOne; |
11 | import javax.persistence.Table; | 11 | import javax.persistence.Table; |
12 | 12 | ||
13 | +import org.hibernate.envers.AuditTable; | ||
14 | +import org.hibernate.envers.Audited; | ||
15 | + | ||
13 | import br.com.centralit.api.framework.json.ViewsAdmMateriais; | 16 | import br.com.centralit.api.framework.json.ViewsAdmMateriais; |
14 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; | 17 | import br.com.centralit.api.framework.json.ViewsAlmoxarifado; |
15 | import br.com.centralit.framework.json.Views; | 18 | import br.com.centralit.framework.json.Views; |
@@ -51,6 +54,8 @@ import com.fasterxml.jackson.annotation.JsonView; | @@ -51,6 +54,8 @@ import com.fasterxml.jackson.annotation.JsonView; | ||
51 | * @author rogerio.costa | 54 | * @author rogerio.costa |
52 | * | 55 | * |
53 | */ | 56 | */ |
57 | +@Audited | ||
58 | +@AuditTable(value = "alm_rc_item_aud") | ||
54 | @JsonIgnoreProperties({ "$quantidadeAtendida", "$quantidadeADevolver", "$TIPO_DECIMAL", "$index" }) | 59 | @JsonIgnoreProperties({ "$quantidadeAtendida", "$quantidadeADevolver", "$TIPO_DECIMAL", "$index" }) |
55 | @Entity | 60 | @Entity |
56 | @Table(name="alm_rc_item") | 61 | @Table(name="alm_rc_item") |
cit-almoxarifado-web/src/main/java/br/com/centralit/listener/StartupListenerAlmoxarifado.java
@@ -327,6 +327,8 @@ public class StartupListenerAlmoxarifado extends UtilStartup implements Applicat | @@ -327,6 +327,8 @@ public class StartupListenerAlmoxarifado extends UtilStartup implements Applicat | ||
327 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.STATUS_ATUAL", "Status atual", dominio, modulo)); | 327 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.STATUS_ATUAL", "Status atual", dominio, modulo)); |
328 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.FILTRAR", "Filtrar", dominio, modulo)); | 328 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.FILTRAR", "Filtrar", dominio, modulo)); |
329 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.LIMPAR_BUSCA_AVANCADA", "Limpar busca avançada", dominio, modulo)); | 329 | internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.LIMPAR_BUSCA_AVANCADA", "Limpar busca avançada", dominio, modulo)); |
330 | + | ||
331 | + internacionalizacaoList.add(new Internacionalizacao("ALMOXARIFADO.LABEL.ATENDIMENTO_REQUISICAO", "Atendimento de requisição consumo", dominio, modulo)); | ||
330 | } | 332 | } |
331 | 333 | ||
332 | private void gerarValidacao(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) { | 334 | private void gerarValidacao(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) { |