LO53-PositioningApplication-BBPS / LO53-PositioningServer

Commit 026c5284a6ebcd640a969b982cea1eee25eabf92

Authored by Notmoo
1 parent 53954f95

Modification servlet suite modif méthd calcul position

Showing 4 changed files with 9 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/main/java/core/service/CalibrationService.java
  Show/Hide comments   View file @026c528
... ... @@ -17,10 +17,10 @@ public class CalibrationService {
17 17 public CalibrationService(){this.dao = new HibernateDao();}
18 18 public CalibrationService(HibernateDao dao){this.dao = dao;}
19 19  
20   - public boolean addCalibrationData(int locationId, String apMacAddress, double avg, double stdDev){
  20 + public boolean addCalibrationData(int locationId, String apMacAddress, double val){
21 21 Location loc = dao.getLocation(locationId);
22 22 AccessPoint ap = dao.getAccessPoints(apMacAddress).get(0);
23   - return dao.saveRssiRecord(new RssiRecord(loc, ap, avg, stdDev));
  23 + return dao.saveRssiRecord(new RssiRecord(loc, ap, val));
24 24 }
25 25 public boolean registerCalibrationData(RssiRecord... records){
26 26 return dao.saveRssiRecord(records);
... ...
src/main/java/core/service/MeasurementService.java
  Show/Hide comments   View file @026c528
... ... @@ -17,11 +17,11 @@ public class MeasurementService {
17 17 dao = new HibernateDao();
18 18 }
19 19  
20   - public void registerMeasurement(String apMacAddr, String clientMacAddr, double avg, double stdDev){
  20 + public void registerMeasurement(String apMacAddr, String clientMacAddr, double val){
21 21 List<AccessPoint> aps = dao.getAccessPoints(apMacAddr);
22 22  
23 23 if(aps.size()>0){
24   - dao.saveTempRssi(new TempRssi(aps.get(0), clientMacAddr, avg, stdDev));
  24 + dao.saveTempRssi(new TempRssi(aps.get(0), clientMacAddr, val));
25 25 }
26 26 }
27 27 }
... ...
src/main/java/servlet/APMeasurementServlet.java
  Show/Hide comments   View file @026c528
... ... @@ -18,12 +18,11 @@ public class APMeasurementServlet extends HttpServlet {
18 18  
19 19 String apMacAddr = servletRequest.getParameter("AP_MAC");
20 20 String clientMacAddr = servletRequest.getParameter("CLIENT_MAC");
21   - Double avg = Double.parseDouble(servletRequest.getParameter("AVG"));
22   - Double stdDev = Double.parseDouble(servletRequest.getParameter("STD_DEV"));
  21 + Double val = Double.parseDouble(servletRequest.getParameter("VAL"));
23 22  
24   - if(apMacAddr!=null && !apMacAddr.isEmpty() && clientMacAddr!=null && !clientMacAddr.isEmpty() && avg!=null && stdDev!=null) {
  23 + if(apMacAddr!=null && !apMacAddr.isEmpty() && clientMacAddr!=null && !clientMacAddr.isEmpty() && val!=null) {
25 24 MeasurementService mServ = new MeasurementService();
26   - mServ.registerMeasurement(apMacAddr, clientMacAddr, avg, stdDev);
  25 + mServ.registerMeasurement(apMacAddr, clientMacAddr, val);
27 26 servletResponse.setStatus(200);
28 27 }else{
29 28 servletResponse.setStatus(400);
... ...
src/main/java/servlet/CalibrationServlet.java
  Show/Hide comments   View file @026c528
... ... @@ -19,10 +19,9 @@ public class CalibrationServlet extends HttpServlet{
19 19 try {
20 20 int locId = Integer.parseInt(servletRequest.getParameter("LOCATION_ID"));
21 21 String apMacAddr = servletRequest.getParameter("AP_MAC_ADDRESS");
22   - double avg = Double.parseDouble(servletRequest.getParameter("AVG"));
23   - double stdDev = Double.parseDouble(servletRequest.getParameter("STD_DEV"));
  22 + double val = Double.parseDouble(servletRequest.getParameter("VAL"));
24 23  
25   - new CalibrationService().addCalibrationData(locId, apMacAddr, avg, stdDev);
  24 + new CalibrationService().addCalibrationData(locId, apMacAddr, val);
26 25 }catch(Exception e){
27 26 e.printStackTrace();
28 27 try{
... ...