dinhthuanbk88/DE70
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resend

Browse Source
This commit is contained in:
Nguyen Dinh Thuan
2024-09-17 08:26:12 +07:00
parent c1268760b2
commit b3ad51909d
3 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/APIModels.cs
+2
View File
@@ -47,10 +47,12 @@ namespace SafeBagDE70.API
TaskSendHealthCheck(deviceStatus).ContinueWith(t => { TaskSendHealthCheck(deviceStatus).ContinueWith(t => {
if (t.IsCompletedSuccessfully) if (t.IsCompletedSuccessfully)
{ {
AppData.IsInternetOk = true;
Log.Information("Send HealthCheck Success"); Log.Information("Send HealthCheck Success");
} }
else else
{ {
AppData.IsInternetOk = false;
Log.Information("Send HealthCheck Fail"); Log.Information("Send HealthCheck Fail");
} }
}); });
AppData.cs
+1
View File
@@ -36,6 +36,7 @@ namespace SafeBagDE70
public static int MaxNotes = 300; public static int MaxNotes = 300;
public static string BaseURL = ""; public static string BaseURL = "";
public static int TenantId = 0; public static int TenantId = 0;
public static bool IsInternetOk = false;
public static DeviceStatus? _DeviceStatus = null; public static DeviceStatus? _DeviceStatus = null;
public static DeviceStatus? DeviceStatus public static DeviceStatus? DeviceStatus
{ {
DepositSMUCv2.xaml.cs
+49 -39
View File
@@ -392,46 +392,9 @@ namespace SafeBagDE70
AppData.DeviceStatus.DeviceTime = DateTime.Now; AppData.DeviceStatus.DeviceTime = DateTime.Now;
APIModels.SendHealthCheck(AppData.DeviceStatus); APIModels.SendHealthCheck(AppData.DeviceStatus);
} }
if (countSensorTimer % 1800 == 0) if (countSensorTimer % 300 == 0)
{ {
if (!AppData.IsInTransaction) ResenData();
{
Task.Run(async () =>
{
try
{
using (var context = new CDMDbContext())
{
var startTime = DateTime.Now.Date.AddDays(-2).Date;
var unsentHist = context.Histories
.Where(x => x.DepositTime >= startTime)
.Where(x => ((x.IsSent == null || x.IsSent == false)))
.ToList();
foreach(var item in unsentHist)
{
var data2Send = JsonConvert.DeserializeObject<CountingData2Send>(item.Data);
var bResult = await APIModels.SendCountingData(data2Send);
if (bResult)
{
item.IsSent = true;
context.Update(item);
context.SaveChanges();
Log.Information("Resend: " + item.Data + " successfully");
}
else
{
Log.Error("Resend: " + item.Data + " failed");
}
}
}
}
catch (Exception ex)
{
Log.Fatal(ex,"Resend failed");
}
});
}
} }
countSensorTimer++; countSensorTimer++;
sensorTimer.IsEnabled = false; sensorTimer.IsEnabled = false;
@@ -444,6 +407,53 @@ namespace SafeBagDE70
} }
sensorTimer.IsEnabled = true; sensorTimer.IsEnabled = true;
} }
static Task? resendTask=null;
private static void ResenData()
{
if (!AppData.IsInTransaction && AppData.IsInternetOk)
{
if(resendTask==null || resendTask.IsCompleted)
{
resendTask = Task.Run(async () =>
{
try
{
using (var context = new CDMDbContext())
{
var startTime = DateTime.Now.Date.AddDays(-2).Date;
var unsentHist = context.Histories
.Where(x => x.DepositTime >= startTime)
.Where(x => ((x.IsSent == null || x.IsSent == false)))
.ToList();
foreach (var item in unsentHist)
{
var data2Send = JsonConvert.DeserializeObject<CountingData2Send>(item.Data);
var bResult = await APIModels.SendCountingData(data2Send);
if (bResult)
{
item.IsSent = true;
context.Update(item);
context.SaveChanges();
Log.Information("Resend: " + item.Data + " successfully");
}
else
{
Log.Error("Resend: " + item.Data + " failed");
}
}
}
}
catch (Exception ex)
{
Log.Fatal(ex, "Resend failed");
}
});
}
}
}
Stopwatch watch = new Stopwatch(); Stopwatch watch = new Stopwatch();
private void GetSensorValue() private void GetSensorValue()
{ {