|
@@ -98,6 +98,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
{
|
|
|
foreach (var hourLogin in hourLogins)
|
|
|
{
|
|
|
+ //hourLogin.Hour = currentHour;
|
|
|
if (scope.Equals("teacher"))
|
|
|
hourLogin.Teacher += 1;
|
|
|
else if (scope.Equals("student"))
|
|
@@ -116,7 +117,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- HourLogin hourLogin = new() { PartitionKey = $"HourLogin", RowKey = dateHour, Hour = int.Parse(dateHour) };
|
|
|
+ HourLogin hourLogin = new() { PartitionKey = $"HourLogin", RowKey = dateHour, Hour = currentHour };
|
|
|
if (scope.Equals("teacher"))
|
|
|
{
|
|
|
hourLogin.Teacher = 1;
|
|
@@ -150,6 +151,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
{
|
|
|
foreach (var dayLogin in dayLogins)
|
|
|
{
|
|
|
+ //dayLogin.Day = currentDay;
|
|
|
if (scope.Equals("teacher"))
|
|
|
dayLogin.Teacher += 1;
|
|
|
else if (scope.Equals("student"))
|
|
@@ -169,7 +171,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
else
|
|
|
{
|
|
|
//保存当月每天的峰值
|
|
|
- DayLogin dayLogin = new() { PartitionKey = $"DayLogin", RowKey = dateDay, Day = int.Parse(dateDay) };
|
|
|
+ DayLogin dayLogin = new() { PartitionKey = $"DayLogin", RowKey = dateDay, Day = currentDay };
|
|
|
if (scope.Equals("teacher"))
|
|
|
{
|
|
|
dayLogin.Teacher = 1;
|
|
@@ -235,6 +237,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
{
|
|
|
foreach (var hLoginSc in hourLoginSchools)
|
|
|
{
|
|
|
+ //hLoginSc.Hour = currentHour;
|
|
|
if (scope.Equals("teacher"))
|
|
|
hLoginSc.Teacher += 1;
|
|
|
else if (scope.Equals("student"))
|
|
@@ -245,7 +248,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
|
|
|
try
|
|
|
{
|
|
|
- await table.SaveOrUpdateAll(hourLogins);
|
|
|
+ await table.SaveOrUpdateAll(hourLoginSchools);
|
|
|
}
|
|
|
catch
|
|
|
{
|
|
@@ -254,7 +257,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
else
|
|
|
{
|
|
|
//学校小时峰值
|
|
|
- HourLoginSchool hourLoginSc = new() { PartitionKey = $"HourLogin-{school}", RowKey = dateHour, Hour = int.Parse(dateHour), School = school };
|
|
|
+ HourLoginSchool hourLoginSc = new() { PartitionKey = $"HourLogin-{school}", RowKey = dateHour, Hour = currentHour, School = school };
|
|
|
if (scope.Equals("teacher"))
|
|
|
{
|
|
|
hourLoginSc.Teacher = 1;
|
|
@@ -287,19 +290,20 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
List<DayLoginSchool> DayLoginSchools = await table.QueryWhereString<DayLoginSchool>($"PartitionKey eq 'DayLogin-{school}' and RowKey eq '{dateDay}'");
|
|
|
if (DayLoginSchools.Count > 0)
|
|
|
{
|
|
|
- foreach (var hLoginSc in hourLoginSchools)
|
|
|
+ foreach (var dLoginSc in DayLoginSchools)
|
|
|
{
|
|
|
+ //dLoginSc.Day = currentDay;
|
|
|
if (scope.Equals("teacher"))
|
|
|
- hLoginSc.Teacher += 1;
|
|
|
+ dLoginSc.Teacher += 1;
|
|
|
else if (scope.Equals("student"))
|
|
|
- hLoginSc.Student += 1;
|
|
|
+ dLoginSc.Student += 1;
|
|
|
else
|
|
|
- hLoginSc.TmdUser += 1;
|
|
|
+ dLoginSc.TmdUser += 1;
|
|
|
}
|
|
|
|
|
|
try
|
|
|
{
|
|
|
- await table.SaveOrUpdateAll(hourLogins);
|
|
|
+ await table.SaveOrUpdateAll(DayLoginSchools);
|
|
|
}
|
|
|
catch
|
|
|
{
|
|
@@ -308,7 +312,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
else
|
|
|
{
|
|
|
//学校天峰值
|
|
|
- DayLoginSchool dayLoginSc = new() { PartitionKey = $"DayLogin-{school}", RowKey = dateDay, Day = int.Parse(dateDay), School = school };
|
|
|
+ DayLoginSchool dayLoginSc = new() { PartitionKey = $"DayLogin-{school}", RowKey = dateDay, Day = currentDay, School = school };
|
|
|
if (scope.Equals("teacher"))
|
|
|
{
|
|
|
dayLoginSc.Teacher = 1;
|