Fixed bugs in date insertion

Author: HariharanAnantharaman

DataSimulator/src/com/techolution/mauritius/data/simulator/service/FlowDataSimiulator.java

@@ -72,7 +72,7 @@ public void startProcess(int meterId, String startTime, String endTime, long sle
 			}
 		}
 
-		String query = "select last(value)  from meterreading where time <='"+startTime+"' and meter_id='"+meterId+"'";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
+		String query = "select last(value)  from meterreading where time <='"+startTime+"' and meter_id="+meterId+"";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
 		log.fine("Query is:"+query);
 
 
@@ -98,7 +98,7 @@ public void startProcess(int meterId, String startTime, String endTime, long sle
 		}
 		boolean loop=true;
 		while(startDate.before( endDate)){
-			
+			//System.out.println("Start date millis:"+startDate.getTime());
 
 			try {
 				Telemetry telemetry=new Telemetry();
@@ -134,6 +134,7 @@ private void sendRequest(Telemetry telemetry,Date date){
 		json.put("flow", telemetry.getFlow());    
 		json.put("reading", telemetry.getReading());
 		json.put("date", dateVal);
+		//System.out.println("String value is:"+json.toString());
 
 		CloseableHttpClient httpClient = HttpClientBuilder.create().build();
 

DataSimulator/target/classes/com/techolution/mauritius/data/simulator/service/FlowDataSimiulator.class

@@ -80,7 +80,7 @@ else if(data.getSample_Distance().equalsIgnoreCase("Hour")){
 
 		int deviceId=data.getHouse_ID();
 		//int deviceId=123;
-		String query = "select sum(value)  from flow where time >='"+startTime+"' and time<'"+endTime+"' and meter_id='"+deviceId+"' group by time("+groupVal+") fill(0)";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
+		String query = "select sum(value)  from flow where time >='"+startTime+"' and time<'"+endTime+"' and meter_id="+deviceId+" group by time("+groupVal+") fill(0)";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
 		log.debug("Query is:"+query);
 
 
@@ -204,7 +204,7 @@ private void insertFlow(Telemetry telemetry,InfluxDB influxDB ,BatchPoints  batc
 */
 
 		Point point1 = Point.measurement("flow")
-				.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+				.time(telemetry.getDate().getTime(), TimeUnit.MILLISECONDS)
 				.addField("meter_id", telemetry.getMeter_id())
 				.addField("value", telemetry.getFlow())
 				.build();
@@ -228,7 +228,7 @@ private void insertBattery(Telemetry telemetry,BatchPoints  batchPoints){
 		*/
 
 		Point point1 = Point.measurement("batterylevel")
-				.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+				.time(telemetry.getDate().getTime(), TimeUnit.MILLISECONDS)
 				.addField("meter_id", telemetry.getMeter_id())
 				.addField("value", telemetry.getBattery())
 				.build();
@@ -252,7 +252,7 @@ private void insertFlowrate(Telemetry telemetry,BatchPoints  batchPoints){
 				.build());*/
 
 		Point point1 = Point.measurement("flowrate")
-				.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+				.time(telemetry.getDate().getTime(), TimeUnit.MILLISECONDS)
 				.addField("meter_id", telemetry.getMeter_id())
 				.addField("value", telemetry.getFlowrate())
 				.build();

connectionstatistics/src/main/java/com/techolution/mauritius/smartwater/connection/service/ConnectionStatisticsService.java

@@ -82,7 +82,7 @@ public List<MeterConsumption> getDataForAllConnections(RequestData data){
 
 		availableConnections.parallelStream().forEach(meterConnection -> {
 
-			String query = "select sum(value)  from flow where time >='"+startTime+"' and time<'"+endTime+"' and meter_id='"+meterConnection.getHouse_id()+"'";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
+			String query = "select sum(value)  from flow where time >='"+startTime+"' and time<'"+endTime+"' and meter_id="+meterConnection.getHouse_id()+"";// now() - 10d and meter_id = '124' group by time(1d) fill(0)
 			log.debug("Query is:"+query);
 			QueryResult queryResult = influxDB.query(new Query(query, dbName));
 			List<Result> resultlist=queryResult.getResults();