|
@@ -43,13 +43,13 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[ProducesDefaultResponseType]
|
|
[ProducesDefaultResponseType]
|
|
[HttpPost("get-count")]
|
|
[HttpPost("get-count")]
|
|
- public async Task<IActionResult> GetCount(JsonElement jsonElement)
|
|
|
|
|
|
+ public async Task<IActionResult> GetCount(JsonElement jsonElement)
|
|
{
|
|
{
|
|
var cosmosClient = _azureCosmos.GetCosmosClient();
|
|
var cosmosClient = _azureCosmos.GetCosmosClient();
|
|
var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
|
|
var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
|
|
var blobClient = _azureStorage.GetBlobContainerClient($"0-public");
|
|
var blobClient = _azureStorage.GetBlobContainerClient($"0-public");
|
|
jsonElement.TryGetProperty("site", out JsonElement site);
|
|
jsonElement.TryGetProperty("site", out JsonElement site);
|
|
- if ($"{site}".Equals(BIConst.Global))
|
|
|
|
|
|
+ if ($"{site}".Equals(BIConst.Global))
|
|
{
|
|
{
|
|
cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
|
|
cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
|
|
table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
|
|
table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
|
|
@@ -61,9 +61,9 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
|
|
|
|
var (daySt, dayEt) = TimeHelper.GetStartOrEnd(dateTime); //今天开始时间 13位
|
|
var (daySt, dayEt) = TimeHelper.GetStartOrEnd(dateTime); //今天开始时间 13位
|
|
var (daySf, dayEf) = TimeHelper.GetStartOrEnd(dateTime, dateLenth: false); //今天开始时间 10位
|
|
var (daySf, dayEf) = TimeHelper.GetStartOrEnd(dateTime, dateLenth: false); //今天开始时间 10位
|
|
-
|
|
|
|
|
|
+
|
|
var (lastDayS, lastdayE) = TimeHelper.GetStartOrEnd(dateTime.AddDays(-1)); //昨天开始时间
|
|
var (lastDayS, lastdayE) = TimeHelper.GetStartOrEnd(dateTime.AddDays(-1)); //昨天开始时间
|
|
-
|
|
|
|
|
|
+
|
|
var near7S = dateTime.AddDays(-7).ToUnixTimeMilliseconds(); //前七天的开始时间
|
|
var near7S = dateTime.AddDays(-7).ToUnixTimeMilliseconds(); //前七天的开始时间
|
|
var near7E = dateTime.ToUnixTimeMilliseconds(); //当前结束时间
|
|
var near7E = dateTime.ToUnixTimeMilliseconds(); //当前结束时间
|
|
long hour1 = dateTime.AddHours(-1).ToUnixTimeMilliseconds(); //一小时前时间戳
|
|
long hour1 = dateTime.AddHours(-1).ToUnixTimeMilliseconds(); //一小时前时间戳
|
|
@@ -101,15 +101,19 @@ namespace TEAMModelBI.Controllers.BIHome
|
|
List<RecCnt> recCnts = new();
|
|
List<RecCnt> recCnts = new();
|
|
await foreach (BlobItem blobItem in blobClient.GetBlobsAsync(BlobTraits.None, BlobStates.None, $"visitCnt/{cDay}"))
|
|
await foreach (BlobItem blobItem in blobClient.GetBlobsAsync(BlobTraits.None, BlobStates.None, $"visitCnt/{cDay}"))
|
|
{
|
|
{
|
|
- BlobClient tempBlobClient = blobClient.GetBlobClient(blobItem.Name);
|
|
|
|
- if (await tempBlobClient.ExistsAsync())
|
|
|
|
|
|
+ if(blobItem.Name.EndsWith(".json"))
|
|
{
|
|
{
|
|
- using (var meomoryStream = new MemoryStream())
|
|
|
|
|
|
+ BlobClient tempBlobClient = blobClient.GetBlobClient(blobItem.Name);
|
|
|
|
+ if (await tempBlobClient.ExistsAsync())
|
|
{
|
|
{
|
|
- var response = blobClient.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
|
|
|
|
- RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
|
|
|
|
- recCnts.Add(recCnt);
|
|
|
|
|
|
+ using (var meomoryStream = new MemoryStream())
|
|
|
|
+ {
|
|
|
|
+ var response = blobClient.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
|
|
|
|
+ RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
|
|
|
|
+ recCnts.Add(recCnt);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
apiCnt = recCnts.Select(x => x.apiCnt.Select(s => s.count).Sum()).Sum();
|
|
apiCnt = recCnts.Select(x => x.apiCnt.Select(s => s.count).Sum()).Sum();
|