From 0b46f2aa8f565958b2016a957508837dcb1fb905 Mon Sep 17 00:00:00 2001 From: walace Date: Tue, 15 Feb 2022 21:07:36 +0000 Subject: [PATCH] fixes bug#24125 qua: dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@110892 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLogAuditoria.java | 44 +++ .../RelatorioLogAuditoria_es_MX.properties | 19 ++ .../RelatorioLogAuditoria_pt_BR.properties | 19 ++ .../templates/RelatorioLogAuditoria.jasper | Bin 0 -> 34833 bytes .../templates/RelatorioLogAuditoria.jrxml | 267 ++++++++++++++++++ .../utilitarios/LogAuditoriaBean.java | 107 +++++++ .../BusquedaLogAuditoriaController.java | 104 ++++++- web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/seguridad/busquedaLogAuditoria.zul | 1 + 10 files changed, 554 insertions(+), 10 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_es_MX.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/LogAuditoriaBean.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java new file mode 100644 index 000000000..0fb1329ee --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java @@ -0,0 +1,44 @@ +/** + * + */ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.LogAuditoria; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.LogAuditoriaBean; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioLogAuditoria extends RelatorioDemandas { + public RelatorioLogAuditoria(Map parametros, Connection conexao, List list) throws Exception { + super(parametros, conexao); + + List listaBean = new ArrayList(); + + for (Object object : list) { + LogAuditoria log = (LogAuditoria)object; + LogAuditoriaBean bean = new LogAuditoriaBean(); + + bean.setIdAuditado(log.getIdAuditado()); + bean.setCampoAlterado(log.getCampoAlterado()); + bean.setEmpresa(log.getEmpresa().getNombempresa()); + bean.setUsuario(log.getUsuario().getNombusuario()); + bean.setClasseAlterada(log.getClasseAlterada()); + bean.setClassePrincipal(log.getClassePrincipal()); + bean.setTela(log.getTela()); + bean.setDataAlteracao(log.getFecmodif()); + bean.setCampoAlterado(log.getCampoAlterado()); + bean.setValorAtual(log.getValorNovo()); + bean.setValorAnterior(log.getValorAnterior()); + bean.setTipoAlteracao(log.getTipoAlteracao()); + listaBean.add(bean); + } + setCollectionDataSource(new JRBeanCollectionDataSource(listaBean)); + + + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_es_MX.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_es_MX.properties new file mode 100644 index 000000000..6fe06ebf7 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_es_MX.properties @@ -0,0 +1,19 @@ +TITULO = Relatório Log de Auditoria +PERIODO = PERÍODO +header.data.hora=Data/Hora\: +cabecalho.impressorPor=Impresso por + +DATA_ALTERACAO = DATA ATLERAÇÃO +ID_AUDITADO = ID AUDITADO +EMPRESA = EMPRESA +USUARIO = USUARIO +TIPO_ALTERACAO = TIPO ALTERAÇÃO +TELA = TELA +CAMPO_ALTERADO = CAMPO ALTERADO +VALOR_ATUAL = VALOR ATUAL +VALOR_ANTERIOR = VALOR ANTERIOR +CLASSE_ALTERADA = CLASSE ALTERADA +CLASSE_PRINCIPAL = CLASSE PRINCIPAL + + +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_pt_BR.properties new file mode 100644 index 000000000..6fe06ebf7 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLogAuditoria_pt_BR.properties @@ -0,0 +1,19 @@ +TITULO = Relatório Log de Auditoria +PERIODO = PERÍODO +header.data.hora=Data/Hora\: +cabecalho.impressorPor=Impresso por + +DATA_ALTERACAO = DATA ATLERAÇÃO +ID_AUDITADO = ID AUDITADO +EMPRESA = EMPRESA +USUARIO = USUARIO +TIPO_ALTERACAO = TIPO ALTERAÇÃO +TELA = TELA +CAMPO_ALTERADO = CAMPO ALTERADO +VALOR_ATUAL = VALOR ATUAL +VALOR_ANTERIOR = VALOR ANTERIOR +CLASSE_ALTERADA = CLASSE ALTERADA +CLASSE_PRINCIPAL = CLASSE PRINCIPAL + + +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jasper new file mode 100644 index 0000000000000000000000000000000000000000..40a68f4ebbe1a47ae8043b64ade787bf132f6ddb GIT binary patch literal 34833 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml new file mode 100644 index 000000000..765749e72 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/LogAuditoriaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/LogAuditoriaBean.java new file mode 100644 index 000000000..4ede980e1 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/LogAuditoriaBean.java @@ -0,0 +1,107 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +import java.util.Date; + +public class LogAuditoriaBean { + + private String idAuditado; + private String empresa; + private String valorAnterior; + private String valorAtual; + private String campoAlterado; + private String classeAlterada; + private String classePrincipal; + private String tela; + private String tipoAlteracao; + private Date dataAlteracao; + private String usuario; + + public String getIdAuditado() { + return idAuditado; + } + + public void setIdAuditado(String idAuditado) { + this.idAuditado = idAuditado; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getValorAnterior() { + return valorAnterior; + } + + public void setValorAnterior(String valorAnterior) { + this.valorAnterior = valorAnterior; + } + + public String getValorAtual() { + return valorAtual; + } + + public void setValorAtual(String valorAtual) { + this.valorAtual = valorAtual; + } + + public String getCampoAlterado() { + return campoAlterado; + } + + public void setCampoAlterado(String campoAlterado) { + this.campoAlterado = campoAlterado; + } + + public String getClasseAlterada() { + return classeAlterada; + } + + public void setClasseAlterada(String classeAlterada) { + this.classeAlterada = classeAlterada; + } + + public String getClassePrincipal() { + return classePrincipal; + } + + public void setClassePrincipal(String classePrincipal) { + this.classePrincipal = classePrincipal; + } + + public String getTela() { + return tela; + } + + public void setTela(String tela) { + this.tela = tela; + } + + public String getTipoAlteracao() { + return tipoAlteracao; + } + + public void setTipoAlteracao(String tipoAlteracao) { + this.tipoAlteracao = tipoAlteracao; + } + + public Date getDataAlteracao() { + return dataAlteracao; + } + + public void setDataAlteracao(Date dataAlteracao) { + this.dataAlteracao = dataAlteracao; + } + + public String getUsuario() { + return usuario; + } + + public void setUsuario(String usuario) { + this.usuario = usuario; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java index b9a27e432..6e3db91ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java @@ -2,8 +2,13 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import javax.sql.DataSource; + +import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -13,11 +18,18 @@ import org.zkoss.util.resource.Labels; import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.LogAuditoria; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPe; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPeRejeitadoEnvioContingencia; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBpeNumeracaoReuso; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioLogAuditoria; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.LogAuditoriaService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @@ -31,6 +43,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderLogAuditoria; import com.trg.search.Filter; import br.com.rjconsultores.auditador.enums.AuditadorTipoAlteracao; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @Controller("busquedaLogAuditoriaController") @Scope("prototype") @@ -63,6 +76,8 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer { private MyTextbox txtValorNovo; private MyTextbox txtValorAnterior; private MyTextbox txtIdAuditado; + @Autowired + private DataSource dataSourceRead; @Override public void doAfterCompose(Component comp) throws Exception { @@ -79,7 +94,7 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer { return lsEmpresa; } - private void refreshLista() { + private void refreshLista(boolean isGerarRelatorio) throws Exception { HibernateSearchObject sistemaBusqueda = new HibernateSearchObject(LogAuditoria.class, pagingLogAuditoria.getPageSize()); Date dataInicio = dtInicio.getValue(); @@ -134,20 +149,89 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer { sistemaBusqueda.addFilterEqual("activo", Boolean.TRUE); plwLogAuditoria.init(sistemaBusqueda, logAuditoriaList, pagingLogAuditoria); + if (logAuditoriaList.getData().length == 0) { - try { - Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), - Labels.getLabel("busquedaLogAuditoriaController.window.title"), - Messagebox.OK, Messagebox.INFORMATION); - } catch (InterruptedException ex) { - log.error("", ex); + if(isGerarRelatorio){ + throw new Exception(Labels.getLabel("MSG.ningunRegistroRelatorio")); + }else{ + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),Labels.getLabel("busquedaLogAuditoriaController.window.title"), Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + log.error("", ex); + } } } - } - public void onClick$btnPesquisa(Event ev) { - refreshLista(); + public void onClick$btnPesquisa(Event ev) throws Exception { + refreshLista(false); + } + @SuppressWarnings("unchecked") + public void onClick$btnGerarRelatorio(Event ev) throws Exception { + + try { + refreshLista(true); + } catch (Exception e) { + Messagebox.show(e.getMessage(), Labels.getLabel("busquedaLogAuditoriaController.window.title"), Messagebox.OK, Messagebox.INFORMATION); + return; + } + + + Map parametros = new HashMap(); + StringBuilder filtro = new StringBuilder(); + + + parametros.put("DATA_FINAL", (java.util.Date) dtInicio.getValue()); + parametros.put("DATA_INICIAL", (java.util.Date) dtFim.getValue()); + parametros.put("NOME_RELATORIO", Labels.getLabel("busquedaLogAuditoriaController.window.title")); + parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario()); + + + + filtro.append("Empresa: "); + Comboitem item = null; + + if (cmbEmpresa.getSelectedItem() != null) { + item = cmbEmpresa.getSelectedItem(); + if (item != null) { + Empresa empresa = (Empresa) item.getValue(); + filtro.append(empresa.getNombempresa()).append(";"); + } + } else { + filtro.append(" Todas; "); + } + if (cmbTela.getSelectedItem() != null) { + item = cmbTela.getSelectedItem(); + if (item != null) { + filtro.append(cmbTela.getValue()).append(";"); + } + } else { + filtro.append(" Todas; "); + } + + if (cmbTipoAlteracao.getSelectedItem() != null) { + item = cmbTipoAlteracao.getSelectedItem(); + if (item != null) { + filtro.append(cmbTipoAlteracao.getValue()).append(";"); + } + } else { + filtro.append(" Todas; "); + } + + + parametros.put("FILTROS", filtro.toString()); + + Relatorio relatorio = null; + relatorio = new RelatorioLogAuditoria(parametros, dataSourceRead.getConnection(), logAuditoriaList.getListData()); + + + @SuppressWarnings("rawtypes") + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", Labels.getLabel("busquedaLogAuditoriaController.window.title"), args, MODAL); + } public List getTipoAlteracaoList() { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index c7810e2e3..9c731fe97 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -9295,6 +9295,8 @@ busquedaLogAuditoriaController.lblValorAnterior = Valor Anterior busquedaLogAuditoriaController.lblClasseAlterada = Clase cambiada busquedaLogAuditoriaController.lblClassePrincipal = Clase Principal busquedaLogAuditoriaController.lblIdAuditado = ID Auditado +busquedaLogAuditoriaController.lblGerarRelatorio = Generar Report + #DispositivoOperadorVendaEmbarcada dispositivoVendaEmbarcadaController.window.title= Operador por Dispositivo Venda Embarcada diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 33f97050a..ff1515006 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -10013,6 +10013,7 @@ busquedaLogAuditoriaController.lblValorAnterior = Valor Anterior busquedaLogAuditoriaController.lblClasseAlterada = Classe Alterada busquedaLogAuditoriaController.lblClassePrincipal = Classe Principal busquedaLogAuditoriaController.lblIdAuditado = ID Auditado +busquedaLogAuditoriaController.lblGerarRelatorio = Gerar Relatório #DispositivoOperadorVendaEmbarcada dispositivoVendaEmbarcadaController.window.title= Operador por Dispositivo Venda Embarcada diff --git a/web/gui/seguridad/busquedaLogAuditoria.zul b/web/gui/seguridad/busquedaLogAuditoria.zul index 8583481d3..dd5040ead 100644 --- a/web/gui/seguridad/busquedaLogAuditoria.zul +++ b/web/gui/seguridad/busquedaLogAuditoria.zul @@ -94,6 +94,7 @@