From 8bb0d1c5cda2020bf1071dbe8cbd0c92c90d3023 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Thu, 18 Jul 2019 19:21:59 +0000 Subject: [PATCH] fixes bug#15030 dev:lucas qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@95901 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/constantes/Constantes.java | 9 ++++++ .../ventaboletos/dao/ConstanteDAO.java | 2 ++ .../dao/hibernate/ConstanteHibernateDAO.java | 9 ++++++ .../rest/ContingenciaClienteRest.java | 16 +++++----- .../service/ConstanteService.java | 2 ++ .../service/impl/ConstanteServiceImpl.java | 6 ++++ .../service/impl/ContingenciaServiceImpl.java | 29 +++++++++++++++++-- 7 files changed, 62 insertions(+), 11 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java index 8a369a0d8..d09a9cf06 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java +++ b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java @@ -49,6 +49,9 @@ public class Constantes { public static Short TURNO_AUTOMATICO = new Short("99"); + public static final String IMAGEM_EMPRESA = "EMPRESA_BACKGROUND"; + public static final String IMAGEM_EMPRESA_GENERICA = "EMPRESA_BACKGROUND_GENERICA"; + public static List ORGAOS_CONCEDENTES_CALCULO_ARTESP = new ArrayList(Arrays.asList(new Integer[]{21, 30})) ; /* 3 ANTT @@ -101,4 +104,10 @@ public class Constantes { public static final String ESTACAO_EMBARCADA = "ESTACAO_EMBARCADA"; public static final Integer CATEGORIA_NORMAL = 1; + + public static final String BPE_AMBIENTE = "BPE_AMBIENTE"; + + public static final String BPE_URL = "BPE_URL"; + + public static final String BPE_URL_CONTIG = "BPE_URL_CONTIG_"; } diff --git a/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java index c1dfa1b5e..6252e0835 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java @@ -16,4 +16,6 @@ public interface ConstanteDAO extends GenericDAO { public Constante buscarPorNomeConstante(String nomeConstante); public List buscar(String nombconstante); + + public List buscarPorNomeConstanteLike(String nombconstante); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java index da2306a16..469e9613c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java @@ -56,4 +56,13 @@ public class ConstanteHibernateDAO extends GenericHibernateDAO buscarPorNomeConstanteLike(String nombconstante) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("activo", Boolean.TRUE)); + + c.add(Restrictions.ilike("nombconstante", "%" + nombconstante + "%")); + + return c.list(); + } } diff --git a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java b/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java index 2696b0b2e..44d51cbc0 100644 --- a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java +++ b/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java @@ -48,9 +48,9 @@ public class ContingenciaClienteRest { return instance; } - public Integer consultar(String uf, String ambiente, String cnpj) { + public Integer consultar(String bpeURL, String uf, String ambiente, String cnpj) { try { - return verificarStatus(getURI(PATH_CONSULTA_STATUS, uf, ambiente, cnpj), ETipoEnvio.GET); + return verificarStatus(getURI(bpeURL, PATH_CONSULTA_STATUS, uf, ambiente, cnpj), ETipoEnvio.GET); } catch (IOException e) { log.error(e); } catch (JSONException e) { @@ -61,9 +61,9 @@ public class ContingenciaClienteRest { return null; } - public Integer definir(String uf, String ambiente, String cnpj, Integer idStatus) { + public Integer definir(String bpeURL,String uf, String ambiente, String cnpj, Integer idStatus) { try { - return verificarStatus(getURI(PATH_DEFINIR_STATUS, uf, ambiente, cnpj, idStatus), ETipoEnvio.POST); + return verificarStatus(getURI(bpeURL, PATH_DEFINIR_STATUS, uf, ambiente, cnpj, idStatus), ETipoEnvio.POST); } catch (IOException e) { log.error(e); } catch (JSONException e) { @@ -116,9 +116,9 @@ public class ContingenciaClienteRest { return "Basic " + new String(Base64.encodeBase64(CREDENCIAIS.getBytes())); } - private String getURI(String path, String uf, String ambiente, String cnpj) { + private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj) { StringBuilder uri = new StringBuilder(); - uri.append(buscarConstanteURL()); + uri.append(bpeURL); uri.append(path); uri.append("?uf=").append(uf); uri.append("&ambiente=").append(ambiente); @@ -127,9 +127,9 @@ public class ContingenciaClienteRest { return uri.toString(); } - private String getURI(String path, String uf, String ambiente, String cnpj, Integer idStatus) { + private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj, Integer idStatus) { StringBuilder uri = new StringBuilder(); - uri.append(getURI(path, uf, ambiente, cnpj)); + uri.append(getURI(bpeURL, path, uf, ambiente, cnpj)); uri.append("&tpEmis=").append(idStatus); return uri.toString(); diff --git a/src/com/rjconsultores/ventaboletos/service/ConstanteService.java b/src/com/rjconsultores/ventaboletos/service/ConstanteService.java index 506cfd693..1f1069446 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConstanteService.java +++ b/src/com/rjconsultores/ventaboletos/service/ConstanteService.java @@ -21,4 +21,6 @@ public interface ConstanteService extends GenericService { String buscarURLPainelBPe(); String buscarNomeConstanteURLPainelBPe(); + + public List buscarPorNomeConstanteLike(String nomeConstante); } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java index c5434cfd5..e397ae1db 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java @@ -116,4 +116,10 @@ public class ConstanteServiceImpl implements ConstanteService { return constante.getValorconstante().equalsIgnoreCase("true"); } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public List buscarPorNomeConstanteLike(String nombconstante) { + return constanteDAO.buscarPorNomeConstanteLike(nombconstante); + } + } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java index 3a699f2ee..5aba2e1d2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java @@ -5,12 +5,15 @@ import java.util.List; import javax.mail.SendFailedException; +import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.dao.LogHistoricoContingenciaDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; @@ -18,6 +21,7 @@ import com.rjconsultores.ventaboletos.enums.EAmbienteContingencia; import com.rjconsultores.ventaboletos.enums.EStatusContingencia; import com.rjconsultores.ventaboletos.exception.BusinessException; import com.rjconsultores.ventaboletos.rest.ContingenciaClienteRest; +import com.rjconsultores.ventaboletos.service.ConstanteService; import com.rjconsultores.ventaboletos.service.ContingenciaService; import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; import com.rjconsultores.ventaboletos.service.EmpresaEmailService; @@ -44,6 +48,9 @@ public class ContingenciaServiceImpl implements ContingenciaService { @Autowired private EmpresaEmailConfigService empresaEmailConfigService; + @Autowired + private ConstanteService constanteService; + public List buscarHistorico(Integer empresaID, Integer estadoID) { return histContingenciaDAO.buscarHistorico(empresaID, estadoID); } @@ -84,9 +91,25 @@ public class ContingenciaServiceImpl implements ContingenciaService { } private void definirStatusContingencia(LogHistoricoContingencia historicoCont) { - ContingenciaClienteRest.getInstance().definir(historicoCont.getEstado().getCveestado(), - historicoCont.getAmbiente().toString(), historicoCont.getEmpresa().getCnpj(), - Integer.valueOf(historicoCont.getStatus())); + + List constantesContig = constanteService.buscarPorNomeConstanteLike(Constantes.BPE_URL_CONTIG); + if (CollectionUtils.isEmpty(constantesContig)) { + Constante constanteBPeURL = constanteService.buscarPorNomeConstante(Constantes.BPE_URL); + constantesContig.add(constanteBPeURL); + } + + for (Constante constante : constantesContig) { + try { + String bpeURL = constante.getValorconstante(); + ContingenciaClienteRest.getInstance().definir(bpeURL, historicoCont.getEstado().getCveestado(), + historicoCont.getAmbiente().toString(), historicoCont.getEmpresa().getCnpj(), + Integer.valueOf(historicoCont.getStatus())); + } catch (Exception e) { + log.error("", e); + } + + } + } private EStatusContingencia getStatusContingencia(LogHistoricoContingencia historicoCont) {