Data model simplification

This commit is contained in:
2020-07-30 19:31:50 -04:00
parent e810c4a240
commit 6514eb7c76
16 changed files with 75 additions and 40 deletions

View File

@@ -129,7 +129,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data
switch (weatherValueType)
{
case WeatherValueType.LightLevel:
query = query.Replace("@Value", "LightLevel / 3.3");
query = query.Replace("@Value", "LightLevel / 3.3 * 100");
break;
default:
query = query.Replace("@Value", weatherValueType.ToString());

View File

@@ -2,10 +2,9 @@ SELECT Timestamp,
WindDirection,
WindSpeed,
Humidity,
HumidityTemperature,
Rain,
Pressure,
PressureTemperature,
PressureTemperature AS Temperature,
BatteryLevel,
LightLevel,
Latitude,

View File

@@ -1,7 +1,6 @@
SELECT Bucket,
AVG(HumidityTemperature) AS AverageHumidityTemperature,
AVG(Humidity) AS AverageHumidity,
AVG(PressureTemperature) AS AveragePressureTemperature,
AVG(Temperature) AS AverageTemperature,
AVG(Pressure) AS AveragePressure,
AVG(LightLevel) AS AverageLightLevel,
SUM(Rain) AS RainTotal
@@ -9,11 +8,10 @@ FROM (
SELECT CAST(FORMAT(Timestamp, 'yyyy-MM-ddTHH:') +
RIGHT('00' + CAST(DATEPART(MINUTE, Timestamp) / @BucketMinutes * @BucketMinutes AS VARCHAR), 2)
+ ':00+00:00' AS DATETIMEOFFSET) AS Bucket,
HumidityTemperature,
Humidity,
PressureTemperature,
PressureTemperature AS Temperature,
Pressure,
LightLevel / 3.3 AS LightLevel,
LightLevel / 3.3 * 100 AS LightLevel,
Rain
FROM Reading
WHERE Timestamp BETWEEN @Start AND @End

View File

@@ -2,10 +2,9 @@ SELECT TOP 1 Timestamp,
WindDirection,
WindSpeed,
Humidity,
HumidityTemperature,
Rain,
Pressure,
PressureTemperature,
PressureTemperature AS Temperature,
BatteryLevel,
LightLevel,
Latitude,