From 48205ba7c747926232f24ce58b48e82d675f77de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 29 Oct 2021 11:50:30 +0200 Subject: [PATCH] Correct PropertyType for DemoDataService --- .../de/ph87/homeautomation/DemoDataService.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/ph87/homeautomation/DemoDataService.java b/src/main/java/de/ph87/homeautomation/DemoDataService.java index ec0da66..c595d4d 100644 --- a/src/main/java/de/ph87/homeautomation/DemoDataService.java +++ b/src/main/java/de/ph87/homeautomation/DemoDataService.java @@ -43,7 +43,7 @@ public class DemoDataService { final KnxGroupDto helligkeit = createKnxGroupIfNotExists("Helligkeit", 1286, "9.004", PropertyType.LUX, false, true); if (scheduleRepository.count() == 0) { - final Schedule scheduleEgFlurLicht = createSchedule("EG Flur Licht", eg_flur_licht_schalten); + final Schedule scheduleEgFlurLicht = createSchedule("EG Flur Licht", eg_flur_licht_schalten, PropertyType.ON_OFF); createTime(scheduleEgFlurLicht, 11, 30, 0, MIN30, true); createTime(scheduleEgFlurLicht, 12, 30, 0, MIN30, false); createTime(scheduleEgFlurLicht, 16, 30, 0, MIN30, true); @@ -54,36 +54,36 @@ public class DemoDataService { createTime(scheduleEgFlurLicht, 2, 0, 0, MIN30, false); scheduleRepository.save(scheduleEgFlurLicht); - final Schedule scheduleEgAmbiente = createSchedule("EG Ambiente", eg_ambiente_schalten); + final Schedule scheduleEgAmbiente = createSchedule("EG Ambiente", eg_ambiente_schalten, PropertyType.ON_OFF); createTime(scheduleEgAmbiente, 7, 15, 0, MIN30, true); createTime(scheduleEgAmbiente, 9, 30, 0, MIN30, false); createSunset(scheduleEgAmbiente, Zenith.OFFICIAL, MIN30, true); createSunset(scheduleEgAmbiente, Zenith.ASTRONOMICAL, MIN30, false); scheduleRepository.save(scheduleEgAmbiente); - final Schedule scheduleOgAmbiente = createSchedule("OG Ambiente", og_ambiente_schalten); + final Schedule scheduleOgAmbiente = createSchedule("OG Ambiente", og_ambiente_schalten, PropertyType.ON_OFF); createTime(scheduleOgAmbiente, 7, 15, 0, MIN30, true); createTime(scheduleOgAmbiente, 9, 30, 0, MIN30, false); createSunset(scheduleOgAmbiente, Zenith.OFFICIAL, MIN30, true); createSunset(scheduleOgAmbiente, Zenith.ASTRONOMICAL, MIN30, false); scheduleRepository.save(scheduleOgAmbiente); - final Schedule scheduleWohnzimmerRollladen = createSchedule("Rollläden Wohnzimmer", wohnzimmer_rollladen_position_anfahren); + final Schedule scheduleWohnzimmerRollladen = createSchedule("Rollläden Wohnzimmer", wohnzimmer_rollladen_position_anfahren, PropertyType.PERCENT); createSunrise(scheduleWohnzimmerRollladen, Zenith.CIVIL, 0, 0); createSunset(scheduleWohnzimmerRollladen, Zenith.CIVIL, 0, 100); scheduleRepository.save(scheduleWohnzimmerRollladen); - final Schedule scheduleSchlafzimmerRollladen = createSchedule("Rollläden Schlafzimmer", schlafzimmer_rollladen_position_anfahren); + final Schedule scheduleSchlafzimmerRollladen = createSchedule("Rollläden Schlafzimmer", schlafzimmer_rollladen_position_anfahren, PropertyType.PERCENT); createTime(scheduleSchlafzimmerRollladen, 7, 0, 0, 0, 0); createSunset(scheduleSchlafzimmerRollladen, Zenith.CIVIL, 0, 100); scheduleRepository.save(scheduleSchlafzimmerRollladen); - final Schedule scheduleFlurRollladen = createSchedule("Rollläden Flur", flur_rollladen_position_anfahren); + final Schedule scheduleFlurRollladen = createSchedule("Rollläden Flur", flur_rollladen_position_anfahren, PropertyType.PERCENT); createSunrise(scheduleFlurRollladen, Zenith.CIVIL, 0, 0); createSunset(scheduleFlurRollladen, Zenith.CIVIL, 0, 100); scheduleRepository.save(scheduleFlurRollladen); - final Schedule scheduleBadLichtMitte = createSchedule("Bad Licht Mitte", bad_licht_mitte_schalten); + final Schedule scheduleBadLichtMitte = createSchedule("Bad Licht Mitte", bad_licht_mitte_schalten, PropertyType.ON_OFF); createTime(scheduleBadLichtMitte, 10, 30, 0, MIN30, true); createTime(scheduleBadLichtMitte, 11, 30, 0, MIN30, false); createTime(scheduleBadLichtMitte, 15, 30, 0, MIN30, true); @@ -96,11 +96,12 @@ public class DemoDataService { } } - private Schedule createSchedule(final String s, final KnxGroupDto knxGroupDto) { + private Schedule createSchedule(final String s, final KnxGroupDto knxGroupDto, final PropertyType propertyType) { final Schedule schedule = new Schedule(); schedule.setEnabled(true); schedule.setName(s); schedule.setPropertyName(knxGroupDto.propertyName); + schedule.setPropertyType(propertyType); return schedule; }