diff --git a/src/main/java/info/peper/vz/rest/VzRestController.java b/src/main/java/info/peper/vz/rest/VzRestController.java index 68cd1df..ba0a065 100644 --- a/src/main/java/info/peper/vz/rest/VzRestController.java +++ b/src/main/java/info/peper/vz/rest/VzRestController.java @@ -165,25 +165,25 @@ class VzRestController { @GetMapping("/data/prices") List getPrices(@RequestParam("timestampStart")final long timestampStart, @RequestParam("timestampEnd")final long timestampEnd, - @RequestParam("contractId")final int contractId) { + @RequestParam("houseId")final int houseId) { final List prices = jdbcTemplate.query( - "SELECT * FROM tobias_energy_price WHERE contract_id=? AND timestamp_start < ? AND timestamp_end >= ? ORDER BY timestamp_start;", - (rs, rowNum) -> new EnergyPrice(rs.getInt("contract_id"), rs.getLong("timestamp_start"), rs.getLong("timestamp_end"), + "SELECT * FROM tobias_energy_price WHERE house_id=? AND timestamp_start < ? AND timestamp_end >= ? ORDER BY timestamp_start;", + (rs, rowNum) -> new EnergyPrice(rs.getInt("house_id"), rs.getLong("timestamp_start"), rs.getLong("timestamp_end"), rs.getFloat("price")), - contractId ,timestampEnd, timestampStart); + houseId ,timestampEnd, timestampStart); return prices; } @GetMapping("/data/summary") String getSummary(@RequestParam("timestampStart")final long timestampStart, @RequestParam("timestampEnd")final long timestampEnd, - @RequestParam("contractId")final int contractId, + @RequestParam("houseId")final int houseId, @RequestParam("channelIdMeter")final int channelIdMeter, @RequestParam("channelIdSolar")final int channelIdSolar) { final NumberFormat formatCurrency = new DecimalFormat("#,##0.00", new DecimalFormatSymbols(Locale.GERMAN)); final NumberFormat formatPercent = new DecimalFormat("#,##0.00", new DecimalFormatSymbols(Locale.GERMAN)); final NumberFormat formatEnergy = new DecimalFormat("#,##0", new DecimalFormatSymbols(Locale.GERMAN)); - final List prices = this.getPrices(timestampStart, timestampEnd, contractId); + final List prices = this.getPrices(timestampStart, timestampEnd, houseId); final List partsMeter = new LinkedList(); final List partsSolar = new LinkedList(); float savedMoney = 0; @@ -216,11 +216,11 @@ class VzRestController { @GetMapping("/data/summary2") String getSummary2(@RequestParam("timestampStart")final long timestampStart, @RequestParam("timestampEnd")final long timestampEnd, - @RequestParam("contractId")final int contractId) { + @RequestParam("houseId")final int houseId) { final NumberFormat formatCurrency = new DecimalFormat("#,##0.00", new DecimalFormatSymbols(Locale.GERMAN)); final NumberFormat formatPercent = new DecimalFormat("#,##0.00", new DecimalFormatSymbols(Locale.GERMAN)); final NumberFormat formatEnergy = new DecimalFormat("#,##0", new DecimalFormatSymbols(Locale.GERMAN)); - final List prices = this.getPrices(timestampStart, timestampEnd, contractId); + final List prices = this.getPrices(timestampStart, timestampEnd, houseId); float savedMoney = 0; @@ -230,7 +230,7 @@ class VzRestController { for (EnergyPrice price : prices) { final long tsStart = Math.max(price.getTimestampStart(), timestampStart); final long tsEnd = Math.min(price.getTimestampEnd(), timestampEnd); - final Sums2 sums = getData2(tsStart, tsEnd, contractId); + final Sums2 sums = getData2(tsStart, tsEnd, houseId); savedMoney += (float)(sums.getProduced() - sums.getInjected())/1000000 * price.getPrice(); totalProduced += sums.getProduced(); totalObtained += sums.getObtained();