From 26e15bd192193bbcfaeb394f3ad37f01fd54c039 Mon Sep 17 00:00:00 2001 From: gleimar Date: Thu, 11 Apr 2013 18:30:03 +0000 Subject: [PATCH] =?UTF-8?q?-=20corre=C3=A7=C3=A3o=20na=20gera=C3=A7=C3=A3o?= =?UTF-8?q?=20de=20corridas:=20Valida=C3=A7=C3=A3o=20para=20n=C3=A3o=20per?= =?UTF-8?q?mitir=20gerar=20servi=C3=A7o=20que=20n=C3=A3o=20tenha=20vig?= =?UTF-8?q?=C3=AAncia=20v=C3=A1lida=20-=20melhoria=20nos=20logs=20de=20deb?= =?UTF-8?q?ug=20durante=20a=20gera=C3=A7=C3=A3o=20-=20remo=C3=A7=C3=A3o=20?= =?UTF-8?q?de=20classe/zul=20que=20n=C3=A3o=20=C3=A9=20mais=20usado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@25694 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../GeracionCorridaController.java | 167 ------------------ web/WEB-INF/i3-label_pt_BR.label | 2 +- .../esquema_operacional/geracionCorrida.zul | 27 --- 3 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GeracionCorridaController.java delete mode 100644 web/gui/esquema_operacional/geracionCorrida.zul diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GeracionCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GeracionCorridaController.java deleted file mode 100644 index 2feaab900..000000000 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GeracionCorridaController.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; - -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaOperacional; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.CorridaService; -import com.rjconsultores.ventaboletos.service.EsquemaCorridaService; -import com.rjconsultores.ventaboletos.service.EsquemaOperacionalService; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Messagebox; - -/** - * - * @author Rafius - */ -@Controller("geracionCorridaController") -@Scope("prototype") -public class GeracionCorridaController extends MyGenericForwardComposer { - - private static final long serialVersionUID = 1L; - @Autowired - private CorridaService corridaService; - @Autowired - private EsquemaOperacionalService esquemaOperacionalService; - @Autowired - private EsquemaCorridaService esquemaCorridaService; - @Autowired - private ConstanteService constanteService; - private Datebox fec; - private static Logger log = Logger.getLogger(GeracionCorridaController.class); - - public Datebox getFec() { - return fec; - } - - public void setFec(Datebox fec) { - this.fec = fec; - } - - @Override - public void doAfterCompose(Component comp) throws Exception { - super.doAfterCompose(comp); - - Constante constante = constanteService.buscarPorNomeConstante("CANT_DIAS_GENERACION_CORRIDA"); - try { - Integer.parseInt(constante.getValorconstante()); - } catch (Exception e) { - log.error(" Generacion de corrida" + e); - Messagebox.show( - Labels.getLabel("geracionCorridaController.MSG.qtdDias", new Object[] { constante.getValorconstante() }), - Labels.getLabel("geracionCorridaController.window.title"), - Messagebox.OK, Messagebox.EXCLAMATION); - closeWindow(); - return; - } - - SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); - int resp = Messagebox.show( - Labels.getLabel("geracionCorridaController.MSG.gerarPergunta", new Object[] { sdfData.format(calcularDataFinal()) }), - Labels.getLabel("geracionCorridaController.window.title"), - Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); - - if (resp == Messagebox.YES) { - generarCorridasAutomatica(); - } - - closeWindow(); - } - - public Date calcularDataFinal() throws InterruptedException { - Date dataDe = new Date(); - Constante constante = constanteService.buscarPorNomeConstante("CANT_DIAS_GENERACION_CORRIDA"); - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataDe); - calendarData.add(Calendar.DATE, Integer.parseInt(constante.getValorconstante())); - Date dataAte = calendarData.getTime(); - - return dataAte; - } - - public void generarCorridasAutomatica() throws InterruptedException { - - SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - - Date dataDe = new Date(); - // Date dataDe = null; - // try { - // dataDe = new SimpleDateFormat("dd/MM/yyyy").parse("7/08/2012"); - // } catch (ParseException ex) { - // ex.printStackTrace(); - // } - // Date dataAte = calcularDataFinal(); - Date dataAte = calcularDataFinal(); - dataDe.setSeconds(0); - dataAte.setSeconds(0); - - log.info("** Data De: " + sdfData.format(dataDe) + " **Data Até: " + sdfData.format(dataAte)); - - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataAte); - calendarData.add(Calendar.DATE, 1); - dataAte = calendarData.getTime(); - try { - while (dataDe.before(dataAte)) { - - log.debug("*** Data: " + sdfData.format(dataDe)); - - List lsEsquemaOperacional = - esquemaOperacionalService.dentroVigenciaEsquemaOperacional( - dataDe); - - List lsEsquemaCorrida = new ArrayList(); - for (EsquemaOperacional eo : lsEsquemaOperacional) { - lsEsquemaCorrida.addAll(esquemaCorridaService.buscarPorEsquemaOperacional(eo)); - } - - Boolean dentroVigenciaEsquemaOperacional = !lsEsquemaCorrida.isEmpty(); - if (dentroVigenciaEsquemaOperacional) { - corridaService.generarCorrida(dataDe, lsEsquemaCorrida); - } else { - try { - Messagebox.show( - Labels.getLabel("geracionCorridaController.MSG.ForaVigencia"), - Labels.getLabel("geracionCorridaController.window.title"), - Messagebox.OK, Messagebox.EXCLAMATION); - } catch (InterruptedException ex) { - log.error(ex); - } - } - - calendarData.setTime(dataDe); - calendarData.add(Calendar.DATE, 1); - dataDe = calendarData.getTime(); - } - log.debug("*** Corrida gerada com sucesso: "); - - Messagebox.show( - Labels.getLabel("geracionCorridaController.MSG.ok"), - Labels.getLabel("geracionCorridaController.window.title"), - Messagebox.OK, Messagebox.INFORMATION); - - } catch (Exception ex) { - log.error("Erro ao gerar corridas: " + ex); - Messagebox.show( - Labels.getLabel("MSG.Error").concat(" \n\n ").concat(ex.toString()), - Labels.getLabel("editarPuntoVentaController.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 040569e35..6f94594ed 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20130408_1RC140 +versao = ADM_20130411_1RC141 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100 diff --git a/web/gui/esquema_operacional/geracionCorrida.zul b/web/gui/esquema_operacional/geracionCorrida.zul deleted file mode 100644 index 4e8ebc043..000000000 --- a/web/gui/esquema_operacional/geracionCorrida.zul +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - -