From 3dbfe983aa2a9dee9cd5fb5b1c03621503b9d99e Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Thu, 11 May 2023 10:53:42 -0300
Subject: [PATCH] =?UTF-8?q?Adi=C3=A7=C3=A3o=20de=20reintegra=C3=A7=C3=A3o?=
 =?UTF-8?q?=20e=20padronizado=20hibernate=20fix=20bug#AL-2540?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 10 ++--
 .../relatorios/RelatorioSapController.java    | 47 ++++++++++++++++---
 web/WEB-INF/i3-label_pt_BR.label              |  1 +
 web/gui/relatorios/filtroRelatorioSap.zul     |  3 ++
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8134347c2..10094794e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.4.4</version>
+	<version>1.4.5</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.3.1</modelWeb.version>
+		<modelWeb.version>1.3.2</modelWeb.version>
 		<flyway.version>1.3.1</flyway.version>
-    	<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-    	<project.reporting.outputEncoding>ISO-8859-1</project.reporting.outputEncoding>
+    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
 	<distributionManagement>
@@ -39,7 +39,7 @@
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
-					<encoding>ISO-8859-1</encoding>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java
index ca307640b..e4653e47d 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java
@@ -7,11 +7,19 @@ import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.SapService;
 import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO;
+import com.rjconsultores.ventaboletos.web.gui.controladores.job.IntegracaoSapJob;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderFechamentoCntcorrente;
 
+import org.apache.log4j.Logger;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerUtils;
+import org.quartz.impl.StdSchedulerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -31,6 +39,7 @@ import org.zkoss.zul.Messagebox;
 public class RelatorioSapController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = -6110350409404675022L;
+	private static Logger log = Logger.getLogger(RelatorioSapController.class);
 
 	private MyListbox boletoFechamentoList;
 	
@@ -143,19 +152,45 @@ public class RelatorioSapController extends MyGenericForwardComposer {
 				
 				Messagebox.show(Labels.getLabel("Registros não integrados"), 
 								Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR);
-					
-				return;
 			}else if( integrados < qtdEnviar ) {
 				Messagebox.show("Alguns registros não foram integrados, favor filtrar novamente para verificar", 
 						Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR);
-			
-				return;
 			}else if( integrados == qtdEnviar ) {
 				Messagebox.show("Todos registros foram integrados com sucesso", 
 						Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR);
-			
-				return;
 			}
+		} catch (Exception e) {
+			Messagebox.show( e.getMessage(), 
+					Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR);
+		}
+	}
+	
+	public void onClick$btnReintegrar(Event ev) throws Exception {
+		
+		try {
+			Scheduler sched = new StdSchedulerFactory().getScheduler();
+			JobDetail jobDetail = new JobDetail("IntegracaoSap", null, IntegracaoSapJob.class);
+			log.info("Execução manual de integraçao com SAP ");
+			Trigger trigger = TriggerUtils.makeImmediateTrigger("integracaoSapTrigger", 1, 1000);
+			trigger.setName("integracaoSapTrigger");
+			JobDetail job = sched.getJobDetail(jobDetail.getName(), jobDetail.getGroup());
+			log.info("Job=" + jobDetail.getName() + "." + jobDetail.getGroup());
+
+			if (job != null) {
+				log.info("Job ya existia");
+				boolean deleted = sched.deleteJob(job.getName(), Scheduler.DEFAULT_GROUP);
+				log.info("Deleted=" + deleted);
+			}
+
+			sched.scheduleJob(jobDetail, trigger);
+
+			sched.start();						
+			
+			Messagebox.show("Rotina de integração automática iniciada", 
+						Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.INFORMATION);			
+
+		} catch (SchedulerException ex) {
+			log.error(ex);			
 		} catch (RuntimeException e) {
 			Messagebox.show( e.getMessage(), 
 					Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR);
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index b93ffa493..a54730ae5 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -1027,6 +1027,7 @@ relatorioSapController.lbAte.label = até
 relatorioSapController.reenviarGerados.label = Buscar já enviados?
 relatorioSapController.btnPesquisar.label = Pequisar
 relatorioSapController.btnGerarRemessa.label = Enviar Integração
+relatorioSapController.btnReintegrar.label = Reintegração
 relatorioSapController.lbEmpresa.value = Empresa
 relatorioSapController.lbPtoVenda.value = Agência
 relatorioSapController.lbDataFecha.value = Dt. Fechamento
diff --git a/web/gui/relatorios/filtroRelatorioSap.zul b/web/gui/relatorios/filtroRelatorioSap.zul
index f25b6c814..b51188e81 100644
--- a/web/gui/relatorios/filtroRelatorioSap.zul
+++ b/web/gui/relatorios/filtroRelatorioSap.zul
@@ -80,6 +80,9 @@
 				<button id="btnExecutarRemessa"
 					image="/gui/img/enginer.png"
 					label="${c:l('relatorioSapController.btnGerarRemessa.label')}" />
+				<button id="btnReintegrar"
+					image="/gui/img/enginer.png"
+					label="${c:l('relatorioSapController.btnReintegrar.label')}" />					
 				<button id="btnImportarRetorno" visible="false"
 					image="/gui/img/enginer.png"
 					label="${c:l('relatorioSapController.btnImportarRetornoRemessa.label')}" />