Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged Notification Branch with Weather Branch

This commit is contained in:
schrom01 2022-11-29 12:19:45 +01:00
parent c16f99aabc
commit 8ecc14db91
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/BackgroundTasks.java
View File

@ -2,9 +2,11 @@ package ch.zhaw.gartenverwaltung.backgroundtasks;
import ch.zhaw.gartenverwaltung.backgroundtasks.weather.WeatherGradenTaskPlanner; import ch.zhaw.gartenverwaltung.backgroundtasks.weather.WeatherGradenTaskPlanner;
import ch.zhaw.gartenverwaltung.io.CropList; import ch.zhaw.gartenverwaltung.io.CropList;
import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
import ch.zhaw.gartenverwaltung.io.PlantList; import ch.zhaw.gartenverwaltung.io.PlantList;
import ch.zhaw.gartenverwaltung.io.TaskList; import ch.zhaw.gartenverwaltung.io.TaskList;
import ch.zhaw.gartenverwaltung.models.Garden; import ch.zhaw.gartenverwaltung.models.Garden;
import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import java.io.IOException; import java.io.IOException;
@ -21,7 +23,12 @@ public class BackgroundTasks extends TimerTask {
@Override @Override
public void run() { public void run() {
// TODO uncomment: weatherGardenTaskPlaner.refreshTasks(); try {
weatherGardenTaskPlaner.refreshTasks();
} catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
e.printStackTrace();
// TODO logger
}
try { try {
try { try {
notifier.sendNotifications(); notifier.sendNotifications();

2
src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java
View File

@ -28,6 +28,7 @@ public class WeatherGradenTaskPlanner {
public void refreshTasks() throws IOException, HardinessZoneNotSetException, PlantNotFoundException { public void refreshTasks() throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
getSevereWeatherEvents(); getSevereWeatherEvents();
getRainAmount(); getRainAmount();
System.out.println("refreshing Tasks");
} }
private void getSevereWeatherEvents() throws IOException { private void getSevereWeatherEvents() throws IOException {
@ -77,7 +78,6 @@ public class WeatherGradenTaskPlanner {
for (Crop crop : cropList.getCrops()) { for (Crop crop : cropList.getCrops()) {
Plant plant = plantList.getPlantById(HardinessZone.ZONE_8A,crop.getPlantId()).orElseThrow(PlantNotFoundException::new); Plant plant = plantList.getPlantById(HardinessZone.ZONE_8A,crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
// nur für aktuelle growthphase
if(plant.wateringCycle().litersPerSqM() < rainAmount){ if(plant.wateringCycle().litersPerSqM() < rainAmount){
adjustNextExecutionOfWateringTask(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7))); adjustNextExecutionOfWateringTask(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7)));
} }