Following changes as per Satish request

1. Changed request response structure of water and battery consumption
2. Changed date in response to String to have only date(no timestamp)

Author: HariharanAnantharaman

.metadata/.lock

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="ResizableDialogBounds">
+		<item value="283" key="x"/>
+		<item value="800" key="width"/>
+		<item value="0" key="y"/>
+		<item value="600" key="height"/>
+	</section>
+</section>

.metadata/.mylyn/.taskListIndex/segments.gen

@@ -0,0 +1,35 @@
+package com.techolution.mauritius.smartwater.connection.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class WaterConsumptionResponseData implements Serializable {
+	
+	private String name;
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<Data> getSeries() {
+		return series;
+	}
+
+	public void setSeries(List<Data> series) {
+		this.series = series;
+	}
+
+	public List<Data> getData() {
+		return series;
+	}
+
+	public void setData(List<Data> data) {
+		this.series = data;
+	}
+
+	private List<Data> series;
+
+}

.metadata/.mylyn/.taskListIndex/segments_1

@@ -0,0 +1,89 @@
+package com.techolution.mauritius.smartwater.service;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.client.ClientProtocolException;
+import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
+import org.influxdb.dto.Query;
+import org.influxdb.dto.QueryResult;
+import org.influxdb.dto.QueryResult.Result;
+import org.json.JSONException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.techolution.mauritius.smartwater.domain.MeterConnection;
+import com.techolution.mauritius.smartwater.domain.TotalConsolidatedConsumption;
+import com.techolution.mauritius.smartwater.repository.ConnectionDetailsRepository;
+
+@Component
+public class ConsolidatedDataService {
+	private Log log = LogFactory.getLog(ConsolidatedDataService.class);
+	
+	private static final String INFLUX_ENDPOINT="http://localhost:32768/query?db=mauritius_smartwater&q="; 
+	
+	@Autowired
+	private ConnectionDetailsRepository connectionDetailsRepository;
+	
+	
+	
+	public List<MeterConnection> getAllConnections(){
+		
+		log.info("Entering ConsolidatedDataService.getAllConnections ");
+		List returnList= (List)connectionDetailsRepository.findAll();
+		log.info("Exiting ConsolidatedDataService.getAllConnections ");
+		if(returnList == null) {
+			log.debug("returnList size is null");
+		}else{
+			log.debug("List size is:"+returnList.size());	
+		}
+		
+		return returnList;
+	}
+	
+	public TotalConsolidatedConsumption getConsumptionForThisMonth() throws ClientProtocolException, IOException, JSONException{
+		
+		
+		Calendar calendar=Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_MONTH, 1);
+		
+		SimpleDateFormat myFormat = new SimpleDateFormat("yyyy-MM-dd");
+		String reformattedStr = null;
+		reformattedStr = myFormat.format(calendar.getTime());
+		
+		Calendar calendarlastmonth=Calendar.getInstance();
+		calendarlastmonth.set(Calendar.DAY_OF_MONTH, 1);
+		calendarlastmonth.add(Calendar.MONTH, -1);
+		
+		
+		//String query=INFLUX_ENDPOINT+"select sum(value) from flow where time >='"+reformattedStr+"'";
+		String query="select sum(value) from flow where time >='"+reformattedStr+"'";
+		
+		String query_previousbucket="select sum(value) from flow where time >='"+reformattedStr+"'";
+		
+		
+		
+		InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
+		String dbName = "mauritius_smartwater";
+		QueryResult queryResult = influxDB.query(new Query(query, dbName));
+		List<Result> results=queryResult.getResults();
+		Result valueobj=results.get(0);
+		List<List<Object>> values=valueobj.getSeries().get(0).getValues();
+//		String consumption=(String)(values.get(0).get(1));
+		Double consumption=(Double)(values.get(0).get(1));
+		log.debug("consumption:"+consumption);
+		
+		//TotalConsolidatedConsumption consolidatedConsumption=new TotalConsolidatedConsumption(Long.valueOf(consumption).longValue(), 100.00, 0.00, 0.00);
+		TotalConsolidatedConsumption consolidatedConsumption=new TotalConsolidatedConsumption(consumption, 100.00, 0.00, 0.00);
+		return consolidatedConsumption;
+		
+	}
+	
+	
+	
+}