rahimi/GreenHomeBack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: rahimi:postgres-migration
Branches Tags
rahimi:main rahimi:postgres-migration
...
pull from: rahimi:main
Branches Tags
rahimi:postgres-migration rahimi:main

2 Commits
postgres-m ... main

Author SHA1 Message Date
ali313
77a7e60ab4 Update src/GreenHome.Api/Controllers/TelemetryController.cs 
Revert Temporary change
 2026-10-13 15:53:12 +03:30
ali313
f60e85c6a8 Update src/GreenHome.Api/Controllers/TelemetryController.cs 
Temporary: Reset device
 2026-10-13 15:49:24 +03:30
1 changed files with 196 additions and 196 deletions
Expand all files Collapse all files

392
src/GreenHome.Api/Controllers/TelemetryController.cs
View File

@@ -1,196 +1,196 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using GreenHome.Application; using GreenHome.Application;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace GreenHome.Api.Controllers; namespace GreenHome.Api.Controllers;
[ApiController] [ApiController]
[Route("api/[controller]")] [Route("api/[controller]")]
public class TelemetryController : ControllerBase public class TelemetryController : ControllerBase
{ {
private readonly ITelemetryService telemetryService; private readonly ITelemetryService telemetryService;
private readonly IAlertService alertService; private readonly IAlertService alertService;
private readonly IAlertConditionService alertConditionService; private readonly IAlertConditionService alertConditionService;
public TelemetryController(ITelemetryService telemetryService, IAlertService alertService, IAlertConditionService alertConditionService) public TelemetryController(ITelemetryService telemetryService, IAlertService alertService, IAlertConditionService alertConditionService)
{ {
this.telemetryService = telemetryService; this.telemetryService = telemetryService;
this.alertService = alertService; this.alertService = alertService;
this.alertConditionService = alertConditionService; this.alertConditionService = alertConditionService;
} }
[HttpGet] [HttpGet]
public async Task<ActionResult<PagedResult<TelemetryDto>>> List([FromQuery] int? deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, [FromQuery] DateTime? sinceUtc, [FromQuery] int page = 1, [FromQuery] int pageSize = 20, CancellationToken cancellationToken = default) public async Task<ActionResult<PagedResult<TelemetryDto>>> List([FromQuery] int? deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, [FromQuery] DateTime? sinceUtc, [FromQuery] int page = 1, [FromQuery] int pageSize = 20, CancellationToken cancellationToken = default)
{ {
var filter = new TelemetryFilter { DeviceId = deviceId, StartDateUtc = startUtc, EndDateUtc = endUtc, SinceUtc = sinceUtc, Page = page, PageSize = pageSize }; var filter = new TelemetryFilter { DeviceId = deviceId, StartDateUtc = startUtc, EndDateUtc = endUtc, SinceUtc = sinceUtc, Page = page, PageSize = pageSize };
var result = await telemetryService.ListAsync(filter, cancellationToken); var result = await telemetryService.ListAsync(filter, cancellationToken);
return Ok(result); return Ok(result);
} }
[HttpGet("AddData")] [HttpGet("AddData")]
public async Task<ActionResult<string>> Create([FromQuery] TelemetryDto telementry, [FromQuery] string? lastUpdateDate, CancellationToken cancellationToken) public async Task<ActionResult<string>> Create([FromQuery] TelemetryDto telementry, [FromQuery] string? lastUpdateDate, CancellationToken cancellationToken)
{ {
telementry.TimestampUtc = DateTime.UtcNow; telementry.TimestampUtc = DateTime.UtcNow;
telementry.RelayStates = ParseRelayStates(Request.Query); telementry.RelayStates = ParseRelayStates(Request.Query);
var id = await telemetryService.AddAsync(telementry, cancellationToken); var id = await telemetryService.AddAsync(telementry, cancellationToken);
var parts = new List<string> { $"ID:{id}" }; var parts = new List<string> { $"ID:{id}" };
var deviceId = telementry.DeviceId; var deviceId = telementry.DeviceId;
if (deviceId > 0) if (deviceId > 0)
{ {
// 1. Check alerts and power status // 1. Check alerts and power status
var alertResult = await alertService.CheckAndSendAlertsAsync(deviceId, telementry, cancellationToken); var alertResult = await alertService.CheckAndSendAlertsAsync(deviceId, telementry, cancellationToken);
if (alertResult != null) if (alertResult != null)
{ {
if (alertResult.Messages.Count > 0) if (alertResult.Messages.Count > 0)
{ {
parts.Add($"A:{alertResult.Messages.Count}"); parts.Add($"A:{alertResult.Messages.Count}");
parts.Add($"R:{alertResult.Recipients}"); parts.Add($"R:{alertResult.Recipients}");
parts.Add($"M:{string.Join("@", alertResult.Messages)}"); parts.Add($"M:{string.Join("@", alertResult.Messages)}");
} }
if (alertResult.PowerStatus != null) if (alertResult.PowerStatus != null)
{ {
parts.Add($"P:{alertResult.PowerStatus}"); parts.Add($"P:{alertResult.PowerStatus}");
} }
} }
// 2. Check relay conditions update // 2. Check relay conditions update
if (!string.IsNullOrEmpty(lastUpdateDate)) if (!string.IsNullOrEmpty(lastUpdateDate))
{ {
var parsedDate = ParseLastUpdateDate(lastUpdateDate); var parsedDate = ParseLastUpdateDate(lastUpdateDate);
var relayConditions = await alertConditionService.GetUpdatedRelayConditionsAsync(deviceId, parsedDate, cancellationToken); var relayConditions = await alertConditionService.GetUpdatedRelayConditionsAsync(deviceId, parsedDate, cancellationToken);
if (relayConditions.Count > 0) if (relayConditions.Count > 0)
{ {
parts.Add("RU:1"); parts.Add("RU:1");
parts.Add($"RL:{relayConditions.Count}"); parts.Add($"RL:{relayConditions.Count}");
parts.Add($"RC:{EncodeRelayConditions(relayConditions)}"); parts.Add($"RC:{EncodeRelayConditions(relayConditions)}");
} }
} }
} }
return Ok(string.Join("|", parts)); return Ok(string.Join("|", parts));
} }
/// <summary> /// <summary>
/// Encode relay conditions into a compact string format for STM32 parsing. /// Encode relay conditions into a compact string format for STM32 parsing.
/// Format (relays separated by |): /// Format (relays separated by |):
/// E{enabled}R{relayIndex}{groups} /// E{enabled}R{relayIndex}{groups}
/// Group (OR between groups): /// Group (OR between groups):
/// G{action} where action = 0 (turn on) | 1 (turn off) /// G{action} where action = 0 (turn on) | 1 (turn off)
/// followed by its conditions joined by & (AND inside a group): /// followed by its conditions joined by & (AND inside a group):
/// Sensor condition: S{sensor}O{op}V{value1}[,{value2}] /// Sensor condition: S{sensor}O{op}V{value1}[,{value2}]
/// Time condition: T{start}-{end} (minutes from midnight) /// Time condition: T{start}-{end} (minutes from midnight)
/// Time ranges with start > end cross midnight (e.g. T1200-360 = 20:00..06:00); /// Time ranges with start > end cross midnight (e.g. T1200-360 = 20:00..06:00);
/// the device must treat that as (now >= start || now < end). /// the device must treat that as (now >= start || now < end).
/// </summary> /// </summary>
private static string EncodeRelayConditions(IReadOnlyList<RelayConditionDto> conditions) private static string EncodeRelayConditions(IReadOnlyList<RelayConditionDto> conditions)
{ {
return string.Join("|", conditions.Select(c => return string.Join("|", conditions.Select(c =>
{ {
var groups = new List<string>(); var groups = new List<string>();
groups.AddRange(c.On.Select(g => EncodeGroup(g, 0))); groups.AddRange(c.On.Select(g => EncodeGroup(g, 0)));
groups.AddRange(c.Off.Select(g => EncodeGroup(g, 1))); groups.AddRange(c.Off.Select(g => EncodeGroup(g, 1)));
return $"E{c.Enabled}R{c.RelayIndex}{string.Concat(groups)}"; return $"E{c.Enabled}R{c.RelayIndex}{string.Concat(groups)}";
})); }));
} }
private static string EncodeGroup(RelayGroupDto group, int action) private static string EncodeGroup(RelayGroupDto group, int action)
{ {
return $"G{action}{string.Join("&", group.Conditions.Select(EncodeCondition))}"; return $"G{action}{string.Join("&", group.Conditions.Select(EncodeCondition))}";
} }
private static string EncodeCondition(RelayRuleDto condition) private static string EncodeCondition(RelayRuleDto condition)
{ {
if (condition.Kind == 1) if (condition.Kind == 1)
{ {
return $"T{condition.Start ?? 0}-{condition.End ?? 0}"; return $"T{condition.Start ?? 0}-{condition.End ?? 0}";
} }
var encoded = $"S{condition.Sensor}O{condition.Op}V{condition.V1}"; var encoded = $"S{condition.Sensor}O{condition.Op}V{condition.V1}";
if (condition.V2.HasValue) if (condition.V2.HasValue)
encoded += $",{condition.V2.Value}"; encoded += $",{condition.V2.Value}";
return encoded; return encoded;
} }
/// <summary> /// <summary>
/// Collect relay states from query params r1, r2, ... (missing relay = off/0). /// Collect relay states from query params r1, r2, ... (missing relay = off/0).
/// </summary> /// </summary>
private static string? ParseRelayStates(IQueryCollection query) private static string? ParseRelayStates(IQueryCollection query)
{ {
var entries = new List<(int Index, string Value)>(); var entries = new List<(int Index, string Value)>();
foreach (var key in query.Keys) foreach (var key in query.Keys)
{ {
var match = Regex.Match(key, @"^r(\d+)$", RegexOptions.IgnoreCase); var match = Regex.Match(key, @"^r(\d+)$", RegexOptions.IgnoreCase);
if (!match.Success || !int.TryParse(match.Groups[1].Value, out var index) || index <= 0) if (!match.Success || !int.TryParse(match.Groups[1].Value, out var index) || index <= 0)
continue; continue;
entries.Add((index, query[key].ToString() == "1" ? "1" : "0")); entries.Add((index, query[key].ToString() == "1" ? "1" : "0"));
} }
if (entries.Count == 0) if (entries.Count == 0)
return null; return null;
var states = new string[entries.Max(e => e.Index)]; var states = new string[entries.Max(e => e.Index)];
Array.Fill(states, "0"); Array.Fill(states, "0");
foreach (var entry in entries) foreach (var entry in entries)
states[entry.Index - 1] = entry.Value; states[entry.Index - 1] = entry.Value;
return string.Join(",", states); return string.Join(",", states);
} }
/// <summary> /// <summary>
/// Parse date string in format: yyyy/MM/dd-HH:mm /// Parse date string in format: yyyy/MM/dd-HH:mm
/// </summary> /// </summary>
private static DateTime? ParseLastUpdateDate(string dateStr) private static DateTime? ParseLastUpdateDate(string dateStr)
{ {
if (string.IsNullOrEmpty(dateStr)) if (string.IsNullOrEmpty(dateStr))
return null; return null;
// Try parsing as yyyy/MM/dd-HH:mm // Try parsing as yyyy/MM/dd-HH:mm
if (DateTime.TryParseExact(dateStr, "yyyy/MM/dd-HH:mm", null, System.Globalization.DateTimeStyles.None, out var result)) if (DateTime.TryParseExact(dateStr, "yyyy/MM/dd-HH:mm", null, System.Globalization.DateTimeStyles.None, out var result))
{ {
return DateTime.SpecifyKind(result, DateTimeKind.Utc); return DateTime.SpecifyKind(result, DateTimeKind.Utc);
} }
// Try parsing as yyyy-MM-dd HH:mm (ISO-like) // Try parsing as yyyy-MM-dd HH:mm (ISO-like)
if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm", null, System.Globalization.DateTimeStyles.None, out var result2)) if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm", null, System.Globalization.DateTimeStyles.None, out var result2))
{ {
return DateTime.SpecifyKind(result2, DateTimeKind.Utc); return DateTime.SpecifyKind(result2, DateTimeKind.Utc);
} }
return null; return null;
} }
[HttpGet("minmax")] [HttpGet("minmax")]
public async Task<ActionResult<TelemetryMinMax>> MinMax([FromQuery] int deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, CancellationToken cancellationToken) public async Task<ActionResult<TelemetryMinMax>> MinMax([FromQuery] int deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, CancellationToken cancellationToken)
{ {
var result = await telemetryService.GetMinMaxAsync(deviceId, startUtc, endUtc, cancellationToken); var result = await telemetryService.GetMinMaxAsync(deviceId, startUtc, endUtc, cancellationToken);
return Ok(result); return Ok(result);
} }
[HttpGet("days")] [HttpGet("days")]
public async Task<ActionResult<IReadOnlyList<DayCount>>> Days([FromQuery] int deviceId, [FromQuery] int year, [FromQuery] int month, CancellationToken cancellationToken) public async Task<ActionResult<IReadOnlyList<DayCount>>> Days([FromQuery] int deviceId, [FromQuery] int year, [FromQuery] int month, CancellationToken cancellationToken)
{ {
var result = await telemetryService.GetMonthDaysAsync(deviceId, year, month, cancellationToken); var result = await telemetryService.GetMonthDaysAsync(deviceId, year, month, cancellationToken);
return Ok(result); return Ok(result);
} }
[HttpGet("months")] [HttpGet("months")]
public async Task<ActionResult<IReadOnlyList<int>>> Months([FromQuery] int deviceId, [FromQuery] int year, CancellationToken cancellationToken) public async Task<ActionResult<IReadOnlyList<int>>> Months([FromQuery] int deviceId, [FromQuery] int year, CancellationToken cancellationToken)
{ {
var result = await telemetryService.GetActiveMonthsAsync(deviceId, year, cancellationToken); var result = await telemetryService.GetActiveMonthsAsync(deviceId, year, cancellationToken);
return Ok(result); return Ok(result);
} }
[HttpGet("aggregate")] [HttpGet("aggregate")]
public async Task<ActionResult<IReadOnlyList<TelemetryBucketDto>>> Aggregate([FromQuery] int deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, [FromQuery] int bucketMinutes = 15, CancellationToken cancellationToken = default) public async Task<ActionResult<IReadOnlyList<TelemetryBucketDto>>> Aggregate([FromQuery] int deviceId, [FromQuery] DateTime? startUtc, [FromQuery] DateTime? endUtc, [FromQuery] int bucketMinutes = 15, CancellationToken cancellationToken = default)
{ {
var result = await telemetryService.GetAggregatedAsync(deviceId, startUtc, endUtc, bucketMinutes, cancellationToken); var result = await telemetryService.GetAggregatedAsync(deviceId, startUtc, endUtc, bucketMinutes, cancellationToken);
return Ok(result); return Ok(result);
} }
} }