|
@@ -169,13 +169,13 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
{
|
|
|
int val = ((int)item.Score);
|
|
|
int key = ((int)item.Element);
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 0, 0)).Hour;
|
|
|
+ //var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 0, 0)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {key}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
- tchDays.Add(utcTo, val);
|
|
|
- if (allDays.ContainsKey(utcTo))
|
|
|
- allDays[utcTo] = (allDays[utcTo] + val);
|
|
|
+ tchDays.Add(key, val);
|
|
|
+ if (allDays.ContainsKey(key))
|
|
|
+ allDays[key] = (allDays[key] + val);
|
|
|
else
|
|
|
- allDays.Add(utcTo, val);
|
|
|
+ allDays.Add(key, val);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
@@ -188,13 +188,13 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
foreach (var item in hourLoginsTch)
|
|
|
{
|
|
|
await redisClinet.SortedSetIncrementAsync($"Login:IES:teacher:{dateDay}", $"{item.Hour}", item.Teacher);//存一天24小时
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, item.Hour, 0, 0)).Hour;
|
|
|
+ //var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, item.Hour, 0, 0)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {item.Hour}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
- tchDays.Add(utcTo, item.Teacher);
|
|
|
- if (allDays.ContainsKey(utcTo))
|
|
|
- allDays[utcTo] = (allDays[utcTo] + item.Teacher);
|
|
|
+ tchDays.Add(item.Hour, item.Teacher);
|
|
|
+ if (allDays.ContainsKey(item.Hour))
|
|
|
+ allDays[item.Hour] = (allDays[item.Hour] + item.Teacher);
|
|
|
else
|
|
|
- allDays.Add(utcTo, item.Teacher);
|
|
|
+ allDays.Add(item.Hour, item.Teacher);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -206,13 +206,13 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
{
|
|
|
int val = (int)item.Score;
|
|
|
int key = (int)item.Element;
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 0, 0)).Hour;
|
|
|
+ //var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 0, 0)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {key}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
- stuDays.Add(utcTo, val);
|
|
|
- if (allDays.ContainsKey(utcTo))
|
|
|
- allDays[utcTo] = (allDays[utcTo] + val);
|
|
|
+ stuDays.Add(key, val);
|
|
|
+ if (allDays.ContainsKey(key))
|
|
|
+ allDays[key] = (allDays[key] + val);
|
|
|
else
|
|
|
- allDays.Add(utcTo, val);
|
|
|
+ allDays.Add(key, val);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
@@ -226,13 +226,13 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
foreach (var item in hourLoginsStu)
|
|
|
{
|
|
|
await redisClinet.SortedSetIncrementAsync($"Login:IES:student:{dateDay}", $"{item.Hour}", item.Student);//存一天24小时
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, item.Hour, 0, 0)).Hour;
|
|
|
+ //var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, item.Hour, 0, 0)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {item.Hour}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
- stuDays.Add(utcTo, item.Student);
|
|
|
- if (allDays.ContainsKey(utcTo))
|
|
|
- allDays[utcTo] = (allDays[utcTo] + item.Student);
|
|
|
+ stuDays.Add(item.Hour, item.Student);
|
|
|
+ if (allDays.ContainsKey(item.Hour))
|
|
|
+ allDays[item.Hour] = (allDays[item.Hour] + item.Student);
|
|
|
else
|
|
|
- allDays.Add(utcTo, item.Student);
|
|
|
+ allDays.Add(item.Hour, item.Student);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -240,17 +240,17 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
SortedSetEntry[] tmdDay = redisClinet.SortedSetRangeByScoreWithScores($"Login:IES:tmduser:{dateDay}");
|
|
|
if (tmdDay.Length > 0)
|
|
|
{
|
|
|
- foreach (var item in stuDay)
|
|
|
+ foreach (var item in tmdDay)
|
|
|
{
|
|
|
int val = (int)item.Score;
|
|
|
int key = (int)item.Element;
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 00, 00)).Hour;
|
|
|
+ //var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, key, 00, 00)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {key}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
- tmdDays.Add(utcTo, val);
|
|
|
- if (allDays.ContainsKey(utcTo))
|
|
|
- allDays[utcTo] = (allDays[utcTo] + val);
|
|
|
+ tmdDays.Add(key, val);
|
|
|
+ if (allDays.ContainsKey(key))
|
|
|
+ allDays[key] = (allDays[key] + val);
|
|
|
else
|
|
|
- allDays.Add(utcTo, val);
|
|
|
+ allDays.Add(key, val);
|
|
|
}
|
|
|
}
|
|
|
else
|