changes to add meter image,pipe size to meter

Techolution · Apr 11, 2018 · b8cf053 · b8cf053
1 parent 83ea2d7
commit b8cf053
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 6 deletions.
diff --git a/.../com/techolution/mauritius/smartwater/connection/service/ConnectionStatisticsService.java b/.../com/techolution/mauritius/smartwater/connection/service/ConnectionStatisticsService.java
@@ -762,6 +762,10 @@ private String getSeriesForMetrics(String metrics){
     		returnVal="supplyondata";
     	}else if ("meteroff".equalsIgnoreCase(metrics)){
     		returnVal="supplyoffdata";
+    	}else if("consumerleakageontime".equalsIgnoreCase(metrics)){
+    		returnVal="consumerleakageontime";
+    	}else if("consumerleakageofftime".equalsIgnoreCase(metrics)){
+    		returnVal="consumerleakageofftime";
     	}
     	return returnVal;
     }

diff --git a/...teddetails/src/main/java/com/techolution/mauritius/smartwater/domain/MeterConnection.java b/...teddetails/src/main/java/com/techolution/mauritius/smartwater/domain/MeterConnection.java
@@ -24,6 +24,28 @@ public class MeterConnection implements Serializable {
 	private String house_namenum;
 	private boolean isprivate;
 	private String metertype;
+	private String image;
+	private double pipesize;
+	private String pipesizeunit;
+
+	public String getImage() {
+		return image;
+	}
+	public void setImage(String image) {
+		this.image = image;
+	}
+	public double getPipesize() {
+		return pipesize;
+	}
+	public void setPipesize(double pipesize) {
+		this.pipesize = pipesize;
+	}
+	public String getPipesizeunit() {
+		return pipesizeunit;
+	}
+	public void setPipesizeunit(String pipesizeunit) {
+		this.pipesizeunit = pipesizeunit;
+	}
 	public String getMetertype() {
 		return metertype;
 	}

diff --git a/...ataservice/src/main/java/com/techolution/mauritius/smartwater/domain/MeterConnection.java b/...ataservice/src/main/java/com/techolution/mauritius/smartwater/domain/MeterConnection.java
@@ -24,6 +24,28 @@ public class MeterConnection implements Serializable {
 	private String house_namenum;
 	private boolean isprivate;
 	private String metertype;
+
+	private String image;
+	private double pipesize;
+	private String pipesizeunit;
+	public String getImage() {
+		return image;
+	}
+	public void setImage(String image) {
+		this.image = image;
+	}
+	public double getPipesize() {
+		return pipesize;
+	}
+	public void setPipesize(double pipesize) {
+		this.pipesize = pipesize;
+	}
+	public String getPipesizeunit() {
+		return pipesizeunit;
+	}
+	public void setPipesizeunit(String pipesizeunit) {
+		this.pipesizeunit = pipesizeunit;
+	}
 	public String getMetertype() {
 		return metertype;
 	}

diff --git a/...c/main/java/com/techolution/mauritius/smartwater/notification/domain/MeterConnection.java b/...c/main/java/com/techolution/mauritius/smartwater/notification/domain/MeterConnection.java
@@ -26,6 +26,29 @@ public class MeterConnection implements Serializable {
 	private String house_namenum;
 	private boolean isprivate;
 	private String metertype;
+
+	private String image;
+	private double pipesize;
+	private String pipesizeunit;
+
+	public String getImage() {
+		return image;
+	}
+	public void setImage(String image) {
+		this.image = image;
+	}
+	public double getPipesize() {
+		return pipesize;
+	}
+	public void setPipesize(double pipesize) {
+		this.pipesize = pipesize;
+	}
+	public String getPipesizeunit() {
+		return pipesizeunit;
+	}
+	public void setPipesizeunit(String pipesizeunit) {
+		this.pipesizeunit = pipesizeunit;
+	}
 	public String getMetertype() {
 		return metertype;
 	}

diff --git a/...ice/src/main/java/com/techolution/mauritius/smartwater/supply/domain/MeterConnection.java b/...ice/src/main/java/com/techolution/mauritius/smartwater/supply/domain/MeterConnection.java
@@ -24,6 +24,29 @@ public class MeterConnection implements Serializable {
 	private String house_namenum;
 	private boolean isprivate;
 	private String metertype;
+
+	private String image;
+	private double pipesize;
+	private String pipesizeunit;
+
+	public String getImage() {
+		return image;
+	}
+	public void setImage(String image) {
+		this.image = image;
+	}
+	public double getPipesize() {
+		return pipesize;
+	}
+	public void setPipesize(double pipesize) {
+		this.pipesize = pipesize;
+	}
+	public String getPipesizeunit() {
+		return pipesizeunit;
+	}
+	public void setPipesizeunit(String pipesizeunit) {
+		this.pipesizeunit = pipesizeunit;
+	}
 	public String getMetertype() {
 		return metertype;
 	}

diff --git a/...ice/src/main/java/com/techolution/mauritius/smartwater/supply/domain/WaterSupplyData.java b/...ice/src/main/java/com/techolution/mauritius/smartwater/supply/domain/WaterSupplyData.java
@@ -11,6 +11,34 @@ public class WaterSupplyData implements Serializable {
 	private String metertype;
 
 	private String currentstatus;
+
+	private String image;
+	private double pipesize;
+	private String pipesizeunit;
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public double getPipesize() {
+		return pipesize;
+	}
+
+	public void setPipesize(double pipesize) {
+		this.pipesize = pipesize;
+	}
+
+	public String getPipesizeunit() {
+		return pipesizeunit;
+	}
+
+	public void setPipesizeunit(String pipesizeunit) {
+		this.pipesizeunit = pipesizeunit;
+	}
 
 	public String getCurrentstatus() {
 		return currentstatus;

diff --git a/.../src/main/java/com/techolution/mauritius/smartwater/supply/service/SupplyDataService.java b/.../src/main/java/com/techolution/mauritius/smartwater/supply/service/SupplyDataService.java
@@ -137,6 +137,9 @@ public WaterSupplyData getLatestWaterSupplyData(int meterId) throws ClientProtoc
 		waterSupplyData.setCustomerId(connection.getCustomer_id());
 		waterSupplyData.setMetertype(connection.getMetertype());
 		waterSupplyData.setCurrentstatus(STATUS);
+		waterSupplyData.setImage(connection.getImage());
+		waterSupplyData.setPipesize(connection.getPipesize());
+		waterSupplyData.setPipesizeunit(connection.getPipesizeunit());
 
 		log.info("Exiting SupplyDataService.getLatestWaterSupplyData");
 		return waterSupplyData;

diff --git a/test/src/test/Test.java b/test/src/test/Test.java
@@ -100,14 +100,18 @@ public List<Data> getData(RequestData data) throws ParseException{
 
 		String groupVal = getGroupVal(data);
 
+		boolean useHours=false;
 
+		if(data.getSample_Distance().equalsIgnoreCase("Hour")){
+			useHours=true;
+		}
 		int deviceId=data.getHouse_ID();
 		//int deviceId=123;
 		String query = "select sum(value)  from flowvalues 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);
 
 
-		List<Data> retlist = getDailyMetrics(deviceId, query);
+		List<Data> retlist = getDailyMetrics(deviceId, query,useHours);
 		return retlist;
 	}
 
@@ -155,7 +159,7 @@ public List<Data> getDailyFowRateData(RequestData data) throws ParseException{
 		log.debug("Query is:"+query);
 
 
-		List<Data> retlist = getDailyMetrics(deviceId, query);
+		List<Data> retlist = getDailyMetrics(deviceId, query,false);
 		return retlist;
 	}
 
@@ -187,7 +191,7 @@ else if(data.getSample_Distance().equalsIgnoreCase("Hour")){
 		return groupVal;
 	}
 
-	private List<Data> getDailyMetrics(int deviceId, String query) {
+	private List<Data> getDailyMetrics(int deviceId, String query,boolean useHours) {
 		//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32770", "root", "root");
 		InfluxDB influxDB = InfluxDBFactory.connect(influxProperties.getUrl(),influxProperties.getUsername(),influxProperties.getPassword());
 		long startStarttime=System.currentTimeMillis();
@@ -201,7 +205,7 @@ private List<Data> getDailyMetrics(int deviceId, String query) {
 	//	int recordSize=0;
 		List<Data> retlist=new ArrayList<Data>();
 	//	SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
-		//SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-ddTHH:mm:ssZ");
+		SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		//dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 		//Date date1=new SimpleDateFormat("yyyy-MM-DDTHH:mm:ssz").parse(sDate1);
 		Data resultData=null;
@@ -223,7 +227,14 @@ private List<Data> getDailyMetrics(int deviceId, String query) {
 
 					resultData=new Data();
 					resultData.setDevid(deviceId);
-					resultData.setName(endTimeReturned.split("T")[0]);	
+					if(useHours){
+						Instant instant=Instant.parse(endTimeReturned);
+						Date date = Date.from(instant);
+						resultData.setName(dateFormat.format(date));
+					}else{
+						resultData.setName(endTimeReturned.split("T")[0]);	
+					}
+
 					resultData.setValue(Math.round(((Double)results.get(1)).doubleValue()*100D)/100D);
 					resultData.setSensor_locationname(locationName);
 					retlist.add(resultData);
@@ -926,4 +937,4 @@ public void insertTimeSeriesData(SeriesPointData pointData){
 
     }
 
-}
+}