From 35f94aadfbaa8c52aed74c9882f511e1e833fe38 Mon Sep 17 00:00:00 2001 From: Tobias Peper Date: Sun, 16 Mar 2025 18:19:40 +0100 Subject: [PATCH] Nachkommastellen sollten jetzt auch berechnet werden. --- src/main/java/info/peper/vz/rest/VzRestController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/info/peper/vz/rest/VzRestController.java b/src/main/java/info/peper/vz/rest/VzRestController.java index 31cd1b8..06f75b3 100644 --- a/src/main/java/info/peper/vz/rest/VzRestController.java +++ b/src/main/java/info/peper/vz/rest/VzRestController.java @@ -1,5 +1,6 @@ package info.peper.vz.rest; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.NumberFormat; @@ -108,11 +109,11 @@ class VzRestController { totalInjected += sums.getInjected(); } final StringBuilder sb = new StringBuilder(); - sb.append("Erzeugter Strom von der Photovoltaik: " + formatEnergy.format(totalProduced/1000000) + " kWh\n"); - sb.append("Eingespeister Strom von der Photovoltaik: " + formatEnergy.format(totalInjected/1000000) + " kWh\n"); - sb.append("Genutzter Strom von der Photovoltaik: " + formatEnergy.format((totalProduced-totalInjected)/1000000) + " kWh (="); + sb.append("Erzeugter Strom von der Photovoltaik: " + formatEnergy.format((float)totalProduced/1000000) + " kWh\n"); + sb.append("Eingespeister Strom von der Photovoltaik: " + formatEnergy.format((float)totalInjected/1000000) + " kWh\n"); + sb.append("Genutzter Strom von der Photovoltaik: " + formatEnergy.format((float)(totalProduced-totalInjected)/1000000) + " kWh (="); sb.append(formatPercent.format((float)(totalProduced-totalInjected)/(float)totalProduced*100) + " %)\n"); - sb.append("Bezogener Strom: " + formatEnergy.format(totalObtained/1000000) + " kWh\n"); + sb.append("Bezogener Strom: " + formatEnergy.format((float)totalObtained/1000000) + " kWh\n"); sb.append("Autakie: " + formatPercent.format((float)(totalProduced-totalInjected)/(float)(totalObtained+totalProduced-totalInjected)*100) + " %\n"); sb.append("Eingespartes Geld: " + formatCurrency.format(savedMoney) + "€\n"); return sb.toString();