Преглед изворни кода

防火墙统计数据读取限制

Li пре 2 година
родитељ
комит
df4970fc64

+ 1 - 4
TEAMModelBI/Controllers/BIBlob/AnalyseFileController.cs

@@ -61,9 +61,7 @@ namespace TEAMModelBI.Controllers.BIBlob
 
 
             await foreach (BlobItem blobItem in blobCilent.GetBlobsAsync(BlobTraits.None, BlobStates.None, $"visitCnt/{day}"))
             await foreach (BlobItem blobItem in blobCilent.GetBlobsAsync(BlobTraits.None, BlobStates.None, $"visitCnt/{day}"))
             {
             {
-                string[] arr = blobItem.Name.Split('.');
-                string houzhui = arr[arr.Length - 1];
-                if (houzhui.Equals("json"))
+                if (blobItem.Name.EndsWith(".json"))
                 {
                 {
                     BlobClient tempClient = blobCilent.GetBlobClient(blobItem.Name);
                     BlobClient tempClient = blobCilent.GetBlobClient(blobItem.Name);
                     if (await tempClient.ExistsAsync())
                     if (await tempClient.ExistsAsync())
@@ -74,7 +72,6 @@ namespace TEAMModelBI.Controllers.BIBlob
                             //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
                             //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
 
 
                             RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
                             RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
-
                             string name = stringSuffix.MidStrEx(blobItem.Name, "/", ".");
                             string name = stringSuffix.MidStrEx(blobItem.Name, "/", ".");
                             days.Add(name, recCnt);
                             days.Add(name, recCnt);
                         }
                         }

+ 14 - 10
TEAMModelBI/Controllers/BIHome/OnLineController.cs

@@ -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();