From 0966d38b5d9fca0dc12d925779b93875ba5bf6f4 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 27 Aug 2012 21:46:18 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@20764
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../ventaboletos/dao/SeguroKmDAO.java         | 14 ++++++++++++
 .../ventaboletos/dao/TaxaEmbarqueDAO.java     |  5 +++--
 .../hibernate/TaxaEmbarqueHibernateDAO.java   |  8 +++----
 .../dao/sqlbuilder/SQLBuilder.java            |  6 ++---
 .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 16 +++++++++++---
 .../ventaboletos/entidad/SeguroTarifa.java    | 19 ++++++++--------
 .../ventaboletos/service/SeguroService.java   | 15 +++++++++++++
 .../service/TaxaEmbarqueService.java          |  3 ++-
 .../service/impl/SeguroServiceImpl.java       | 22 +++++++++++++++++++
 .../service/impl/TaxaEmbarqueServiceImpl.java |  4 ++--
 10 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java
 create mode 100644 src/com/rjconsultores/ventaboletos/service/SeguroService.java
 create mode 100644 src/com/rjconsultores/ventaboletos/service/impl/SeguroServiceImpl.java

diff --git a/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java b/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java
new file mode 100644
index 000000000..c8f68cbb1
--- /dev/null
+++ b/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java
@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.service.SeguroService;
+
+
+public interface SeguroKmDAO {
+	/**
+	 * See {@link SeguroService#atualizarSeguroPorKm(Integer, Integer, Integer)}
+	 * @param rutaId
+	 * @param orgaoId
+	 * @param usuarioId
+	 */
+	public void atualizarSeguroPorKm(Integer rutaId,Integer orgaoId,Integer usuarioId) ;
+}
diff --git a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueDAO.java b/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueDAO.java
index 6d08dfb88..b187f3708 100644
--- a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueDAO.java
@@ -3,9 +3,10 @@ package com.rjconsultores.ventaboletos.dao;
 
 public interface TaxaEmbarqueDAO {
 	/**
-	 * See {@link TaxaEmbarqueServic#atualizarTaxaEmbarque(Integer, Integer)}
+	 * See {@link TaxaEmbarqueServic#atualizarTaxaEmbarque(Integer, Integer, Integer)}
 	 * @param rutaId
 	 * @param usuarioId TODO
+	 * @param orgaoConcedenteId TODO
 	 */
-	public void atualizarTaxaEmbarque(Integer rutaId, Integer usuarioId);
+	public void atualizarTaxaEmbarque(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId);
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueHibernateDAO.java
index b024bc437..d1b34ad93 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueHibernateDAO.java
@@ -21,17 +21,17 @@ public class TaxaEmbarqueHibernateDAO extends GenericHibernateDAO<Object, Intege
 	}
 
 	@Override
-	public void atualizarTaxaEmbarque(Integer rutaId, Integer usuarioId) {
+	public void atualizarTaxaEmbarque(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId) {
 		// Atualizo a taxa de embarque de acordo a parada e km
-		SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque1(rutaId, usuarioId));
+		SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque1(rutaId, usuarioId, orgaoConcedenteId));
 		query.executeUpdate();
 
 		// Atualizo a taxa de embarque de acordo a km do orgao
-		query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque2(rutaId, usuarioId));
+		query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque2(rutaId, usuarioId, orgaoConcedenteId));
 		query.executeUpdate();
 
 		// Atualizo a taxa de embarque de acordo a parada e valor fixo
-		query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque3(rutaId, usuarioId));
+		query = getSession().createSQLQuery(sqlBuilder.getSQLTaxaEmbarque3(rutaId, usuarioId, orgaoConcedenteId));
 		query.executeUpdate();
 	}
 
diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java
index ab474c4aa..36a1479da 100644
--- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java
+++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java
@@ -18,8 +18,8 @@ public interface SQLBuilder {
 	
 	public String getSQLTarifaOficial2(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId);
 	
-	public String getSQLTaxaEmbarque1(Integer rutaId, Integer usuarioId);
-	public String getSQLTaxaEmbarque2(Integer rutaId, Integer usuarioId);
-	public String getSQLTaxaEmbarque3(Integer rutaId, Integer usuarioId);
+	public String getSQLTaxaEmbarque1(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId);
+	public String getSQLTaxaEmbarque2(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId);
+	public String getSQLTaxaEmbarque3(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId);
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
index 9fee05aab..66f62b8bd 100644
--- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
+++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
@@ -154,7 +154,7 @@ public class SQLBuilderOracle implements SQLBuilder {
 	}
 
 	@Override
-	public String getSQLTaxaEmbarque1(Integer rutaId, Integer usuarioId) {
+	public String getSQLTaxaEmbarque1(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId) {
 		StringBuilder sb = new StringBuilder("");
 		sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE =  ");
 		sb.append("( ");
@@ -188,12 +188,15 @@ public class SQLBuilderOracle implements SQLBuilder {
 		if (rutaId != null){
 			sb.append("    and tarifa_oficial.ruta_id = ").append(rutaId);
 		}
+		if (orgaoConcedenteId != null){
+			sb.append("    and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId);
+		}
 		
 		return sb.toString();
 	}
 
 	@Override
-	public String getSQLTaxaEmbarque2(Integer rutaId, Integer usuarioId) {
+	public String getSQLTaxaEmbarque2(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId) {
 		StringBuilder sb = new StringBuilder("");
 		sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE =  ");
 		sb.append("coalesce( ");
@@ -229,11 +232,15 @@ public class SQLBuilderOracle implements SQLBuilder {
 		if (rutaId != null){
 			sb.append("    and tarifa_oficial.ruta_id = ").append(rutaId);
 		}
+		
+		if (orgaoConcedenteId != null){
+			sb.append("    and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId);
+		}
 		return sb.toString();
 	}
 
 	@Override
-	public String getSQLTaxaEmbarque3(Integer rutaId, Integer usuarioId) {
+	public String getSQLTaxaEmbarque3(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId) {
 		StringBuilder sb = new StringBuilder("");
 
 		sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE =  ");
@@ -261,6 +268,9 @@ public class SQLBuilderOracle implements SQLBuilder {
 		if (rutaId != null){
 			sb.append("    and tarifa_oficial.ruta_id = ").append(rutaId);
 		}
+		if (orgaoConcedenteId != null){
+			sb.append("    and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId);
+		}
 		return sb.toString();
 	}
 
diff --git a/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java b/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java
index c8fbf0445..e5c2f62f7 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java
@@ -32,8 +32,8 @@ public class SeguroTarifa implements Serializable {
     // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
     @Column(name = "VALORTARIFA")
     private BigDecimal valortarifa;
-    @Column(name = "VALORTAXA")
-    private BigDecimal valortaxa;
+    @Column(name = "VALORTARIFAATE")
+    private BigDecimal valortarifaate;
     @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID")
     @ManyToOne
     private OrgaoConcedente orgaoconcedenteId;
@@ -61,13 +61,6 @@ public class SeguroTarifa implements Serializable {
         this.valortarifa = valortarifa;
     }
 
-    public BigDecimal getValortaxa() {
-        return valortaxa;
-    }
-
-    public void setValortaxa(BigDecimal valortaxa) {
-        this.valortaxa = valortaxa;
-    }
 
     public OrgaoConcedente getOrgaoconcedenteId() {
         return orgaoconcedenteId;
@@ -101,5 +94,13 @@ public class SeguroTarifa implements Serializable {
     public String toString() {
         return "com.rjconsultores.ventaboletos.entidad.SeguroTarifa[ segurotarifaId=" + segurotarifaId + " ]";
     }
+
+	public BigDecimal getValortarifaate() {
+		return valortarifaate;
+	}
+
+	public void setValortarifaate(BigDecimal valortarifaate) {
+		this.valortarifaate = valortarifaate;
+	}
     
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/SeguroService.java b/src/com/rjconsultores/ventaboletos/service/SeguroService.java
new file mode 100644
index 000000000..ce94aed00
--- /dev/null
+++ b/src/com/rjconsultores/ventaboletos/service/SeguroService.java
@@ -0,0 +1,15 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.exception.BusinessException;
+
+public interface SeguroService {
+
+	/**
+	 * Atualiza o seguro de acordo a kilometragem do trecho
+	 * 
+	 * @param rutaId - Se informado, será filtrado pela ruta
+	 * @param orgaoId -Campo obrigatório
+	 */
+	public void atualizarSeguroPorKm(Integer rutaId,Integer orgaoId) throws BusinessException;
+	
+}
diff --git a/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueService.java b/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueService.java
index 60ad37f8a..2b98d9bf4 100644
--- a/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueService.java
+++ b/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueService.java
@@ -15,7 +15,8 @@ public interface TaxaEmbarqueService {
 	 * A taxa de embarque mais restritiva fica por último (TAXA_EMBARQUE_PARADA por valor fixo)
 	 * 
 	 * @param rutaId - Se informado, será atualizado apenas a taxa de embarque da ruta informada
+	 * @param orgaoConcedenteId TODO
 	 */
-	public void atualizarTaxaEmbarque(Integer rutaId);
+	public void atualizarTaxaEmbarque(Integer rutaId, Integer orgaoConcedenteId);
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SeguroServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/SeguroServiceImpl.java
new file mode 100644
index 000000000..0a1fe2737
--- /dev/null
+++ b/src/com/rjconsultores/ventaboletos/service/impl/SeguroServiceImpl.java
@@ -0,0 +1,22 @@
+package com.rjconsultores.ventaboletos.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.rjconsultores.ventaboletos.exception.BusinessException;
+import com.rjconsultores.ventaboletos.service.SeguroService;
+
+@Service("seguroService")
+public class SeguroServiceImpl implements SeguroService{
+
+	@Override
+	public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId) throws BusinessException {
+		
+		if (orgaoId == null){
+			throw new BusinessException("SeguroServiceImpl.msg.validacion.orgaoObligatorio");
+		}
+		
+		
+		
+	}
+
+}
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueServiceImpl.java
index d5a3d5ee1..fb44ad2f5 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueServiceImpl.java
@@ -15,8 +15,8 @@ public class TaxaEmbarqueServiceImpl implements TaxaEmbarqueService{
 	
 	@Override
 	@Transactional
-	public void atualizarTaxaEmbarque(Integer rutaId) {
-		taxaEmbarqueDAO.atualizarTaxaEmbarque(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId());
+	public void atualizarTaxaEmbarque(Integer rutaId, Integer orgaoConcedenteId) {
+		taxaEmbarqueDAO.atualizarTaxaEmbarque(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedenteId);
 	}
 
 }