From cbc519db60f98c23abc4bf34d9c49eae7ab42e6d Mon Sep 17 00:00:00 2001
From: Tobias Peper <tobias@peper.info>
Date: Sat, 22 Mar 2025 22:27:50 +0100
Subject: [PATCH] =?UTF-8?q?PayedMoney=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/info/peper/vz/rest/VzRestController.java | 5 ++++-
 src/main/java/info/peper/vz/rest/bo/Statistics.java    | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/info/peper/vz/rest/VzRestController.java b/src/main/java/info/peper/vz/rest/VzRestController.java
index 31ade62..a8d067f 100644
--- a/src/main/java/info/peper/vz/rest/VzRestController.java
+++ b/src/main/java/info/peper/vz/rest/VzRestController.java
@@ -113,6 +113,7 @@ class VzRestController {
 		final List<EnergyPrice> prices = this.getPrices(timestampStart, timestampEnd, houseId);
 		
 		float savedMoney = 0;
+		float payedMoney = 0;
 		long totalProduced = 0;
 		long totalObtained = 0;
 		long totalInjected = 0;
@@ -122,6 +123,7 @@ class VzRestController {
 			final long tsStart = Math.max(price.getTimestampStart(), timestampStart);
 			final long tsEnd = Math.min(price.getTimestampEnd(), timestampEnd);
 			final Aggregate aggregate = getData(tsStart, tsEnd, houseId, solarFactor);
+			payedMoney += (float)(aggregate.getObtainedEnergy()/1000000 * price.getPrice());
 			savedMoney += (float)(aggregate.getProducedEnergy() - aggregate.getInjectedEnergy())/1000000 * price.getPrice();
 			totalProduced += aggregate.getProducedEnergy();
 			totalObtained += aggregate.getObtainedEnergy();
@@ -133,7 +135,8 @@ class VzRestController {
 				timestampMax = aggregate.getTimestampEnd();
 			}
 		}
-		return new Statistics(timestampMin, timestampMax, totalProduced, totalInjected, totalObtained, (long)(savedMoney*100));
+		return new Statistics(timestampMin, timestampMax, totalProduced, totalInjected, totalObtained,
+				(long)(savedMoney*100), (long)(payedMoney*100));
 	}
 
 	@GetMapping(value="/rest-vz/summary", produces = {"text/plain"})
diff --git a/src/main/java/info/peper/vz/rest/bo/Statistics.java b/src/main/java/info/peper/vz/rest/bo/Statistics.java
index 4ad7cf1..6897175 100644
--- a/src/main/java/info/peper/vz/rest/bo/Statistics.java
+++ b/src/main/java/info/peper/vz/rest/bo/Statistics.java
@@ -6,10 +6,11 @@ public class Statistics {
 	private final long producedEnergy;
 	private final long injectedEnergy;
 	private final long obtainedEnergy;
+	private final long payedMoney;
 	private final long savedMoney;
 	
 	public Statistics(long timestampStart, long timestampEnd, long producedEnergy, long injectedEnergy,
-			long obtainedEnergy, long savedMoney) {
+			long obtainedEnergy, long savedMoney, long payedMoney) {
 		super();
 		this.timestampStart = timestampStart;
 		this.timestampEnd = timestampEnd;
@@ -17,6 +18,7 @@ public class Statistics {
 		this.injectedEnergy = injectedEnergy;
 		this.obtainedEnergy = obtainedEnergy;
 		this.savedMoney = savedMoney;
+		this.payedMoney = payedMoney;
 	}
 	public long getTimestampStart() {
 		return timestampStart;
@@ -36,5 +38,7 @@ public class Statistics {
 	public long getSavedMoney() {
 		return savedMoney;
 	}
-	
+	public long getPayedMoney() {
+		return payedMoney;
+	}
 }