From 55ce419e026005cf0a8a81e839fb9a7beacce37e Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 22 Aug 2017 13:26:29 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@72783 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../service/impl/FiscalServiceImpl.java | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index 0b4d4bf81..7963a3e32 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -83,9 +83,20 @@ public class FiscalServiceImpl implements FiscalService { @Autowired private DataSource dataSourceRead; + @Autowired + private DataSource dataSource; + @Autowired private ExportacaoFiscal exportacaoFiscal; + private Connection getConnection() { + return DataSourceUtils.getConnection(dataSource); + } + + private Connection getConnectionRead() { + return DataSourceUtils.getConnection(dataSourceRead); + } + @Override @Transactional public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { @@ -137,7 +148,7 @@ public class FiscalServiceImpl implements FiscalService { public List getRegistroImpressaoRMDTipoBPR(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); return fiscalDAO.getRegistroImpressaoRMDTipoBPR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); } catch (Exception e) { log.error(e.getMessage(), e); @@ -158,7 +169,7 @@ public class FiscalServiceImpl implements FiscalService { public List buscarRelatorioRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); return fiscalDAO.buscarRelatorioRDI(connection, inicio, fim, empresa.getEmpresaId(), estados, isReceitaTerceiros); } catch (Exception e) { log.error("", e); @@ -179,7 +190,7 @@ public class FiscalServiceImpl implements FiscalService { public List getRegistroImpressaoRMDTipoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); return fiscalDAO.getRegistroImpressaoRMDTipoECF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); } catch (Exception e) { log.error(e.getMessage(), e); @@ -201,7 +212,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisECFManual(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection, isBoletoHist); return new ArchivoIntegracionECFManual().importacionFiscalECFManual(inicio, fim, empresa, list); @@ -226,7 +237,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, connection); return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, true, list); @@ -251,7 +262,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, connection); return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, false, list); @@ -275,7 +286,7 @@ public class FiscalServiceImpl implements FiscalService { public File importacionFiscalECFPendencias(Date inicio, Date fim, Empresa empresa, Estado estado) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, false, true, connection, false); return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, false, true, list); @@ -299,7 +310,7 @@ public class FiscalServiceImpl implements FiscalService { public File importacionFiscalECFCancelados(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, true, false, connection, isBoletoHist); return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, true, false, list); @@ -324,7 +335,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List listEcf = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); @@ -367,7 +378,7 @@ public class FiscalServiceImpl implements FiscalService { public File importacionFiscalECF(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, true, false, false, list); @@ -391,7 +402,7 @@ public class FiscalServiceImpl implements FiscalService { public File importacionNaoFiscal(Date inicio, Date fim, Empresa empresa, Estado estado) { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List importacionNaoFiscalVOs = fiscalDAO.buscaDatosNaoFiscais(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection); @@ -412,10 +423,6 @@ public class FiscalServiceImpl implements FiscalService { return null; } - private Connection getConnection() { - return DataSourceUtils.getConnection(dataSourceRead); - } - @Override public File importacionFiscalECFXls(Empresa empresa, File arquivoTxt) { return gerarArquivoEcfXlsGenerico(empresa, arquivoTxt); @@ -896,7 +903,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); List tempos = new ArrayList(0); Long begin = 0L; @@ -975,7 +982,7 @@ public class FiscalServiceImpl implements FiscalService { Connection connection = null; try { - connection = getConnection(); + connection = getConnectionRead(); String tempo = null; Long begin = 0L;