From 026c5284a6ebcd640a969b982cea1eee25eabf92 Mon Sep 17 00:00:00 2001
From: Notmoo <skraig.boeuf@gmail.com>
Date: Wed, 7 Jun 2017 17:17:41 +0200
Subject: [PATCH] Modification servlet suite modif méthd calcul position

---
 src/main/java/core/service/CalibrationService.java | 4 ++--
 src/main/java/core/service/MeasurementService.java | 4 ++--
 src/main/java/servlet/APMeasurementServlet.java    | 7 +++----
 src/main/java/servlet/CalibrationServlet.java      | 5 ++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/core/service/CalibrationService.java b/src/main/java/core/service/CalibrationService.java
index f50c486..0a4c30a 100644
--- a/src/main/java/core/service/CalibrationService.java
+++ b/src/main/java/core/service/CalibrationService.java
@@ -17,10 +17,10 @@ public class CalibrationService {
     public CalibrationService(){this.dao = new HibernateDao();}
     public CalibrationService(HibernateDao dao){this.dao = dao;}
 
-    public boolean addCalibrationData(int locationId, String apMacAddress, double avg, double stdDev){
+    public boolean addCalibrationData(int locationId, String apMacAddress, double val){
         Location loc = dao.getLocation(locationId);
         AccessPoint ap = dao.getAccessPoints(apMacAddress).get(0);
-        return dao.saveRssiRecord(new RssiRecord(loc, ap, avg, stdDev));
+        return dao.saveRssiRecord(new RssiRecord(loc, ap, val));
     }
     public boolean registerCalibrationData(RssiRecord... records){
         return dao.saveRssiRecord(records);
diff --git a/src/main/java/core/service/MeasurementService.java b/src/main/java/core/service/MeasurementService.java
index 46e6a16..ef8473a 100644
--- a/src/main/java/core/service/MeasurementService.java
+++ b/src/main/java/core/service/MeasurementService.java
@@ -17,11 +17,11 @@ public class MeasurementService {
         dao = new HibernateDao();
     }
     
-    public void registerMeasurement(String apMacAddr, String clientMacAddr, double avg, double stdDev){
+    public void registerMeasurement(String apMacAddr, String clientMacAddr, double val){
         List<AccessPoint> aps = dao.getAccessPoints(apMacAddr);
         
         if(aps.size()>0){
-            dao.saveTempRssi(new TempRssi(aps.get(0), clientMacAddr, avg, stdDev));
+            dao.saveTempRssi(new TempRssi(aps.get(0), clientMacAddr, val));
         }
     }
 }
diff --git a/src/main/java/servlet/APMeasurementServlet.java b/src/main/java/servlet/APMeasurementServlet.java
index 39f139e..40676b5 100644
--- a/src/main/java/servlet/APMeasurementServlet.java
+++ b/src/main/java/servlet/APMeasurementServlet.java
@@ -18,12 +18,11 @@ public class APMeasurementServlet extends HttpServlet {
         
         String apMacAddr = servletRequest.getParameter("AP_MAC");
         String clientMacAddr = servletRequest.getParameter("CLIENT_MAC");
-        Double avg = Double.parseDouble(servletRequest.getParameter("AVG"));
-        Double stdDev = Double.parseDouble(servletRequest.getParameter("STD_DEV"));
+        Double val = Double.parseDouble(servletRequest.getParameter("VAL"));
         
-        if(apMacAddr!=null && !apMacAddr.isEmpty() && clientMacAddr!=null && !clientMacAddr.isEmpty() && avg!=null && stdDev!=null) {
+        if(apMacAddr!=null && !apMacAddr.isEmpty() && clientMacAddr!=null && !clientMacAddr.isEmpty() && val!=null) {
             MeasurementService mServ = new MeasurementService();
-            mServ.registerMeasurement(apMacAddr, clientMacAddr, avg, stdDev);
+            mServ.registerMeasurement(apMacAddr, clientMacAddr, val);
             servletResponse.setStatus(200);
         }else{
             servletResponse.setStatus(400);
diff --git a/src/main/java/servlet/CalibrationServlet.java b/src/main/java/servlet/CalibrationServlet.java
index dde456c..4f9a4d5 100644
--- a/src/main/java/servlet/CalibrationServlet.java
+++ b/src/main/java/servlet/CalibrationServlet.java
@@ -19,10 +19,9 @@ public class CalibrationServlet extends HttpServlet{
         try {
             int locId = Integer.parseInt(servletRequest.getParameter("LOCATION_ID"));
             String apMacAddr = servletRequest.getParameter("AP_MAC_ADDRESS");
-            double avg = Double.parseDouble(servletRequest.getParameter("AVG"));
-            double stdDev = Double.parseDouble(servletRequest.getParameter("STD_DEV"));
+            double val = Double.parseDouble(servletRequest.getParameter("VAL"));
 
-            new CalibrationService().addCalibrationData(locId, apMacAddr, avg, stdDev);
+            new CalibrationService().addCalibrationData(locId, apMacAddr, val);
         }catch(Exception e){
             e.printStackTrace();
             try{
--
libgit2 0.21.4