Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fixed bug when deleting an installation 

Set date button works using s3cmd
This commit is contained in:
Noe 2024-08-05 16:31:57 +02:00
parent 22c82ae521
commit a47314bdf5
5 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
csharp/App/Backend/Backend.csproj
View File

@ -226,6 +226,12 @@
<ItemGroup>
<Compile Remove="DataTypes\CsvName.cs" />
</ItemGroup>

16
csharp/App/Backend/Controller.cs
View File

@ -177,9 +177,16 @@ public class Controller : ControllerBase
string commonPrefix = FindCommonPrefix(start.ToString(), end.ToString()); string commonPrefix = FindCommonPrefix(start.ToString(), end.ToString());
string bucketPath = "s3://"+installation.S3BucketId + "-3e5b3069-214a-43ee-8d85-57d72000c19d/"+commonPrefix; Int64 startTimestamp = Int64.Parse(start.ToString().Substring(0,5));
Int64 endTimestamp = Int64.Parse(end.ToString().Substring(0,5));
string configPath = "/home/ubuntu/.s3cfg"; string configPath = "/home/ubuntu/.s3cfg";
while (startTimestamp <= endTimestamp)
{
string bucketPath = "s3://"+installation.S3BucketId + "-3e5b3069-214a-43ee-8d85-57d72000c19d/"+startTimestamp;
Console.WriteLine("Fetching data for "+startTimestamp);
try try
{ {
// Set up process start info // Set up process start info
@ -215,8 +222,6 @@ public class Controller : ControllerBase
} }
else else
{ {
Console.WriteLine("Command output:");
//Console.WriteLine(output);
// Define a regex pattern to match the filenames without .csv extension // Define a regex pattern to match the filenames without .csv extension
var pattern = @"/([^/]+)\.csv$"; var pattern = @"/([^/]+)\.csv$";
var regex = new Regex(pattern); var regex = new Regex(pattern);
@ -239,7 +244,8 @@ public class Controller : ControllerBase
Console.WriteLine($"Exception: {e.Message}"); Console.WriteLine($"Exception: {e.Message}");
} }
startTimestamp++;
}
int totalRecords = allTimestamps.Count; int totalRecords = allTimestamps.Count;
if (totalRecords <= sampleSize) if (totalRecords <= sampleSize)
@ -250,8 +256,6 @@ public class Controller : ControllerBase
return allTimestamps; return allTimestamps;
} }
int interval = totalRecords / sampleSize; int interval = totalRecords / sampleSize;
var sampledTimestamps = new List<Int64>(); var sampledTimestamps = new List<Int64>();

2
csharp/App/Backend/Database/Create.cs
View File

@ -26,7 +26,7 @@ public static partial class Db
public static Boolean Create(Installation installation) public static Boolean Create(Installation installation)
{ {
installation.S3BucketId = Installations.Count(f => f.Product == installation.Product)+1; installation.S3BucketId = Installations.Where(inst => inst.Product == installation.Product).Max(inst => (int?)inst.S3BucketId)+1 ?? 0;
// SQLite wrapper is smart and *modifies* t's Id to the one generated (autoincrement) by the insertion // SQLite wrapper is smart and *modifies* t's Id to the one generated (autoincrement) by the insertion
return Insert(installation); return Insert(installation);

16
csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs
View File

@ -9,7 +9,7 @@ namespace InnovEnergy.App.SaliMax.MiddlewareClasses;
public static class MiddlewareAgent public static class MiddlewareAgent
{ {
private static UdpClient _udpListener = null!; public static UdpClient UdpListener = null!;
private static IPAddress? _controllerIpAddress; private static IPAddress? _controllerIpAddress;
private static EndPoint? _endPoint; private static EndPoint? _endPoint;
@ -24,9 +24,9 @@ public static class MiddlewareAgent
const Int32 udpPort = 9000; const Int32 udpPort = 9000;
_endPoint = new IPEndPoint(_controllerIpAddress, udpPort); _endPoint = new IPEndPoint(_controllerIpAddress, udpPort);
_udpListener = new UdpClient(); UdpListener = new UdpClient();
_udpListener.Client.Blocking = false; UdpListener.Client.Blocking = false;
_udpListener.Client.Bind(_endPoint); UdpListener.Client.Bind(_endPoint);
} }
private static IPAddress FindVpnIp() private static IPAddress FindVpnIp()
@ -53,7 +53,7 @@ public static class MiddlewareAgent
public static Configuration? SetConfigurationFile() public static Configuration? SetConfigurationFile()
{ {
if (_udpListener.Available > 0) if (UdpListener.Available > 0)
{ {
IPEndPoint? serverEndpoint = null; IPEndPoint? serverEndpoint = null;
@ -61,7 +61,7 @@ public static class MiddlewareAgent
var replyMessage = "ACK"; var replyMessage = "ACK";
var replyData = Encoding.UTF8.GetBytes(replyMessage); var replyData = Encoding.UTF8.GetBytes(replyMessage);
var udpMessage = _udpListener.Receive(ref serverEndpoint); var udpMessage = UdpListener.Receive(ref serverEndpoint);
var message = Encoding.UTF8.GetString(udpMessage); var message = Encoding.UTF8.GetString(udpMessage);
var config = JsonSerializer.Deserialize<Configuration>(message); var config = JsonSerializer.Deserialize<Configuration>(message);
@ -74,13 +74,13 @@ public static class MiddlewareAgent
config.CalibrationChargeDate); config.CalibrationChargeDate);
// Send the reply to the sender's endpoint // Send the reply to the sender's endpoint
_udpListener.Send(replyData, replyData.Length, serverEndpoint); UdpListener.Send(replyData, replyData.Length, serverEndpoint);
Console.WriteLine($"Replied to {serverEndpoint}: {replyMessage}"); Console.WriteLine($"Replied to {serverEndpoint}: {replyMessage}");
return config; return config;
} }
} }
if (_endPoint != null && !_endPoint.Equals(_udpListener.Client.LocalEndPoint as IPEndPoint)) if (_endPoint != null && !_endPoint.Equals(UdpListener.Client.LocalEndPoint as IPEndPoint))
{ {
Console.WriteLine("UDP address has changed, rebinding..."); Console.WriteLine("UDP address has changed, rebinding...");
InitializeCommunicationToMiddleware(); InitializeCommunicationToMiddleware();

6
firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/config.py
View File

@ -54,6 +54,6 @@ INNOVENERGY_PROTOCOL_VERSION = '48TL200V3'
# S3 Credentials # S3 Credentials
S3BUCKET = "35-c0436b6a-d276-4cd8-9c44-1eae86cf5d0e" S3BUCKET = "91-c0436b6a-d276-4cd8-9c44-1eae86cf5d0e"
S3KEY = "EXO2a70f415b6b387b5628020bd" S3KEY = "EXOe6dce12288f11a676c2025a1"
S3SECRET = "qdlYoXDZyME8LEB8BFTuCmJoTzkP2Nebr2jVmlXUzgY" S3SECRET = "xpqM4Eh0Gg1HaYVkzlR9X6PwYa-QNb-mVk0XUkwW3cc"