update

TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -1083,7 +1083,7 @@ namespace TEAMModelBI.Controllers.BINormal
 
                     List<object> fileobj = new();
                     //先删除原有的文件
-                    List<Task<Response<bool>>> DelList = new();
+                    List<Task<Azure.Response<bool>>> DelList = new();
                     await foreach (BlobItem blobItem in blobClient.GetBlobsAsync(BlobTraits.None, BlobStates.None, $"yxpt/{area.standard}/"))
                     {
                         fileobj.Add(blobItem.Name);
@@ -1099,7 +1099,7 @@ namespace TEAMModelBI.Controllers.BINormal
                         int pages = (DelList.Count + 255) / 256;
                         for (int i = 0; i < pages; i++)
                         {
-                            List<Task<Response<bool>>> delList = DelList.Skip((i) * 256).Take(256).ToList();
+                            List<Task<Azure.Response<bool>>> delList = DelList.Skip((i) * 256).Take(256).ToList();
                             await Task.WhenAll(delList);
                         }
                     }

TEAMModelBI/Controllers/BITable/OperateLogController.cs

@@ -16,6 +16,7 @@ using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Extension;
 
 using TEAMModelOS.SDK.Context.BI;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace TEAMModelBI.Controllers.BITable
 {
@@ -137,7 +138,7 @@ namespace TEAMModelBI.Controllers.BITable
                 //保存操作记录
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "operatelog-del", operateStr?.ToString(), _dingDing, httpContext: HttpContext);
 
-                if (temp.Count > 0)
+                if (temp.Count() > 0)
                 {
                     return Ok(new { state = 200 });
                 }

TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs

@@ -29,6 +29,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Models.Dtos;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace TEAMModelBI.Controllers.BITable
 {
@@ -183,7 +184,7 @@ namespace TEAMModelBI.Controllers.BITable
                 var users = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{divide}" } });
 
                 List<DingDingUserInfo> noExisits = new();
-                if (users.Count > 0)
+                if (users.Count() > 0)
                 {
                     //var temps = users.Union(tempddUserInfos).Except(users.Intersect(tempddUserInfos));
                     List<DingDingUserInfo> existsUserInfo = users.Where(u => !tempddUserInfos.Exists(e => u.userId.Equals(e.userId) && u.PartitionKey.Equals(e.PartitionKey))).ToList();
@@ -866,7 +867,7 @@ namespace TEAMModelBI.Controllers.BITable
                     var userInfos = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{partitionKey}" } });
 
                     var adminInfos = userInfos.FindAll(x => x.roles.Contains("admin"));
-                    if (adminInfos.Count == 1)
+                    if (adminInfos.Count() == 1)
                     {
                         return Ok(new { state = 403, msg = "已经是最后一个管理员了" });
                     }
@@ -1034,11 +1035,11 @@ namespace TEAMModelBI.Controllers.BITable
                 var users = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{divide}" } });
 
                 List<DingDingUserInfo> noExisits = new();
-                if (users.Count > 0)
+                if (users.Count() > 0)
                 {
                     //var temps = users.Union(tempddUserInfos).Except(users.Intersect(tempddUserInfos));
                     List<DingDingUserInfo> existsUserInfo = users.Where(u => !tempddUserInfos.Exists(e => u.userId.Equals(e.userId) && u.PartitionKey.Equals(e.PartitionKey))).ToList();
-                    if (users.Count >= tempddUserInfos.Count)
+                    if (users.Count() >= tempddUserInfos.Count)
                     {
                         existsUserInfo.AddRange(tempddUserInfos.Where(e => !users.Exists(u => e.userId.Equals(u.userId) && e.PartitionKey.Equals(u.PartitionKey))).ToList());
                     }
@@ -1432,7 +1433,7 @@ namespace TEAMModelBI.Controllers.BITable
                 string reole = null;
 
                 var tempUser = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{partKey}" }, { "RowKey", $"{rowKey}" } });
-                if (tempUser.Count > 0)
+                if (tempUser.Count() > 0)
                 {
                     foreach (var item in tempUser)
                     {
@@ -1673,7 +1674,7 @@ namespace TEAMModelBI.Controllers.BITable
                     {
                         var table = _azureStorage.GetCloudTableClient().GetTableReference("BIDDUserInfo");
                         var users = await table.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "PartitionKey", $"{partitionKey}" }, { "userId", $"{itemUser.Userid}" }, { "unionId", $"{itemUser.Unionid}" } });
-                        if (users.Count > 0)
+                        if (users.Count() > 0)
                         {
                             foreach (var user in users)
                             {

TEAMModelBI/Controllers/BITest/Ies5TestController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.Cosmos;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using StackExchange.Redis;

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -57,6 +57,7 @@ using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
 using Microsoft.OData.Edm;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BICommon;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace TEAMModelBI.Controllers.BITest
 {

TEAMModelBI/Controllers/BITmid/TmidController.cs

@@ -18,6 +18,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Services;
 using static TEAMModelBI.Models.Extension.GeoRegion;
 using Microsoft.Azure.Documents.Client;
+using Microsoft.Azure.Cosmos.Table;
 
 namespace TEAMModelBI.Controllers.BITmid
 {
@@ -376,7 +377,7 @@ namespace TEAMModelBI.Controllers.BITmid
                           .WithParameter("@key", tmidDic.Keys.ToList());
                     await foreach (var item in cosmosClientIes5
                                 .GetContainer(Constant.TEAMModelOS, "Teacher")
-                                .GetItemQueryStreamIteratorSql(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
+                                .GetItemQueryStreamIteratorQuery(query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                     {
                         using var json = await JsonDocument.ParseAsync(item.Content);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)

TEAMModelBI/Startup.cs

@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SpaServices;
-using Microsoft.Table;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

TEAMModelBI/Tool/CommonFind.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Tool

TEAMModelBI/Tool/CosmosBank/ActivityWay.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
+using TEAMModelOS.SDK.DI;
 
 namespace TEAMModelBI.Tool.CosmosBank
 {

TEAMModelBI/Tool/CosmosBank/JointlySingleQuery1.cs

@@ -1,6 +1,7 @@
 using Microsoft.Azure.Cosmos;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using TEAMModelOS.SDK.DI;
 
 namespace TEAMModelBI.Tool.CosmosBank
 {

TEAMModelBI/Tool/CosmosBank/ProductWay.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Tool.CosmosBank

TEAMModelBI/Tool/CosmosBank/SchoolWay.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
@@ -51,7 +52,7 @@ namespace TEAMModelBI.Tool.CosmosBank
             {
                 BIRelation bIRelation = new();
                 var resBiRel = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(item, new PartitionKey($"BIRel"));
-                if (resBiRel.Status == 200)
+                if (resBiRel.StatusCode == System.Net.HttpStatusCode.OK)
                 {
                     JsonDocument jsonD = JsonDocument.Parse(resBiRel.Content);
                     bIRelation = jsonD.RootElement.ToObject<BIRelation>();

TEAMModelBI/Tool/CosmosBank/StatsWay.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
@@ -435,7 +436,7 @@ namespace TEAMModelBI.Tool.CosmosBank
 
             AreaSetting setting = null;
             var responSett = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync($"{school.areaId}", new PartitionKey("AreaSetting"));
-            if (responSett.Status == 200)
+            if (responSett.StatusCode == System.Net.HttpStatusCode.OK)
             {
                 using var fileJson = await JsonDocument.ParseAsync(responSett.Content);
                 setting = fileJson.ToObject<AreaSetting>();

TEAMModelOS.SDK/Models/Table/SchoolSetting.cs

@@ -1,6 +1,4 @@
 using Microsoft.Azure.Cosmos.Table;
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.SDK.Models