|
@@ -129,7 +129,7 @@ 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, hour.GetInt32() + key, 0, 0)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + 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))
|
|
@@ -148,7 +148,7 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
foreach (var item in hourLoginsTch)
|
|
|
{
|
|
|
await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Login:IES:teacher:{dateDay}", $"{item.Hour}", item.Teacher);//存一天24小时
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + item.Hour, 0, 0)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + 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))
|
|
@@ -166,7 +166,7 @@ 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, hour.GetInt32() + key, 0, 0)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + 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))
|
|
@@ -186,7 +186,7 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
foreach (var item in hourLoginsStu)
|
|
|
{
|
|
|
await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Login:IES:student:{dateDay}", $"{item.Hour}", item.Student);//存一天24小时
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + item.Hour, 0, 0)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + 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))
|
|
@@ -204,7 +204,7 @@ 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, hour.GetInt32() + key, 00, 00)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + 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))
|
|
@@ -224,7 +224,7 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
foreach (var item in hourLoginsTmd)
|
|
|
{
|
|
|
await _azureRedis.GetRedisClient(8).SortedSetIncrementAsync($"Login:IES:tmduser:{dateDay}", $"{item.Hour}", item.TmdUser);//存一天24小时
|
|
|
- var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + item.Hour, 00, 00)).ToUnixTimeMilliseconds();
|
|
|
+ var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, hour.GetInt32() + item.Hour, 00, 00)).Hour;
|
|
|
//var hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {item.Hour}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
|
|
|
tmdDays.Add(utcTo, item.TmdUser);
|
|
|
if (allDays.ContainsKey(utcTo))
|