浏览代码

给没有加访问限制接口,加上限制,处理冗余代码。

Li 2 年之前
父节点
当前提交
53f8f4ba7a
共有 27 个文件被更改,包括 65 次插入1079 次删除
  1. 2 13
      TEAMModelBI/Controllers/BIBlob/AnalyseFileController.cs
  2. 0 32
      TEAMModelBI/Controllers/BICommon/JointlyController.cs
  3. 1 3
      TEAMModelBI/Controllers/BIHome/HomeStatisController.cs
  4. 4 116
      TEAMModelBI/Controllers/BIHome/OnLineController.cs
  5. 2 5
      TEAMModelBI/Controllers/BINormal/AbilityMgmtController.cs
  6. 0 2
      TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs
  7. 0 638
      TEAMModelBI/Controllers/BINormal/AppCompanyController.cs
  8. 3 4
      TEAMModelBI/Controllers/BINormal/AreaRelevantController.cs
  9. 1 6
      TEAMModelBI/Controllers/BINormal/BatchAreaController.cs
  10. 0 3
      TEAMModelBI/Controllers/BINormal/BusinessConfigController.cs
  11. 6 27
      TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs
  12. 0 1
      TEAMModelBI/Controllers/BISchool/RoomController.cs
  13. 7 46
      TEAMModelBI/Controllers/BISchool/SchoolController.cs
  14. 1 0
      TEAMModelBI/Controllers/BIStudent/StudentController.cs
  15. 0 1
      TEAMModelBI/Controllers/BITable/BIOpenApiController.cs
  16. 1 1
      TEAMModelBI/Controllers/BITable/OperateLogController.cs
  17. 1 95
      TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs
  18. 2 0
      TEAMModelBI/Controllers/BITeacher/TeacherController.cs
  19. 7 0
      TEAMModelBI/Controllers/Census/ActivitySticsController.cs
  20. 1 0
      TEAMModelBI/Controllers/Census/BlobLogController.cs
  21. 4 0
      TEAMModelBI/Controllers/Census/ItemSticsController.cs
  22. 7 1
      TEAMModelBI/Controllers/Census/LessonSticsController.cs
  23. 5 0
      TEAMModelBI/Controllers/Census/PaperController.cs
  24. 4 3
      TEAMModelBI/Controllers/Census/ProductStatisController.cs
  25. 4 0
      TEAMModelBI/Controllers/Census/SchoolController.cs
  26. 1 82
      TEAMModelBI/Controllers/LoginController.cs
  27. 1 0
      TEAMModelBI/Controllers/ManySiteCut/SystemConfigController.cs

+ 2 - 13
TEAMModelBI/Controllers/BIBlob/AnalyseFileController.cs

@@ -68,9 +68,6 @@ namespace TEAMModelBI.Controllers.BIBlob
                     {
                         var response = blobCilent.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
                         //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
-                        //var temps = meomoryStream.ToString();
-                        //var temp1 = Encoding.UTF8.GetString(meomoryStream.ToArray());
-                        //var temp = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToObject<RecCnt>();
 
                         RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
 
@@ -112,9 +109,6 @@ namespace TEAMModelBI.Controllers.BIBlob
                         {
                             var response = blobCilent.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
                             //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
-                            //var temps = meomoryStream.ToString();
-                            //var temp1 = Encoding.UTF8.GetString(meomoryStream.ToArray());
-                            //var temp = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToObject<RecCnt>();
 
                             RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
                             savenDayApis.AddRange(recCnt.apiCnt);
@@ -155,9 +149,6 @@ namespace TEAMModelBI.Controllers.BIBlob
                         {
                             var response = blobCilent.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
                             //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
-                            //var temps = meomoryStream.ToString();
-                            //var temp1 = Encoding.UTF8.GetString(meomoryStream.ToArray());
-                            //var temp = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToObject<RecCnt>();
 
                             RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
                             thirtyDayApi.AddRange(recCnt.apiCnt);
@@ -176,6 +167,7 @@ namespace TEAMModelBI.Controllers.BIBlob
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-visitjson")]
         public async Task<IActionResult> GetVisitJson(JsonElement jsonElement) 
         {
@@ -233,10 +225,6 @@ namespace TEAMModelBI.Controllers.BIBlob
                         var response = blob.GetBlobClient($"{blobItem.Name}").DownloadTo(meomoryStream);
                         //var response = await blob.GetBlobClient($"{blobItem.Name}").DownloadToAsync(meomoryStream);
 
-                        var temps = meomoryStream.ToString();
-                        var temp1 = Encoding.UTF8.GetString(meomoryStream.ToArray());
-                        var temp = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToObject<RecCnt>();
-
                         RecCnt recCnt = Encoding.UTF8.GetString(meomoryStream.ToArray()).ToString().ToObject<RecCnt>();
                         recCnts.Add(recCnt);
                     }
@@ -250,6 +238,7 @@ namespace TEAMModelBI.Controllers.BIBlob
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-loginfos")]
         public async Task<IActionResult> GetOSLog(JsonElement jsonElement) 
         {

+ 0 - 32
TEAMModelBI/Controllers/BICommon/JointlyController.cs

@@ -80,38 +80,6 @@ namespace TEAMModelBI.Controllers.BICommon
                 }
             }
 
-            //if (type.GetInt32() != 0) 
-            //{
-            //    await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", _containers[type.GetInt32()]).GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.id='{id}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
-            //    {
-            //        using var json = await JsonDocument.ParseAsync(item.ContentStream);
-            //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //        {
-            //            foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-            //            {
-            //                objs.Add(obj.ToObject<object>());
-            //            }
-            //        }
-            //    }
-            //}
-            //else
-            //{
-            //    foreach (var contaoner in _containers)
-            //    {
-            //        await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", contaoner).GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.id='{id}'", requestOptions: string.IsNullOrEmpty($"{code}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"{code}") }))
-            //        {
-            //            using var json = await JsonDocument.ParseAsync(item.ContentStream);
-            //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //            {
-            //                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-            //                {
-            //                    objs.Add(obj.ToObject<object>());
-            //                }
-            //            }
-            //        }
-            //    }
-            //}
-
             return Ok(new { state = 200, infos = objs });
         }
 

+ 1 - 3
TEAMModelBI/Controllers/BIHome/HomeStatisController.cs

@@ -230,8 +230,6 @@ namespace TEAMModelBI.Controllers.BIHome
                     {
                         citySchool.cityCode = itemStandrd.cityCode;
                         citySchool.cityName = itemStandrd.cityName;
-
-                        //string sqlTxt = $"select count(c.id) totals from c where c.standard='{itemStandrd.standard}'";
                         string sqlTxt = $"select value(count(c.id)) from c where c.areaId='{itemStandrd.areaId}' and c.standard='{itemStandrd.standard}'";
                         citySchool.schoolCount += await CommonFind.GetSqlValueCount(cosmosClient, "School", sqlTxt,  "Base");
 
@@ -439,6 +437,7 @@ namespace TEAMModelBI.Controllers.BIHome
         /// 统计学校和教师空间类型   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-datatypestics")]
         public async Task<IActionResult> GetDataTypeStics(JsonElement jsonElement) 
         {
@@ -524,7 +523,6 @@ namespace TEAMModelBI.Controllers.BIHome
 
                         useSize += blobsize;
                         typeStics1 = typeStics1.Concat(schoolStics).GroupBy(g => g.Key).ToDictionary(k => k.Key, k => k.Sum(kvp => kvp.Value));  //lamebda表达式
-                        //typeStics1 = (from e in typeStics1.Concat(schoolStics) group e by e.Key into g select new { Name = g.Key, Count = g.Sum(kvp => kvp.Value) }).ToDictionary(item => item.Name, item => item.Count);
                         continue;
 
                     }

+ 4 - 116
TEAMModelBI/Controllers/BIHome/OnLineController.cs

@@ -41,6 +41,7 @@ namespace TEAMModelBI.Controllers.BIHome
         /// 总数统计   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-count")]
         public async Task<IActionResult> GetCount(JsonElement jsonElement) 
         {
@@ -113,24 +114,6 @@ namespace TEAMModelBI.Controllers.BIHome
             }
             apiCnt = recCnts.Select(x => x.apiCnt.Select(s => s.count).Sum()).Sum();
 
-            //List<RecOnLine> recStuOnLines = new();
-            //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Student").GetItemQueryIterator<RecOnLine>(queryText: "select c.id,c.name,c.code,c.loginInfos from c where c.pk='Base' and array_length(c.loginInfos) > 0 ", requestOptions:new QueryRequestOptions() { }))
-            //{
-            //    recStuOnLines.Add(item);
-            //}
-
-            //List<RecOnLine> recTecOnLines = new();
-            //await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryIterator<RecOnLine>(queryText: "select c.id,c.name,c.code,c.loginInfos from c where array_length(c.loginInfos) > 0 ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
-            //{
-            //    recTecOnLines.Add(item);
-            //}
-
-            ////onStuCnt = (from rs in recStuOnLines from l in rs.loginInfos where l.expire >= hour1 select rs).ToList().Count();  //linq查询 学生在线人数
-            //onStuCnt = recStuOnLines.Select(rss => new RecOnLine { id = rss.id,code=rss.code, name =rss.name,loginInfos = new List<Teacher.LoginInfo> { rss.loginInfos.Find(f => f.expire >= hour1) } }).Where(w => w.loginInfos.FirstOrDefault() != null).ToList().Count();  //lambda 表达式查询   教师查询人数
-
-            ////onTchCnt = (from rs in recTecOnLines from l in rs.loginInfos where l.expire >= hour1 select rs).ToList().Count();  //linq查询  教师查询人数
-            //onTchCnt = recTecOnLines.Select(rss => new RecOnLine { id = rss.id,code=rss.code, name =rss.name,loginInfos = new List<Teacher.LoginInfo> { rss.loginInfos.Find(f => f.expire >= hour1) } }).Where(w => w.loginInfos.FirstOrDefault() != null).ToList().Count();  //lambda 表达式查询    教师查询人数
-
             return Ok(new { state = 200, areaCnt, scCnt, tchCnt, stuCnt, todayScCnt, todayTchCnt, todayStuCnt, onStuCnt, onTchCnt, apiCnt });
         }
 
@@ -138,6 +121,7 @@ namespace TEAMModelBI.Controllers.BIHome
         /// 在线人数趋势图   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-trend")]
         public async Task<IActionResult> GetTrend(JsonElement jsonElement) 
         {
@@ -189,8 +173,6 @@ 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 hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {item.Hour}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
                         tchDays.Add(item.Hour, item.Teacher);
                         if (allDays.ContainsKey(item.Hour))
                             allDays[item.Hour] = (allDays[item.Hour] + item.Teacher);
@@ -207,8 +189,6 @@ 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 hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {key}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
                     stuDays.Add(key, val);
                     if (allDays.ContainsKey(key))
                         allDays[key] = (allDays[key] + val);
@@ -227,8 +207,6 @@ 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 hour = int.Parse(DateTime.SpecifyKind(Convert.ToDateTime($"{dateTime.Year}/{dateTime.Month}/{ dateTime.Day} {item.Hour}:00:00"), DateTimeKind.Utc).ToLocalTime().ToString("HH"));
                         stuDays.Add(item.Hour, item.Student);
                         if (allDays.ContainsKey(item.Hour))
                             allDays[item.Hour] = (allDays[item.Hour] + item.Student);
@@ -245,8 +223,6 @@ 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, 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(key, val);
                     if (allDays.ContainsKey(key))
                         allDays[key] = (allDays[key] + val);
@@ -266,7 +242,6 @@ namespace TEAMModelBI.Controllers.BIHome
                     {
                         await redisClinet.SortedSetIncrementAsync($"Login:IES:tmduser:{dateDay}", $"{item.Hour}", item.TmdUser);//存一天24小时
                         var utcTo = new DateTimeOffset(new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, 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))
                             allDays[utcTo] = (allDays[utcTo] + item.TmdUser);
@@ -283,6 +258,7 @@ namespace TEAMModelBI.Controllers.BIHome
         /// 课例趋势图   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-lessontrend")]
         public async Task<IActionResult> GetLessonTrend(JsonElement jsonElement)
         {
@@ -399,64 +375,13 @@ namespace TEAMModelBI.Controllers.BIHome
                 months = new { sdOpenLesn = yrOpenLesn.ToList(), sdUpdLesn = yrUpdLesn.ToList() },
                 years = new { sdOpenLesn = allOpenLesn.ToList(), sdUpdLesn = allUpdLesn.ToList() }
             }) ;
-
-            //string lesnSql = $"select c.id,c.name,c.code,c.school,c.scope,c.startTime  from c where c.pk='LessonRecord' and c.startTime >={daySt} and c.startTime <= {dayEt}";
-            ////今天课例
-            //sameDayLesn = await CommonFind.GetObject<RecLesn>(cosmosClient, new List<string>() { "School", "Teacher" }, lesnSql);
-
-            ////await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecLesn>(queryText: lesnSql, requestOptions: new QueryRequestOptions() { }))
-            ////{
-            ////    sameDayLesn.Add(item);
-            ////}
-            ////await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryIterator<RecLesn>(queryText: lesnSql, requestOptions: new QueryRequestOptions() { }))
-            ////{
-            ////    sameDayLesn.Add(item);
-            ////}
-            ////昨天课例
-            //string yesterDayLesnSql = $"select c.id,c.name,c.code,c.school,c.scope,c.startTime  from c where c.pk='LessonRecord' and c.startTime >={lastDayS} and c.startTime <= {lastdayE}";
-            //yesterDayLesn = await CommonFind.GetObject<RecLesn>(cosmosClient, new List<string>() { "School", "Teacher" }, yesterDayLesnSql);
-            ////await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecLesn>(queryText: yesterDayLesnSql, requestOptions: new QueryRequestOptions() { }))
-            ////{
-            ////    yesterDayLesn.Add(item);
-            ////}
-
-            ////await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Teacher").GetItemQueryIterator<RecLesn>(queryText: yesterDayLesnSql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("LessonRecord") }))
-            ////{
-            ////    yesterDayLesn.Add(item);
-            ////}
-
-            //for (int i = 0; i < 24; i++)
-            //{
-            //    if (hour >= i)
-            //    {
-            //        DateTimeOffset timeHour = new DateTime(year, month, day, i, 0, 0);
-            //        var (hourS, hourE) = TimeHelper.GetStartOrEnd(timeHour, type: "hour");
-
-            //        var openLesn = sameDayLesn.Where(item => item.startTime >= hourS && item.startTime <= hourE && item.upload == 0);
-            //        sdOpenLesn.Add(i, openLesn.Count());
-
-            //        var UpdLesn = sameDayLesn.Where(item => item.startTime >= hourS && item.startTime <= hourE && item.upload == 1);
-            //        sdUpdLesn.Add(i, openLesn.Count());
-
-            //    }
-
-            //    DateTimeOffset yesterday = new DateTime(lestDate.Year, lestDate.Month, lestDate.Day, i, 0, 0);
-            //    var (yHourS, yHourE) = TimeHelper.GetStartOrEnd(yesterday, type: "hour");
-
-            //    var yOpenLesn = yesterDayLesn.Where(item => item.startTime >= yHourS && item.startTime <= yHourE && item.upload == 0).ToList();
-            //    ydOpenLesn.Add(i, yOpenLesn.Count);
-
-            //    var yUpdLesn = yesterDayLesn.Where(item => item.startTime >= yHourS && item.startTime <= yHourE && item.upload == 1).ToList();
-            //    ydUpdLesn.Add(i, yUpdLesn.Count);
-            //}
-
-            //return Ok(new { state = 200, sdOpenLesn = sdOpenLesn.ToList(), sdUpdLesn = sdUpdLesn.ToList(), ydOpenLesn = ydOpenLesn.ToList(), ydUpdLesn = ydUpdLesn.ToList() });
         }
 
         /// <summary>
         /// 版本数量占比   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-edition")]
         public async Task<IActionResult> GetEdition(JsonElement jsonElement) 
         {
@@ -506,43 +431,6 @@ namespace TEAMModelBI.Controllers.BIHome
             return Ok(new { state = 200, beCnt, seCnt, peCnt, scEdCnt });
         }
 
-        /// <summary>
-        /// 开课
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        public async Task<IActionResult> GetTmdCount(JsonElement jsonElement) 
-        {
-            if(jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
-            var cosmosClient = _azureCosmos.GetCosmosClient();
-            var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
-            var blobClient = _azureStorage.GetBlobContainerClient($"0-public");
-            jsonElement.TryGetProperty("site", out JsonElement site);
-            if ($"{site}".Equals(BIConst.Global))
-            {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                table = _azureStorage.GetCloudTableClient(BIConst.Global).GetTableReference("IESLogin");
-                blobClient = _azureStorage.GetBlobContainerClient($"0-public", BIConst.Global);
-            }           
-
-
-            List<string> schools = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
-
-
-
-
-            return Ok(new { state = 200 });
-        }
-
-
-        public record YearLesson 
-        {
-            public long year { get; set; }
-            public List<int> upload { get; set; }
-            public List<string> id { get; set; }
-        }
-
-
         /// <summary>
         /// 记录学校版本信息
         /// </summary>

+ 2 - 5
TEAMModelBI/Controllers/BINormal/AbilityMgmtController.cs

@@ -44,7 +44,7 @@ namespace TEAMModelBI.Controllers.BINormal
         }
 
         /// <summary>
-        /// 依据区级的标准编号获取标准的编号集合   //后端有
+        /// 依据区级的标准编号获取标准的编号集合   //已对接
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
@@ -71,7 +71,7 @@ namespace TEAMModelBI.Controllers.BINormal
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"BI,{_option.Location} /biabilitymgmt/get-abilitysbystandard  \n {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
+                await _dingDing.SendBotMsg($"BI,{_option.Location} /biabilitymgmt/get-abilitys  \n {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
                 return BadRequest();
             }
         }
@@ -151,7 +151,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 if (response.Status == 200)
                 {
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("abilityTask-del", $"{_tmdName}【{_tmdId}】删除册别,删除ID:{id}", _dingDing, httpContext: HttpContext);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "abilityTask-del", $"{_tmdName}【{_tmdId}】删除册别,删除ID:{id}", _dingDing, httpContext: HttpContext);
 
                     return Ok(new { state = 200 });
@@ -251,7 +250,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog(tempType?.ToString(), stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, tempType?.ToString(), stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, Ability = tempAbility });
@@ -297,7 +295,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("ability-update", $"{_tmdName}【{_tmdId}】设置是否必修状态。标准:{currencys[0].standard}", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "ability-update", $"{_tmdName}【{_tmdId}】设置是否必修状态。标准:{currencys[0].standard}", _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, currencys });

+ 0 - 2
TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs

@@ -222,7 +222,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog(type, msgBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, type, msgBuilder?.ToString(), _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200, recordAbilityTask });
@@ -265,7 +264,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 string msg = $"{_tmdName}【{_tmdId}】删除册别,删除状态:{response.Status},删除ID:{id}";
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("abilitytask-del", msg, _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "abilitytask-del", msg, _dingDing, httpContext: HttpContext);
                 if (response.Status == 204)
                     return Ok(new { state = 200 });

+ 0 - 638
TEAMModelBI/Controllers/BINormal/AppCompanyController.cs

@@ -1,638 +0,0 @@
-using Azure.Cosmos;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using TEAMModelBI.Filter;
-using TEAMModelBI.Models.Extension;
-using TEAMModelBI.Tool.Extension;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.BI;
-using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Service;
-
-namespace TEAMModelBI.Controllers.BINormal
-{
-    [Route("appcompany")]
-    [ApiController]
-    public class AppCompanyController : ControllerBase
-    {
-        public readonly AzureCosmosFactory _azureCosmos;
-        public readonly AzureStorageFactory _azureStorage;
-        public readonly DingDing _dingDing;
-        public readonly Option _option;
-        private readonly IConfiguration _configuration;
-        private readonly NotificationService _notificationService;
-
-        public AppCompanyController(AzureCosmosFactory azureCosmos, AzureStorageFactory azureStorage, DingDing dingDing, IOptionsSnapshot<Option> option, IConfiguration configuration, NotificationService notificationService)
-        {
-            _azureCosmos = azureCosmos;
-            _azureStorage = azureStorage;
-            _dingDing = dingDing;
-            _option = option?.Value;
-            _configuration = configuration;
-            _notificationService = notificationService;
-        }
-
-        /// <summary>
-        /// 查询应用信息
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [HttpPost("get-info")]
-        public async Task<IActionResult> GetInfo(JsonElement jsonElement)
-        {
-            jsonElement.TryGetProperty("appId", out JsonElement appId);
-            jsonElement.TryGetProperty("eid", out JsonElement eid);
-            jsonElement.TryGetProperty("audit", out JsonElement audit);
-            jsonElement.TryGetProperty("site", out JsonElement site);
-
-            var cosmosClient = _azureCosmos.GetCosmosClient();
-            if ($"{site}".Equals(BIConst.Global))
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-            StringBuilder sqlTxt = new($"select c.id,c.pk,c.code,c.name,c.descr,c.picture,c.jwtKey,c.status,c.audit,c.refuseDesc,c.gateways,c.apis,c.webhookDomain,c.webHooks,c.schools from c where c.pk='App'");
-            if (!string.IsNullOrEmpty($"{appId}"))
-            {
-                sqlTxt.Append($" and id='{appId}'");
-            }
-            if (!string.IsNullOrEmpty($"{audit}"))
-            {
-                sqlTxt.Append($" and audit='{audit}'");
-            }
-
-            List<ReadCompany> appCompanys = new();
-            await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Normal").GetItemQueryStreamIterator(queryText: sqlTxt.ToString(), requestOptions: string.IsNullOrEmpty($"{eid}") ? new QueryRequestOptions() { } : new QueryRequestOptions() { PartitionKey = new PartitionKey($"App-{eid}") }))
-            {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-                {
-                    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-                    {
-                        ReadCompany readCompany = new()
-                        {
-                            id = obj.GetProperty("id").GetString(),
-                            pk = obj.GetProperty("pk").GetString(),
-                            code = obj.GetProperty("code").GetString(),
-                            name = obj.GetProperty("name").GetString(),
-                            descr = obj.GetProperty("descr").GetString(),
-                            picture = obj.GetProperty("picture").GetString(),
-                            jwtKey = obj.GetProperty("jwtKey").GetString(),
-                            status = obj.GetProperty("status").GetInt32(),
-                            audit = obj.GetProperty("audit").GetInt32(),
-                            refuseDesc = obj.GetProperty("refuseDesc").GetString(),
-                            gateways = obj.GetProperty("gateways").GetString(),
-                            apis = obj.GetProperty("apis").ToObject<List<AppApiState>>(),
-                            webhookDomain = obj.GetProperty("webhookDomain").GetString(),
-                            webHooks = obj.GetProperty("webHooks").ToObject<List<WebHookState>>(),
-                            schools = obj.GetProperty("schools").ToObject<List<ApplySchool>>()
-                        };
-
-                        appCompanys.Add(readCompany);
-                    }
-                }
-            }
-
-            return Ok(new { state = 200, appCompanys });
-        }
-
-        /// <summary>
-        /// 新增或者修改应用
-        /// </summary>
-        /// <param name="appCompany"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [AuthToken(Roles = "admin,rdc,company")]
-        [HttpPost("set-info")]
-        public async Task<IActionResult> SetAppInfo(AppCompany appCompany, [FromHeader] string site)
-        {
-            try
-            {
-                var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
-                var cosmosClient = _azureCosmos.GetCosmosClient();
-                var tableClient = _azureStorage.GetCloudTableClient();
-                var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.Global))
-                {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
-                }
-                StringBuilder stringBuilder = new($"{loginName}【{loginId}】");
-                string type = "";
-                //新建
-                if (string.IsNullOrEmpty($"{appCompany.id}"))
-                {
-                    appCompany.id = GenerateRandom.StrRandom(8, large: true, small: true);
-                    appCompany.code = $"App-{appCompany.code}";
-                    appCompany.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                    appCompany.status = -1;
-                    appCompany.audit = -1;
-                    appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").CreateItemAsync<AppCompany>(appCompany, new PartitionKey(appCompany.code));
-                    stringBuilder.Append($"新增应用,应用ID:{appCompany.id},应用名称:{appCompany.name}");
-                    type = "appCompany-add";
-                }
-                //修改
-                else
-                {
-                    var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(appCompany.id, new PartitionKey(appCompany.code));
-                    if (response.Status == 200)
-                    {
-                        appCompany.pk = "App";
-                        appCompany.ttl = -1;
-                        appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AppCompany>(appCompany, appCompany.id, new PartitionKey(appCompany.code));
-                        stringBuilder.Append($"修改应用,应用ID:{appCompany.id},应用名称:{appCompany.name}");
-                        type = "appCompany-update";
-                    }
-                    else return Ok(new { state = 404, msg = "未找到该id相关的企业应用信息" });
-                }
-
-                //保存操作记录
-                //await _azureStorage.SaveBILog(type, stringBuilder.ToString(), _dingDing, httpContext: HttpContext);
-                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, type, stringBuilder.ToString(), _dingDing, httpContext: HttpContext);
-                return Ok(new { state = 200, appCompany });
-            }
-            catch (Exception e)
-            {
-                await _dingDing.SendBotMsg($"BI,{_option.Location} , /appcompany/set-info   \n {e.Message}\n{e.StackTrace} \n ", GroupNames.成都开发測試群組);
-                return BadRequest();
-            }
-        }
-
-        /// <summary>
-        /// 查询未审核的信息
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [HttpPost("get-noaudit")]
-        public async Task<IActionResult> GetNoAudit(JsonElement jsonElement) 
-        {
-            if(!jsonElement.TryGetProperty("operate", out JsonElement operate)) return BadRequest();
-            jsonElement.TryGetProperty("site", out JsonElement site);
-            var cosmosClient = _azureCosmos.GetCosmosClient();
-            var tableClient = _azureStorage.GetCloudTableClient();
-            var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-            if ($"{site}".Equals(BIConst.Global))
-            {
-                cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
-                blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
-            }
-            StringBuilder sqlTxt = new();
-
-            switch (operate.GetString())
-            {
-                case "api":
-                    sqlTxt.Append($"SELECT c.id, c.code,c.name,c.pk,c.audit,ARRAY(SELECT VALUE a FROM a in c.apis where a.status = -1) as operate FROM c where c.pk='App' and c.audit=1");
-                    break;
-                case "school":
-                    sqlTxt.Append($"SELECT c.id, c.code,c.name,c.pk,c.audit,ARRAY(SELECT VALUE a FROM a in c.schools where a.status = -1) as operate FROM c where c.pk='App' and c.audit=1");
-                    break;
-                default:
-                    sqlTxt.Append($"select c.id,c.code,c.name,c.pk,c.audit from c where c.audit=-1 and c.pk='App'");
-                    break;
-            }
-
-            List<NoAudit> noAudits = new();
-
-            await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "Normal").GetItemQueryStreamIterator(queryText: sqlTxt.ToString(), requestOptions: new QueryRequestOptions() { })) 
-            {
-                var json = await JsonDocument.ParseAsync(item.ContentStream);
-                if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetInt16() > 0) 
-                {
-                    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray()) 
-                    {
-                        NoAudit noAudit = new();
-                        noAudit.id = obj.GetProperty("id").GetString();
-                        noAudit.code = obj.GetProperty("code").GetString();
-                        noAudit.pk = obj.GetProperty("pk").GetString();
-                        noAudit.name = obj.GetProperty("name").GetString();
-                        if (!string.IsNullOrEmpty($"{operate}"))
-                        {
-                            noAudit.operate = obj.GetProperty("operate").ToObject<List<object>>();
-                        }
-                        noAudit.audit = obj.GetProperty("audit").GetInt32();
-
-                        noAudits.Add(noAudit);
-                    }
-                }            
-            }
-
-            return Ok(new { state = 200, noAudits });
-        }
-
-        /// <summary>
-        /// 审核应用是否通过
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        [AuthToken(Roles = "admin,rdc")]
-        [HttpPost("get-apply")]
-        public async Task<IActionResult> SetAuditApp(JsonElement jsonElement)
-        {
-            try
-            {
-                var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
-                if (!jsonElement.TryGetProperty("appIds", out JsonElement appIds)) return BadRequest();
-                if (!jsonElement.TryGetProperty("isAudit", out JsonElement isAudit)) return BadRequest();
-                jsonElement.TryGetProperty("refuseDesc", out JsonElement refuseDesc);
-                jsonElement.TryGetProperty("site", out JsonElement site);
-                var cosmosClient = _azureCosmos.GetCosmosClient();
-                var tableClient = _azureStorage.GetCloudTableClient();
-                var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.Global)) 
-                {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
-                }
-                StringBuilder strMsg = new($"{loginName}【{loginId}】");
-                List<AppIdOrCode> idOrCode = appIds.ToObject<List<AppIdOrCode>>();
-                List<AppIdOrCode> haveIds = new();
-                if (idOrCode.Count > 0)
-                {
-                    foreach (var idCode in idOrCode)
-                    {
-                        AppCompany appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemAsync<AppCompany>(idCode.id, new PartitionKey(idCode.code));
-                        strMsg.Append($"审核应用{appCompany.name}【{appCompany.id}】,审核状态:");
-                        //var response = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemStreamAsync(idCode.id, new PartitionKey(idCode.code));
-                        if (bool.Parse($"{isAudit}") == true)
-                        {
-                            appCompany.audit = 1;
-                            appCompany.jwtKey = JwtAuth.CreateApplyJwtKeyBI(_option.HostName, _option.JwtSecretKey, appCompany);
-                            strMsg.Append("通过。");
-                        }
-                        else
-                        {
-                            appCompany.audit = 0;
-                            appCompany.refuseDesc = $"{refuseDesc}";
-                            strMsg.Append("拒绝通过。");
-                        }
-                        try
-                        {
-                            
-                            await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AppCompany>(appCompany, appCompany.id, new PartitionKey(idCode.code));
-                        }
-                        catch
-                        {
-                            haveIds.Add(idCode);
-                            strMsg.Append($"异常:id:{idCode.id},code:{idCode.code};");
-                        }
-                    }
-                }
-                else return Ok(new { state = 404, msg = "appIds参数错误" });
-
-                //保存操作记录
-                //await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-
-                if (haveIds.Count > 0)
-                    return Ok(new { state = 201, msg = "部分应用审核失败!", haveIds });
-                else return Ok(new { state = 200 });
-            }
-            catch (Exception e)
-            {
-                await _dingDing.SendBotMsg($"BI,{_option.Location} , /appcompany/get-applyapi   \n {e.Message}\n{e.StackTrace} \n ", GroupNames.成都开发測試群組);
-                return BadRequest();
-            }
-        }
-
-        /// <summary>
-        /// 应用申请Api接口信息
-        /// 审核应用api接口信息
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [AuthToken(Roles = "admin,rdc,company")]
-        [HttpPost("set-applyapi")]
-        public async Task<IActionResult> SetApplyApi(JsonElement jsonElement)
-        {
-            try
-            {
-                var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
-                if (!jsonElement.TryGetProperty("applyApis", out JsonElement jsApplyApis)) return BadRequest();
-                if (!jsonElement.TryGetProperty("operate", out JsonElement operate)) return BadRequest();
-                jsonElement.TryGetProperty("site", out JsonElement site);
-
-                StringBuilder strMsg = new($"{loginName}【{loginId}】");
-                var cosmosClient = _azureCosmos.GetCosmosClient();
-                var tableClient = _azureStorage.GetCloudTableClient();
-                var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.Global))
-                {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
-                }
-                string bizcode = "";  //消息名称
-                List<string> sendWhom = new();//消息分发给谁   待完善
-                List<ApplyApi> applyApis = jsApplyApis.ToObject<List<ApplyApi>>();
-                List<ApplyApi> haveApi = new();  //存在api接口
-                Dictionary<string,string> noAudit = new();
-
-                foreach (var tempApp in applyApis)
-                {
-                    AppCompany appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemAsync<AppCompany>($"{tempApp.appId}", new PartitionKey($"{tempApp.appCode}"));
-
-                    if (appCompany != null || appCompany.audit != -1 || appCompany.audit != 0)
-                    {
-                        switch (operate.GetString())
-                        {
-                            case "apply":
-                                strMsg.Append($"申请:{appCompany.name}【{appCompany.id}】应用的Api:");
-                                if (!jsonElement.TryGetProperty("applyDesc", out JsonElement applyDesc)) return BadRequest();
-                                tempApp.apiIds.ForEach(x =>
-                                {
-                                    var strt = appCompany.apis.Find(y => y.no.Equals($"{x}"));
-                                    if (strt == null)
-                                    {
-                                        appCompany.apis.Add(new AppApiState() { no = $"{x}", applyDesc = $"{applyDesc}", status = -1 });
-                                        strMsg.Append($"{x},");
-                                    }
-                                    else haveApi.Add(tempApp);
-                                });
-                                sendWhom.Add(appCompany.id);
-                                bizcode = "applyapi";
-                                if (haveApi.Count > 0) strMsg.Append($"已有存在的api:{haveApi.ToJsonString()}。");
-                                break;
-                            case "audit":
-                                if (!jsonElement.TryGetProperty("isAudit", out JsonElement isAudit)) return BadRequest();
-                                string refuseDesc = "";
-                                if (bool.Parse($"{isAudit}") == false)
-                                {
-                                    if (!jsonElement.TryGetProperty("refuseDesc", out JsonElement jsonRefuseDesc)) return BadRequest();
-                                    refuseDesc = jsonRefuseDesc.GetString();
-                                }
-
-                                strMsg.Append($"审核{appCompany.name}【{appCompany.id}】应用的Api:");
-                                tempApp.apiIds.ForEach(x =>
-                                {
-                                    var temp = appCompany.apis.Find(n => n.no == x);
-                                    if (temp != null)
-                                    {
-                                        AppApiState appApiState = appCompany.apis.Single(a => a.no == x);
-                                        if (bool.Parse($"{isAudit}") == true)
-                                        {
-                                            appApiState.status = 1;
-                                            appApiState.refuseDesc = null;
-                                            appCompany.jwtKey = JwtAuth.CreateApplyJwtKeyBI(_option.HostName, _option.JwtSecretKey, appCompany);
-                                            strMsg.Append($"{appApiState.no}通过,");
-                                        }
-                                        else
-                                        {
-                                            appApiState.status = 0;
-                                            appApiState.refuseDesc = $"{refuseDesc}";
-                                            strMsg.Append($"{appApiState.no}失败,");
-                                        }
-                                    }
-                                    else haveApi.Add(tempApp);
-                                });
-
-                                if (haveApi.Count > 0) strMsg.Append($"该应用没有申请相关API接口:{haveApi.ToJsonString()}。");
-                                sendWhom.Add(appCompany.id);
-                                bizcode = "auditapi";
-
-                                break;
-                            default:
-                                return Ok(new { state = 400, msg = "operate参数错误" });
-                        }
-                        appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AppCompany>(appCompany, appCompany.id, new PartitionKey(appCompany.code));
-                    }
-                    else noAudit.Add($"{appCompany.id}", $"{appCompany.name}");
-                }
-
-                //发送消息
-                var location = _option.Location;
-                Notification notification = new()
-                {
-                    hubName = bizcode,
-                    type = "msg",
-                    from = $"BI:{_option.Location}:private",
-                    to = sendWhom,
-                    label = $"{bizcode}-appCompany",
-                    body = new { location = location, biz = bizcode, appid = sendWhom, appName = sendWhom, status = 1, time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() }.ToJsonString(),
-                };
-
-                var url = _configuration.GetValue<string>("HaBookAuth:CoreService:sendnotification");
-                var clientID = _configuration.GetValue<string>("HaBookAuth:CoreService:clientID");
-                var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
-                await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
-
-                //保存操作记录
-                //await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-                if (haveApi.Count > 0 || noAudit.Count > 0)
-                    return Ok(new { state = 201, msg = "部分成功", haveApi, noAudit });
-                else return Ok(new { state = 200 });
-            }
-            catch (Exception e)
-            {
-                await _dingDing.SendBotMsg($"BI,{_option.Location} , /appcompany/get-applyapi   \n {e.Message}\n{e.StackTrace} \n ", GroupNames.成都开发測試群組);
-                return BadRequest();
-            }
-        }
-
-        /// <summary>
-        /// 应用申请学校
-        /// 应用审核申请的学校
-        /// </summary>
-        /// <param name="jsonElement"></param>
-        /// <returns></returns>
-        [ProducesDefaultResponseType]
-        [AuthToken(Roles = "admin,rdc,company")]
-        [HttpPost("set-applyschool")]
-        public async Task<IActionResult> SetAuditSchool(JsonElement jsonElement)
-        {
-            try
-            {
-                var (loginId, loginName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
-                if (!jsonElement.TryGetProperty("appId", out JsonElement appId)) return BadRequest();
-                if (!jsonElement.TryGetProperty("appCode", out JsonElement appCode)) return BadRequest();
-                if (!jsonElement.TryGetProperty("schooCode", out JsonElement schooCode)) return BadRequest();
-                if (!jsonElement.TryGetProperty("operate", out JsonElement operate)) return BadRequest();
-                jsonElement.TryGetProperty("site", out JsonElement site);
-
-                var cosmosClient = _azureCosmos.GetCosmosClient();
-                var tableClient = _azureStorage.GetCloudTableClient();
-                var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
-                if ($"{site}".Equals(BIConst.Global)) 
-                {
-                    cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
-                    tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
-                    blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
-                }
-                StringBuilder strMsg = new($"{loginName}【{loginId}】操作:");
-                List<string> haveSchool = new();
-                List<string> sendWhom = new();//消息分发给谁   待完善
-                string bizcode = "";  //消息名称
-
-                AppCompany appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReadItemAsync<AppCompany>($"{appId}", new PartitionKey($"{appCode}"));
-                if (appCompany.audit == -1 || appCompany.audit == 0) 
-                {
-                    return Ok(new { state = 401, msg = "应用未审核请先审核应用程序" });
-                }
-
-                if (appCompany != null)
-                {
-                    switch (operate.GetString())
-                    {
-                        case "apply":
-                            var aSchool = appCompany.schools.Find(x => x.id.Equals($"{schooCode}"));
-                            if (!jsonElement.TryGetProperty("name", out JsonElement name)) return BadRequest();
-                            if (aSchool == null)
-                            {
-                                jsonElement.TryGetProperty("picture", out JsonElement picture);
-                                strMsg.Append($"应用{appCompany.name}【{appCompany.id}】申请学校{name}【{schooCode}】,申请成功。");
-                                appCompany.schools.Add(new ApplySchool() { id = $"{schooCode}", name = $"{name}", picture = $"{picture}" });
-                            }
-                            else
-                            {
-                                haveSchool.Add(schooCode.GetString());
-                                strMsg.Append($"应用{appCompany.name}【{appCompany.id}】申请的学校{name}【{schooCode}】已存在。");
-                            }
-                            sendWhom = new List<string> { "1528783103", "1636016499" };
-                            bizcode = "applyschool";
-
-                            break;
-                        case "audit":
-                            if (!jsonElement.TryGetProperty("isAudit", out JsonElement isAudit)) return BadRequest();
-                            string refuseDesc = "";
-                            if (bool.Parse($"{isAudit}") == false)
-                            {
-                                if (!jsonElement.TryGetProperty("refuseDesc", out JsonElement jsonRefuseDesc)) return BadRequest();
-                                refuseDesc = jsonRefuseDesc.GetString();
-                            }
-
-                            var applySchool = appCompany.schools.Find(x => x.id.Equals($"{schooCode}"));
-                            strMsg.Append($"审核应用{appCompany.name}【{appCompany.id}】状态:");
-                            if (applySchool != null)
-                            {
-                                if (bool.Parse($"{isAudit}") == true)
-                                {
-                                    applySchool.status = 1;
-                                    applySchool.refuseDesc = null;
-                                    appCompany.jwtKey = JwtAuth.CreateApplyJwtKeyBI(_option.HostName, _option.JwtSecretKey, appCompany);
-                                    strMsg.Append($"审核成功。");
-                                }
-                                else
-                                {
-                                    applySchool.status = 0;
-                                    applySchool.refuseDesc = $"{refuseDesc}";
-                                    strMsg.Append($"审核失败。");
-                                }
-                            }
-                            else
-                            {
-                                haveSchool.Add(schooCode.GetString());
-                                strMsg.Append($"已审核状态!");
-                            }
-                            sendWhom = new List<string> { "1528783103", "1636016499" };
-                            bizcode = "auditschool";
-
-                            break;
-                        default:
-                            return Ok(new { state = 400, msg = "operate参数错误" });
-                    }
-
-                    appCompany = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<AppCompany>(appCompany, appCompany.id, new PartitionKey(appCompany.code));
-                }
-                else return Ok(new { state = 404, msg = "未找到该应用" });
-
-                //发送消息
-                var location = _option.Location;
-                Notification notification = new()
-                {
-                    hubName = bizcode,
-                    type = "msg",
-                    from = $"BI:{_option.Location}:private",
-                    to = sendWhom,
-                    label = $"{bizcode}-appCompany",
-                    body = new { location = location, biz = bizcode, appid = appCompany.id, appName = appCompany.name, status = 1, time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() }.ToJsonString(),
-                };
-
-                var url = _configuration.GetValue<string>("HaBookAuth:CoreService:sendnotification");
-                var clientID = _configuration.GetValue<string>("HaBookAuth:CoreService:clientID");
-                var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
-                await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
-
-                //保存操作记录
-                //await _azureStorage.SaveBILog("appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "appCompany-update", strMsg.ToString(), _dingDing, httpContext: HttpContext);
-                if (haveSchool.Count > 0) return Ok(new { state = 201, msg = "已存在学校,无须申请!", haveSchool });
-                else return Ok(new { state = 200 });
-            }
-            catch (Exception e)
-            {
-                await _dingDing.SendBotMsg($"BI,{_option.Location} , /appcompany/set-auditschool   \n {e.Message}\n{e.StackTrace}\n{e.StackTrace} \n ", GroupNames.成都开发測試群組);
-                return BadRequest();
-            }
-        }
-
-        /// <summary>
-        /// 应用申请和审核api信息
-        /// </summary>
-        public record ApplyApi
-        {
-            public string appId { get; set; }
-            public string appCode { get; set; }
-            public List<string> apiIds { get; set; }
-        }
-
-        /// <summary>
-        /// 审核应用
-        /// </summary>
-        public record AppIdOrCode
-        {
-            public string id { get; set; }
-            public string code { get; set; }
-        }
-
-        /// <summary>
-        /// 未审核应用
-        /// </summary>
-        public record NoAudit 
-        { 
-            public string id { get; set; }
-            public string code { get; set; }
-
-            public string pk { get; set; }
-
-            public string name { get;set; }
-            public List<object> operate { get; set; }
-            public int audit { get; set; }
-        }
-
-        /// <summary>
-        /// 显示应用
-        /// </summary>
-        public record ReadCompany
-        {
-            public string id { get; set; }
-            public string pk { get; set; }
-            public string code { get; set; }
-            public string name { get; set; }
-            public string descr { get; set; }
-            public string picture { get; set; }
-            public string jwtKey { get; set; }
-            public int status { get; set; }
-            public int audit { get; set; }
-            public string refuseDesc { get; set; }
-            public string gateways { get; set; }
-            public List<AppApiState> apis { get; set; }
-            public string webhookDomain { get; set; }
-            public List<WebHookState> webHooks { get; set; }
-            public List<ApplySchool> schools { get; set; }
-        }
-
-    }
-}

+ 3 - 4
TEAMModelBI/Controllers/BINormal/AreaRelevantController.cs

@@ -41,6 +41,8 @@ namespace TEAMModelBI.Controllers.BINormal
             _azureStorage = azureStorage;
             _dingDing = dingDing;
             _option = option?.Value;
+            _configuration = configuration;
+            _coreAPIHttpService = coreAPIHttpService;
         }
 
         /// <summary>
@@ -72,7 +74,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 if (isManyArea)
                 {
                     sqltxt = $"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period,c.areaId,c.standard,c.manyAreas FROM c join m in c.manyAreas WHERE c.areaId ='{_areaId}' or m.areaId='{_areaId}'";
-                    //sqltxt = $"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period FROM c join m in c.manyAreas where m.areaId='{_areaId}' or c.areaId='{_areaId}'";
                 }
 
                 await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqltxt, requestOptions:new QueryRequestOptions() { PartitionKey = new PartitionKey("Base")})) 
@@ -133,7 +134,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 jsonElement.TryGetProperty("isDefault", out JsonElement isDefault);
                 jsonElement.TryGetProperty("site", out JsonElement site);
 
-
                 var (_tmdId, _tmdName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
@@ -198,7 +198,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 School school = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<School>(tempSchool, tempSchool.id, new PartitionKey("Base"));
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】已操作学校({schoolId})移除该区域", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-update", $"{_tmdName}【{_tmdId}】已操作学校(ID:{schoolId})移除已区域(ID:{areaId})", _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, school });
             }
@@ -393,6 +392,7 @@ namespace TEAMModelBI.Controllers.BINormal
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-assists")]
         public async Task<IActionResult> GetAssists(JsonElement jsonElement)
         {
@@ -457,7 +457,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 else { noIds.Add(item); }
             }
 
-
             return Ok(new { state = 200, areaAssists, noIds });
 
         }

+ 1 - 6
TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -194,7 +194,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 //操作记录实体
                 var tempStandard = !string.IsNullOrEmpty($"{oldStandard}") && !string.IsNullOrEmpty($"{_oldId}") ? $"{oldStandard}" : "standard2";
 
-                //var table = _azureStorage.GetCloudTableClient().GetTableReference("IESLogin");
                 var cosmosClient = _azureCosmos.GetCosmosClient();//数据库连接
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
@@ -215,8 +214,6 @@ namespace TEAMModelBI.Controllers.BINormal
                     cosmosClient = _azureCosmos.GetCosmosClient(name: BIConst.Global);
                     tableClient = _azureStorage.GetCloudTableClient(BIConst.Global);
                     blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", name: BIConst.Global);
-                    //serBusClient = _serviceBus.GetServiceBusClient(BIConst.Global);  //暂未确定使用默认
-                    //activeTask = _configuration.GetValue<string>("GlobalAzure:ServiceBus:ActiveTask");   //暂未确定使用默认
                 }
 
                 var table = tableClient.GetTableReference("IESLogin");
@@ -619,8 +616,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 jsonElement.TryGetProperty("newName", out JsonElement newName);
                 jsonElement.TryGetProperty("site", out JsonElement site);
 
-
-
                 var (_tmdId, _tmdName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(HttpContext.GetXAuth("AuthToken"), _option);
                 //操作记录实体
                 string blobOrTable = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString();
@@ -857,7 +852,6 @@ namespace TEAMModelBI.Controllers.BINormal
                 await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //发送站内发送消息
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("area-cut", $"{_tmdName}【{_tmdId}】已操作【{_oldStandard}】切换至{_newStandard}微能力点,复制标准:{_newStandard}", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "area-cut", $"{_tmdName}【{_tmdId}】已操作【{_oldStandard}】切换至{_newStandard}微能力点,复制标准:{_newStandard}", _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200 });
             }
@@ -873,6 +867,7 @@ namespace TEAMModelBI.Controllers.BINormal
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("del-area")]
         public async Task<IActionResult> DelArea(JsonElement jsonElement)
         {

+ 0 - 3
TEAMModelBI/Controllers/BINormal/BusinessConfigController.cs

@@ -119,7 +119,6 @@ namespace TEAMModelBI.Controllers.BINormal
                     bizConfig = await cosmosClient.GetContainer("TEAMModelOS", "Normal").ReplaceItemAsync<BizConfig>(bizConfig, bizConfig.id, new PartitionKey("BizConfig"));
                     strMsg.Append($"{bizConfig.name}【{bizConfig.id}】修改企业基础信息。");
                     type = "bizconfig-update";
-
                 }
             }
 
@@ -128,7 +127,6 @@ namespace TEAMModelBI.Controllers.BINormal
             return Ok(new { state = RespondCode.Ok, bizConfig });
         }
 
-
         /// <summary>
         /// 获取企业信息列表   //已对接
         /// </summary>
@@ -325,7 +323,6 @@ namespace TEAMModelBI.Controllers.BINormal
             return Ok(new { state = RespondCode.Ok , openSchools });
         }
 
-
         public record OpenSchool
         {
             public string id { get; set; }

+ 6 - 27
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -93,7 +93,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 List<BISchool> schools = new();
                 List<BISchool> userScs = new();
                 List<BISchool> cutArea = new();
-                StringBuilder stringBuilder = new StringBuilder($"{_tmdName}【{_tmdId}】使用批量创校功能:");
+                StringBuilder stringBuilder = new($"{_tmdName}【{_tmdId}】使用批量创校功能:");
                 var cosmosClient = _azureCosmos.GetCosmosClient();
                 var tableClient = _azureStorage.GetCloudTableClient();
                 var blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public");
@@ -205,7 +205,7 @@ namespace TEAMModelBI.Controllers.BISchool
                                             //教师存在,在该教师信息中添加要管理的学校信息
                                             teacher.schools.Add(new Teacher.TeacherSchool { areaId = string.IsNullOrEmpty(bischool.areaId) ? "" : bischool.areaId, schoolId = createSchoolInfo.id, name = bischool.name, status = "join", time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
                                             //await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<Teacher>(teacher, coreUser.id, new PartitionKey("Base"));
-                                            SchoolTeacher schoolTeacher = new SchoolTeacher
+                                            SchoolTeacher schoolTeacher = new()
                                             {
                                                 id = coreUser.id,
                                                 code = $"Teacher-{createSchoolInfo.id}",
@@ -271,7 +271,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 else return Ok(new { state = 1, message = "创校信息为空" });
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 if (schools.Count == foundSchools.biSchools.Count || userScs.Count == foundSchools.biSchools.Count)
                     return Ok(new { state = RespondCode.CreateFailed, message = "已有部分学校批量创建成功;学校已经重复/学校信息有误!请检查学校信息!", schools, userScs });
@@ -727,7 +726,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】修改学校功能,修改的学校:{_schoolId},{_type},{picture},{size},{string.Join("|", assistId.ToArray())}", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-update", $"{_tmdName}【{_tmdId}】修改学校功能,修改的学校:{_schoolId},{_type},{picture},{size},{string.Join("|", assistId.ToArray())}", _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200 });
@@ -817,26 +815,6 @@ namespace TEAMModelBI.Controllers.BISchool
 
                 schoolAssist.assists = await CommonFind.FindSchoolRoles(cosmosClient, itemSchool.id, "assist");
 
-                //List<Assist> assists = new List<Assist>();
-                ////查询学校的顾问
-                //string managerSql = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId, c.id, c.name FROM c WHERE ARRAY_CONTAINS(c.roles, 'assist', true) AND c.pk = 'Teacher' AND c.status = 'join' AND c.code = 'Teacher-{itemSchool.id}'";
-                //var cosmosClent = _azureCosmos.GetCosmosClient();
-                //await foreach (var item in cosmosClent.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: managerSql, requestOptions: new QueryRequestOptions() { }))
-                //{
-                //    using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                //    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
-                //    {
-                //        Assist assist = new Assist
-                //        {
-                //            tmdId = obj.GetProperty("id").GetString(),
-                //            tmdName = obj.GetProperty("name").GetString()
-                //        };
-
-                //        assists.Add(assist);
-                //    }
-                //}
-                //schoolAssist.assists = assists;
-
                 schoolAssists.Add(schoolAssist);
             }
 
@@ -845,6 +823,7 @@ namespace TEAMModelBI.Controllers.BISchool
 
 
         #region   预设学校基础信息 多语言
+
         /// <summary>
         /// 预设学校基础信息 多语言
         /// </summary>
@@ -855,8 +834,8 @@ namespace TEAMModelBI.Controllers.BISchool
         public List<Period> PresetSchoolPeriod(List<string> period, string Language, string campusId)
         {
             var builder = $"{_environment.ContentRootPath}/JsonFile/Preset/LangSchoolConfig.json";
-            StreamReader streamReader = new StreamReader(new FileStream(builder, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Encoding.UTF8);
-            StringBuilder stringBuilder = new StringBuilder();
+            StreamReader streamReader = new(new FileStream(builder, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Encoding.UTF8);
+            StringBuilder stringBuilder = new();
             string text;
             while ((text = streamReader.ReadLine()) != null)
             {
@@ -875,7 +854,7 @@ namespace TEAMModelBI.Controllers.BISchool
                     schoolConfig = schoolConfigs.Find(x => x.Lang.Contains("zh-CN"));
             }
 
-            List<Period> periods = new List<Period>();
+            List<Period> periods = new();
             period.ForEach(x =>
             {
                 periods.Add(new Period

+ 0 - 1
TEAMModelBI/Controllers/BISchool/RoomController.cs

@@ -81,7 +81,6 @@ namespace TEAMModelBI.Controllers.BISchool
                     if (!string.IsNullOrEmpty($"{serial}")) { stringBudeler.Append($"绑定。"); } else { stringBudeler.Append($"解绑。"); }
 
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("room-update", $"{_tmdName}【{_tmdId}】将{roomInfo.id}教师和{serial}产品绑定", _dingDing, httpContext: HttpContext);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "room-update", $"{_tmdName}【{_tmdId}】将{roomInfo.id}教师和{serial}产品绑定", _dingDing, httpContext: HttpContext);
                 }
                 else

+ 7 - 46
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -121,7 +121,6 @@ namespace TEAMModelBI.Controllers.BISchool
                     {
                         foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
-                            //List<string> temp0 = obj.GetProperty("period").ToObject<List<Period>>().Select(x=>x.name).ToList();
                             NotAreaSchool notAreaSchool = new NotAreaSchool()
                             {
                                 id = obj.GetProperty("id").GetString(),
@@ -270,7 +269,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("school-update", $"{_tmdName}【{_tmdId}】操作学校加入区域功能,加入的区域:{standard},学校ID:{string.Join("|", schoolCodes.ToArray())}", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-update", msg.ToString(), _dingDing, httpContext: HttpContext);
 
                 return Ok(new { state = 200 });
@@ -303,9 +301,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 string sqlTxt = $"select c.id,c.code,c.schoolCode,c.name,c.region,c.province,c.city,c.dist,c.size,c.address,c.picture,c.type,c.scale,c.areaId,c.standard,c.period from c where c.id='{schoolId}'";
                 await foreach (var itemSchool in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<AssistSchool>(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                 {
-                    //schoolAssists.Add(itemSchool);
                     schoolAssists = itemSchool;
-                    //school = itemSchool;
                 }
 
                 if (schoolAssists.id != null)
@@ -366,7 +362,6 @@ namespace TEAMModelBI.Controllers.BISchool
                     blobClient = _azureStorage.GetBlobContainerClient(containerName: "0-public", BIConst.Global);
                 }
                 string _auth = HttpContext.GetXAuth("AuthToken");
-                //var (tmdId, tmdName) = HttpJwtAnalysis.JwtXAuth(_auth, _option);
                 var (tmdId, tmdName, pic, did, dname, dpic) = HttpJwtAnalysis.JwtXAuthBI(_auth, _option);
                 var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(school.id, new PartitionKey($"Base"));
                 if (response.Status == 200)
@@ -391,43 +386,11 @@ namespace TEAMModelBI.Controllers.BISchool
                     schoolInfo = await cosmosClient.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<School>(school, school.id, new PartitionKey($"Base"));
 
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("school-update", $"{tmdName}【{tmdId}】修改学校信息,学校和ID:{school.name}【{school.id}】", _dingDing, httpContext: HttpContext);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-update", $"{tmdName}【{tmdId}】修改学校信息,学校和ID:{school.name}【{school.id}】", _dingDing, httpContext: HttpContext);
                 }
                 else return Ok(new { state = 400, message = "请求错误!" });
 
                 return Ok(new { state = 200, schoolInfo });
-
-                //School tempShool = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(replaceSchool.school.id, new PartitionKey("Base"));
-                //if (tempShool != null)
-                //{
-                //    List<Teacher> teachers = new List<Teacher>();
-                //    string sqltxt = $"select distinct value(c) from c join a1 in c.schools where a1.schoolId='{replaceSchool.school.id}'";
-                //    await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<Teacher>(queryText: sqltxt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
-                //    {
-                //        teachers.Add(item);
-                //    }
-
-                //    foreach (var item in teachers)
-                //    {
-                //        Teacher.TeacherSchool teacherSchool = item.schools.Find(x => x.schoolId.Equals(replaceSchool.school.id));
-                //        if (teacherSchool != null)
-                //        {
-                //            teacherSchool.name = replaceSchool.school.name;
-                //            teacherSchool.picture = replaceSchool.school.picture;
-                //            teacherSchool.areaId = replaceSchool.school.areaId;
-                //        }
-                //        await cosmosClient.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync(item, item.id, new PartitionKey("Base"));
-                //    }
-
-                //    schoolInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<School>(replaceSchool.school, replaceSchool.school.id, new PartitionKey("Base"));
-
-                //    //保存操作记录
-                //    await _azureStorage.SaveBILog("school-update", $"{replaceSchool.tmdName}【{replaceSchool.tmdId}】修改学校信息,学校和ID:{replaceSchool.school.name}【{replaceSchool.school.id}】", _dingDing, httpContext: HttpContext);
-
-                //    return Ok(new { state = 200, schoolInfo });
-                //}
-                //else return Ok(new { state = 400, message = "请求错误!" });
             }
             catch (Exception ex)
             {
@@ -441,6 +404,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-assistspace")]
         public async Task<IActionResult> GetAssistSchoolSpace(JsonElement jsonElement)
         {
@@ -662,6 +626,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-scmanage")]
         public async Task<IActionResult> GetSchoolManage(JsonElement jsonElement)
         {
@@ -789,7 +754,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 await _dingDing.SendBotMsg($"BI,{_option.Location}  /batchschool/set-schoolme \n {ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
                 return BadRequest();
             }
-
         }
 
         /// <summary>
@@ -956,7 +920,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 //}
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("set-del", msg.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "set-del", msg.ToString(), _dingDing, httpContext: HttpContext);
                 if (delSchoolRels.Count > 0)
                     return Ok(new { state = 201, delSchoolRels });
@@ -975,6 +938,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-schoolcnt")]
         public async Task<IActionResult> GetSchoolCnt(JsonElement jsonElement)
         {
@@ -1038,8 +1002,6 @@ namespace TEAMModelBI.Controllers.BISchool
 
                 string currencySql = "select value(count(c.id)) from c";
 
-                //schoolInfo.lessonCount = await CommonFind.GetSqlValueCount(cosmosClient, "School", currencySql,  $"LessonRecord-{schoolInfo.id}");
-
                 tecCnt = await CommonFind.GetSqlValueCount(cosmosClient, "School", currencySql, $"Teacher-{schoolInfo.id}"); // 教师数量
                 classCnt = await CommonFind.GetSqlValueCount(cosmosClient, "School", currencySql, $"Class-{schoolInfo.id}"); //班级
                 stuCnt = await CommonFind.GetSqlValueCount(cosmosClient, "Student", currencySql, $"Base-{schoolInfo.id}"); //学生
@@ -1086,6 +1048,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-analyse")]
         public async Task<IActionResult> GetAnalyse(JsonElement jsonElement)
         {
@@ -1192,6 +1155,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-schooldate")]
         public async Task<IActionResult> GetSchoolDate(JsonElement jsonElement)
         {
@@ -1685,14 +1649,13 @@ namespace TEAMModelBI.Controllers.BISchool
             var productAn = products.GroupBy(g => g).Select(s => new { key = s.Key, cnt = s.ToList().Count }).ToList();
 
             return Ok(new { state = RespondCode.Ok, allCnt, adCnt, scInfos, productAn });
-            // var productAn = products.GroupBy(x => x).Select(y => new { key = y.Key, count = y.ToList().Count }).ToList();
-
         }
 
         /// <summary>
         /// 通过学校Id查询详情   数据管理工具——查询工具
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetSchool(JsonElement jsonElement)
         {
@@ -1803,7 +1766,6 @@ namespace TEAMModelBI.Controllers.BISchool
                             catalog.Add(key, val);
                         }
                         useSpaceInfo = useSpaceInfo.Concat(catalog).GroupBy(g => g.Key).ToDictionary(k => k.Key, k => k.Sum(kvp => kvp.Value));  //lamebda表达式
-                        //useSpaceInfo = (from e in useSpaceInfo.Concat(catalog) group e by e.Key into g select new { Name = g.Key, value = g.Sum(kvp => kvp.Value) }).ToDictionary(item => item.Name, item => item.value);  //linq 方式合并
                     }
                     else
                     {
@@ -1817,7 +1779,6 @@ namespace TEAMModelBI.Controllers.BISchool
                         }
                         useSize += size.Item1.Value;
                         useSpaceInfo = useSpaceInfo.Concat(size.Item2).GroupBy(g => g.Key).ToDictionary(k => k.Key, k => k.Sum(kvp => kvp.Value));   //lamebda表达式
-                        //useSpaceInfo = (from e in useSpaceInfo.Concat(size.Item2) group e by e.Key into g select new { Name = g.Key, value = g.Sum(kvp => kvp.Value) }).ToDictionary(item => item.Name, item => item.value);   //linq 方式合并
                     }
                 }
             }
@@ -1889,6 +1850,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-shift")]
         public async Task<IActionResult> GetShift(JsonElement jsonElement)
         {
@@ -1946,7 +1908,6 @@ namespace TEAMModelBI.Controllers.BISchool
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("schoolTeacher-add", $"{_tmdName}【{_tmdId}】移交顾问给{newSchoolTeacher.name}【{newSchoolTeacher.id}】", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "schoolTeacher-add", $"{_tmdName}【{_tmdId}】移交顾问给{newSchoolTeacher.name}【{newSchoolTeacher.id}】", _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200 });
             }

+ 1 - 0
TEAMModelBI/Controllers/BIStudent/StudentController.cs

@@ -67,6 +67,7 @@ namespace TEAMModelBI.Controllers.BIStudent
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-classIds")]
         public async Task<IActionResult> CorrectActivityClassIds(JsonElement jsonElement)
         {

+ 0 - 1
TEAMModelBI/Controllers/BITable/BIOpenApiController.cs

@@ -135,7 +135,6 @@ namespace TEAMModelBI.Controllers.BITable
                     else return Ok(new { state = 404, msg = "未找到该id相关的Api信息" });
                 }
                 //保存操作记录
-                //await _azureStorage.SaveBILog(type, strMsg.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, type, strMsg.ToString(), _dingDing, httpContext: HttpContext);
                 
                 return Ok(new { state = 200, openApi });

+ 1 - 1
TEAMModelBI/Controllers/BITable/OperateLogController.cs

@@ -40,6 +40,7 @@ namespace TEAMModelBI.Controllers.BITable
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-record")]
         public async Task<IActionResult> GetOperateLogRecord(JsonElement jsonElement)
         {
@@ -134,7 +135,6 @@ namespace TEAMModelBI.Controllers.BITable
                 var temp = await table.DeleteStringWhere<BIOptLog>(rowKey: tableStrWhere.ToString());
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("operatelog-del", operateStr?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "operatelog-del", operateStr?.ToString(), _dingDing, httpContext: HttpContext);
 
                 if (temp.Count > 0)

+ 1 - 95
TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs

@@ -178,7 +178,6 @@ namespace TEAMModelBI.Controllers.BITable
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update", $"{_tmdName}【{_tmdId}】从钉钉组织结构更新至Azure Table表【DDUserInfo】中。", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{_tmdName}【{_tmdId}】从钉钉组织结构更新至Azure Table表【DDUserInfo】中。", _dingDing, httpContext: HttpContext);
                 var tempddUserInfos = ddUserInfos.GroupBy(c => c.userId).Select(c => c.First()).ToList();//去重
                 //List<DingDingUserInfo> TempdingDingUserInfos = await _azureStorage.SaveOrUpdateAll(dingDingUserInfos);  //只是保存至Table
@@ -401,7 +400,6 @@ namespace TEAMModelBI.Controllers.BITable
                 ddUserInfo = await table.UpdateAll<DingDingUserInfo>(ddUserInfo);
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, ddUserInfo, roles, permissions });
             }
@@ -459,65 +457,6 @@ namespace TEAMModelBI.Controllers.BITable
                 userInfo.Where((x, i) => userInfo.FindIndex(z => z.RowKey.Equals(x.RowKey)) == i);//Lambda表达式去重
                 //userInfo.GroupBy(p => p).Select(p => p.Key).ToList();//去重复
 
-                //List<DingDingUserInfo> ddUserInfo = new();
-                //List<DingDingUserInfo> tempUser = new();
-
-                //tempUser = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "deptId", $"{deptId}" } });
-                //if (tempUser.Count == 0)
-                //{
-                //    tempUser = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "pid", $"{deptId}" } });
-                //}
-
-                //foreach (var itemUser in tempUser)
-                //{
-                //    var tempUser1 = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "pid", $"{deptId}" } });
-                //    foreach (var itemUser1 in tempUser1)
-                //    {
-                //        if (!long.Parse($"{deptId}").Equals(itemUser1.pid))
-                //        {
-                //            var tempUser2 = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "pid", $"{itemUser1.pid}" } });
-                //            foreach (var itemUser2 in tempUser2)
-                //            {
-                //                if (!itemUser1.pid.Equals(itemUser2.pid))
-                //                {
-                //                    var tempUser3 = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "pid", $"{itemUser2.pid}" } });
-                //                    foreach (var itemUser3 in tempUser3)
-                //                    {
-                //                        if (!itemUser2.pid.Equals(itemUser3.pid))
-                //                        {
-                //                            var tempUser4 = await _azureStorage.FindListByDict<DingDingUserInfo>(new Dictionary<string, object> { { "pid", $"{itemUser3.pid}" } });
-                //                            foreach (var itemUser4 in tempUser4)
-                //                            {
-                //                                if (!itemUser3.pid.Equals(itemUser4.pid)) { }
-                //                                if (ddUserInfo.Find(x => x.RowKey.Equals(itemUser4.RowKey)) == null)
-                //                                {
-                //                                    ddUserInfo.Add(itemUser4);
-                //                                }
-                //                            }
-                //                        }
-                //                        if (ddUserInfo.Find(x => x.RowKey.Equals(itemUser3.RowKey)) == null)
-                //                        {
-                //                            ddUserInfo.Add(itemUser3);
-                //                        }
-                //                    }
-                //                }
-                //                if (ddUserInfo.Find(x => x.RowKey.Equals(itemUser2.RowKey)) == null)
-                //                {
-                //                    ddUserInfo.Add(itemUser2);
-                //                }
-                //            }
-                //        }
-                //        if (ddUserInfo.Find(x => x.RowKey.Equals(itemUser1.RowKey)) == null)
-                //        {
-                //            ddUserInfo.Add(itemUser1);
-                //        }
-                //    }
-                //    if (ddUserInfo.Find(x => x.RowKey.Equals(itemUser.RowKey)) == null)
-                //    {
-                //        ddUserInfo.Add(itemUser);
-                //    }
-                //}
-
                 List<DDUserInfo> ddUserInfos = new();
                 foreach (var item in userInfo)
                 {
@@ -711,7 +650,6 @@ namespace TEAMModelBI.Controllers.BITable
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update",msg.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", msg.ToString(), _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, ddUserInfos });
             }
@@ -820,7 +758,6 @@ namespace TEAMModelBI.Controllers.BITable
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update", msg.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", msg.ToString(), _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, roles });
 
@@ -952,8 +889,7 @@ namespace TEAMModelBI.Controllers.BITable
                 }
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update", $"{_tmdName}【{_tmdId}】从钉钉组织结构更新至Azure Table表【DDUserInfo】中。", _dingDing, httpContext: HttpContext);
-                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{_tmdName}【{_tmdId}】从钉钉组织结构更新至Azure Table表【DDUserInfo】中。", _dingDing, httpContext: HttpContext);
+                await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{_tmdName}【{_tmdId}】从钉钉组织结构初始化至Azure Table表【DDUserInfo】中。", _dingDing, httpContext: HttpContext);
                 var tempddUserInfos = ddUserInfos.GroupBy(c => c.userId).Select(c => c.First()).ToList();//去重
                 //List<DingDingUserInfo> TempdingDingUserInfos = await _azureStorage.SaveOrUpdateAll(dingDingUserInfos);  //只是保存至Table
                 //查询数据的数据 并和钉钉查询的数据对比,找出不同的数据,并删除  待后期测试
@@ -1037,28 +973,6 @@ namespace TEAMModelBI.Controllers.BITable
                     picture = coreUser.picture;
                 }else return Ok(new { state = 1, message = "该手机号未找到醍摩豆账户" });
 
-                //HttpClient httpClient = _http.CreateClient();
-                //string url = _configuration.GetValue<string>("HaBookAuth:CoreId:userinfo");
-                //List<string> mobiles = new List<string>() { $"{mobile}" };
-                //HttpResponseMessage responseMessage = await httpClient.PostAsJsonAsync(url, mobiles);
-                //if (responseMessage.StatusCode == HttpStatusCode.OK)
-                //{
-                //    string temp = responseMessage.Content.ReadAsStringAsync().Result;
-                //    List<JsonElement> json_id = temp.ToObject<List<JsonElement>>();
-                //    if (json_id.Count > 0)
-                //    {
-                //        foreach (var item in json_id)
-                //        {
-                //            tmdId = item.GetProperty("id").ToString();
-                //            tmdName = item.GetProperty("name").ToString();
-                //            tmdMobile = item.GetProperty("mobile").ToString();
-                //            mail = item.GetProperty("mail").ToString();
-                //            picture = item.GetProperty("picture").ToString();
-                //        }
-                //    }
-                //    else return Ok(new { state = 1, message = "该手机号未找到醍摩豆账户" });
-                //}
-
                 tempddUsers = await table.QueryWhereString<DingDingUserInfo>(tableSql.ToString());
 
                 if (tempddUsers.Count > 0)
@@ -1081,7 +995,6 @@ namespace TEAMModelBI.Controllers.BITable
                 if (ddUsers.Count > 0) ddUsers = await table.SaveOrUpdateAll(ddUsers);
 
                 //保存操作记录
-                //await _azureStorage.SaveBILog("tabledd-update", $"{_tmdName}【{_tmdId}】操作:绑定钉钉账户[{rowKey}]和醍摩豆账户[{tmdId}]", _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{_tmdName}【{_tmdId}】操作:绑定钉钉账户[{rowKey}]和醍摩豆账户[{tmdId}]", _dingDing, httpContext: HttpContext);
                 return Ok(new { state = 200, ddUsers });
             }
@@ -1151,7 +1064,6 @@ namespace TEAMModelBI.Controllers.BITable
             }
 
             //保存操作记录
-            //await _azureStorage.SaveBILog("tabledd-update", msg.ToString(), _dingDing, httpContext: HttpContext);
             await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", msg.ToString(), _dingDing, httpContext: HttpContext);
             return Ok(new { state = 200, roles });
         }
@@ -1260,12 +1172,9 @@ namespace TEAMModelBI.Controllers.BITable
                     List<DingDingUserInfo> tempddUserInfos = await table.SaveAll(ddUserInfos);
 
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("tabledd-add", $"{_tmdName}【{_tmdId}】添加待入职员工至table数据表中", _dingDing, httpContext: HttpContext);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-add", $"{_tmdName}【{_tmdId}】添加待入职员工至table数据表中", _dingDing, httpContext: HttpContext);
                     if (ddUserInfos.Count == tempddUserInfos.Count)
-                    {
                         return Ok(new { state = 200, UserInfo = tempddUserInfos });
-                    }
                     else
                     {
                         var diffArr = tempddUserInfos.Where(c => !ddUserInfos.Contains(c)).ToList();
@@ -1273,9 +1182,7 @@ namespace TEAMModelBI.Controllers.BITable
                     }
                 }
                 else
-                {
                     return Ok(new { state = 400, rspInduction.SubErrCode, rspInduction.SubErrMsg });
-                }
             }
             catch (Exception ex)
             {
@@ -1337,7 +1244,6 @@ namespace TEAMModelBI.Controllers.BITable
                     }
 
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("tabledd-del", $"{_tmdName}【{_tmdId}】从table数据表中删除离职员工", _dingDing, httpContext: HttpContext);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-del", $"{_tmdName}【{_tmdId}】从table数据表中删除离职员工", _dingDing, httpContext: HttpContext);
                     return Ok(new { state = 200 });
                 }

+ 2 - 0
TEAMModelBI/Controllers/BITeacher/TeacherController.cs

@@ -35,6 +35,7 @@ namespace TEAMModelBI.Controllers.BITeacher
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-teachers")]
         public async Task<IActionResult> GetTeachers(JsonElement jsonElement) 
         {
@@ -81,6 +82,7 @@ namespace TEAMModelBI.Controllers.BITeacher
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetInfo(JsonElement jsonElement) 
         {

+ 7 - 0
TEAMModelBI/Controllers/Census/ActivitySticsController.cs

@@ -46,6 +46,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 统计所有的评量活动,问卷调查,投票活动,作业   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-allactivity")]
         public async Task<IActionResult> GetAllActivity(JsonElement jsonElement)
         {
@@ -438,6 +439,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 所有区的统计接口 学区情况   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-all")]
         public async Task<IActionResult> GetAll(JsonElement jsonElement)
         {
@@ -533,6 +535,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-areasanls")]
         public async Task<IActionResult> GetAreasAnls(JsonElement jsonElement)
         {
@@ -580,6 +583,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-allanls")]
         public async Task<IActionResult> GetAllAnls(JsonElement jsonElement) 
         {
@@ -749,6 +753,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-termactivity")]
         public async Task<IActionResult> GetTermActivity(JsonElement jsonElement)
         {
@@ -808,6 +813,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-area")]
         public async Task<IActionResult> GetAreaActovoty(JsonElement jsonElement)
         {
@@ -867,6 +873,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetInfo(JsonElement jsonElement)
         {

+ 1 - 0
TEAMModelBI/Controllers/Census/BlobLogController.cs

@@ -132,6 +132,7 @@ namespace TEAMModelBI.Controllers.Census
         /// <param name="cosmosClient"></param>
         /// <param name="teacherIds"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         public async static Task<List<RecBlobFile>> GetBlobTeache(CosmosClient cosmosClient, List<string> teacherIds)
         {
             List<RecBlobFile> blobFiles = new();

+ 4 - 0
TEAMModelBI/Controllers/Census/ItemSticsController.cs

@@ -38,6 +38,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-totals")]
         public async Task<IActionResult> GetTotals(JsonElement jsonElement)
         {
@@ -83,6 +84,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 试题类型统计
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-type")]
         public async Task<IActionResult> GetTypeCount(JsonElement jsonElement) 
         {
@@ -151,6 +153,7 @@ namespace TEAMModelBI.Controllers.Census
         ///  依据难度统计
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-level")]
         public async Task<IActionResult> GetLevelCount(JsonElement jsonElement)
         {
@@ -287,6 +290,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetInfo(JsonElement jsonElement) 
         {

+ 7 - 1
TEAMModelBI/Controllers/Census/LessonSticsController.cs

@@ -206,6 +206,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 统计所有区级的课例和活动   //已对接
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-allarea")]
         public async Task<IActionResult> GetAllArea(JsonElement jsonElement)
         {
@@ -248,12 +249,12 @@ namespace TEAMModelBI.Controllers.Census
             return Ok(new { state = 200, areaInfos });
         }
 
-
         /// <summary>
         /// 查询课例数量
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-count")]
         public async Task<IActionResult> GetCount(JsonElement jsonElement)
         {
@@ -366,6 +367,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 统计所有的课例数据
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-diccount")]
         public async Task<IActionResult> GetDicCount(JsonElement jsonElement)
         {
@@ -600,6 +602,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetInfo(JsonElement jsonElement) 
         {
@@ -628,6 +631,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-less")]
         public async Task<IActionResult> GetLess(JsonElement jsonElement)
         {
@@ -672,6 +676,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("set-bilessonstats")]
         public async Task<IActionResult> SetBILeesonStats(JsonElement jsonElement)
         {
@@ -880,6 +885,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-alllesson")]
         public async Task<IActionResult> GetAllLessonRecords(JsonElement jsonElement)
         {

+ 5 - 0
TEAMModelBI/Controllers/Census/PaperController.cs

@@ -42,6 +42,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-count")]
         public async Task<IActionResult> GetCount(JsonElement jsonElement)
         {
@@ -112,6 +113,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 查询所有的试题数量
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-total")]
         public async Task<IActionResult> GetTotal(JsonElement jsonElement)
         {
@@ -169,6 +171,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-yerar")]
         public async Task<IActionResult> GetNewYear(JsonElement jsonElement) 
         {
@@ -228,6 +231,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-termpaper")]
         public async Task<IActionResult> GetTermPaper(JsonElement jsonElement) 
         {
@@ -294,6 +298,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetInfo(JsonElement jsonElement) 
         {

+ 4 - 3
TEAMModelBI/Controllers/Census/ProductStatisController.cs

@@ -169,6 +169,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-school")]
         public async Task<IActionResult> GetSchoolSum(JsonElement jsonElement)
         {
@@ -256,6 +257,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-assistschool")]
         public async Task<IActionResult> GetAssistSchoolId(JsonElement jsonElement)
         {
@@ -366,6 +368,7 @@ namespace TEAMModelBI.Controllers.Census
         /// 所有模组统计
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-moduleanalys")]
         public async Task<IActionResult> GetModuleAnalys(JsonElement jsonElement)
         {
@@ -486,6 +489,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-adviserschool")]
         public async Task<IActionResult> GetAdviserSchool(JsonElement jsonElement) 
         {
@@ -578,8 +582,6 @@ namespace TEAMModelBI.Controllers.Census
             public long yearSeri { get; set; }
         }
 
-
-
         public record SchoolProduct 
         {
             public string id { get; set; }
@@ -589,7 +591,6 @@ namespace TEAMModelBI.Controllers.Census
             public List<ProductStatis> product { get; set; }
         }
 
-
         public record ProductStatis 
         {
             public string prodCode { get; set; }

+ 4 - 0
TEAMModelBI/Controllers/Census/SchoolController.cs

@@ -42,6 +42,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-all")]
         public async Task<IActionResult> GetAll(JsonElement jsonElement)
         {
@@ -136,6 +137,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-assist")]
         public async Task<IActionResult> GetAssistStatis(JsonElement jsonElement)
         {
@@ -235,6 +237,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-idstatis")]
         public async Task<IActionResult> GetIdStatis(JsonElement jsonElement)
         {
@@ -350,6 +353,7 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-info")]
         public async Task<IActionResult> GetSchool(JsonElement jsonElement)
         {

+ 1 - 82
TEAMModelBI/Controllers/LoginController.cs

@@ -199,7 +199,6 @@ namespace TEAMModelBI.Controllers
                             strMsg.Append($"{item.tmdName}【{item.tmdId}】醍摩豆账号和{item.name}【{item.userId}】钉钉账户绑定成功");
 
                             //保存操作记录
-                            //await _azureStorage.SaveBILog("tabledd-update", strMsg?.ToString(), _dingDing, httpContext: HttpContext, twebsite: Website, tid: item.tmdId, tname: item.tmdName);
                             await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", strMsg?.ToString(), _dingDing, httpContext: HttpContext, twebsite: Website, tid: item.tmdId, tname: item.tmdName);
 
                             saveInfo.Add(item);                            
@@ -262,28 +261,6 @@ namespace TEAMModelBI.Controllers
                         }
                         else return Ok(new { state = 404, msg = "依据钉钉手机号未找到醍摩豆账号!" });
 
-                        //HttpClient httpClient = _http.CreateClient();
-                        //string url = _configuration.GetValue<string>("HaBookAuth:CoreId:userinfo");
-
-                        //List<string> mobiles = new() { $"{ ddUserInfo.mobile}" };
-                        //HttpResponseMessage responseMessage = await httpClient.PostAsJsonAsync(url, mobiles);
-                        //if (responseMessage.StatusCode == HttpStatusCode.OK)
-                        //{
-                        //    string temp = responseMessage.Content.ReadAsStringAsync().Result;
-                        //    List<JsonElement> json_id = temp.ToObject<List<JsonElement>>();
-                        //    if (json_id.Count > 0)
-                        //    {
-                        //        foreach (var tmd in json_id)
-                        //        {
-                        //            ddUserInfo.tmdId = tmd.GetProperty("id").ToString();
-                        //            ddUserInfo.tmdName = tmd.GetProperty("name").ToString();
-                        //            ddUserInfo.tmdMobile = tmd.GetProperty("mobile").ToString();
-                        //            ddUserInfo.picture = tmd.GetProperty("picture").ToString();
-                        //            ddUserInfo.mail = tmd.GetProperty("mail").ToString();
-                        //        }
-                        //    }
-                        //    else return Ok(new { state = 404, msg = "依据钉钉手机号未找到醍摩豆账号!" });
-                        //}
                     }
                     else return Ok(new { state = 404, msg = "钉钉手机号为空" });
 
@@ -296,7 +273,6 @@ namespace TEAMModelBI.Controllers
                     ddUserInfo = await table.Save<DingDingUserInfo>(ddUserInfo);
 
                     //保存操作记录
-                    //await _azureStorage.SaveBILog("tabledd-update", $"{ddUserInfo.tmdName}【{ddUserInfo.tmdId}】醍摩豆账号和{ddUserInfo.name}【{ddUserInfo.RowKey}】钉钉账户绑定成功", _dingDing, httpContext: HttpContext, tid: ddUserInfo.tmdId, tname: ddUserInfo.tmdName, twebsite: Website);
                     await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{ddUserInfo.tmdName}【{ddUserInfo.tmdId}】醍摩豆账号和{ddUserInfo.name}【{ddUserInfo.RowKey}】钉钉账户绑定成功", _dingDing, httpContext: HttpContext, tid: ddUserInfo.tmdId, tname: ddUserInfo.tmdName, twebsite: Website);
 
                     roles = !string.IsNullOrEmpty($"{ddUserInfo.roles}") ? new List<string>(ddUserInfo.roles.Split(",")) : new List<string>();
@@ -394,26 +370,6 @@ namespace TEAMModelBI.Controllers
                         }
                         else return Ok(new { state = 404, msg = "手机号未找到醍摩豆账户" });
 
-                        //string url = _configuration.GetValue<string>("HaBookAuth:CoreId:userinfo");
-                        //List<string> mobiles = new() { $"{mobile}" };
-                        //HttpResponseMessage responseMessage = await httpClient.PostAsJsonAsync(url, mobiles);
-                        //if (responseMessage.StatusCode == HttpStatusCode.OK)
-                        //{
-                        //    var temp = await responseMessage.Content.ReadAsStringAsync();
-                        //    if (temp.Length > 0)
-                        //    {
-                        //        List<JsonElement> itemjson = temp.ToObject<List<JsonElement>>();
-                        //        foreach (var item in itemjson)
-                        //        {
-                        //            itemUser.tmdId = item.GetProperty("id").ToString();
-                        //            itemUser.tmdName = item.GetProperty("name").ToString();
-                        //            itemUser.tmdMobile = item.GetProperty("mobile").ToString();
-                        //            itemUser.picture = item.GetProperty("picture").ToString();
-                        //            itemUser.mail = item.GetProperty("mail").ToString();
-                        //        }
-                        //    }
-                        //}
-                        //else return Ok(new { state = 404, msg = "手机号未找到醍摩豆账户" });
                     }
 
                     if (string.IsNullOrEmpty($"{mobile}") && string.IsNullOrEmpty($"{idtoken}"))
@@ -425,7 +381,6 @@ namespace TEAMModelBI.Controllers
                         roles = roles.Where(w => !string.IsNullOrEmpty(w)).ToList();
 
                         //保存操作记录
-                        //await _azureStorage.SaveBILog("tabledd-update", $"{itemUser.tmdName}【{itemUser.tmdId}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
                         await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{itemUser.tmdName}【{itemUser.tmdId}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
 
                         id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
@@ -517,43 +472,6 @@ namespace TEAMModelBI.Controllers
                             await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{coreUser.name}【{coreUser.id}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
                         }
                         else return Ok(new { state = 400, message = "该手机没有注册醍摩豆账号信息" });
-
-                        //HttpClient httpClient = _http.CreateClient();
-                        //string url = _configuration.GetValue<string>("HaBookAuth:CoreId:userinfo");
-                        //HttpResponseMessage responseMessage = await httpClient.PostAsJsonAsync(url, moile);
-
-                        //if (responseMessage.StatusCode == HttpStatusCode.OK)
-                        //{
-                        //    var temp = await responseMessage.Content.ReadAsStringAsync();
-                        //    if (temp.Length > 0)
-                        //    {
-                        //        List<JsonElement> itemjson = temp.ToObject<List<JsonElement>>();
-                        //        string tmdId = null;
-                        //        string tmdName = null;
-                        //        foreach (var item in itemjson)
-                        //        {
-                        //            tmdId = item.GetProperty("id").ToString();
-                        //            tmdName = item.GetProperty("name").ToString();
-                        //            itemUser.tmdId = tmdId?.ToString();
-                        //            itemUser.tmdName = tmdName?.ToString();
-                        //            itemUser.tmdMobile = item.GetProperty("mobile").ToString();
-                        //            itemUser.picture = item.GetProperty("picture").ToString();
-                        //            itemUser.mail = item.GetProperty("mail").ToString();
-                        //            roles = !string.IsNullOrEmpty($"{itemUser.roles}") ? new List<string>(itemUser.roles.Split(",")) : new List<string>();
-                        //            permissions = !string.IsNullOrEmpty($"{itemUser.permissions}") ? new List<string>(itemUser.permissions.Split(",")) : new List<string>();
-
-                        //            ddUserInfos.Add(itemUser);
-                        //        }
-
-                        //        ddUserInfos = await table.UpdateAll<DingDingUserInfo>(ddUserInfos);
-
-                        //        //保存操作记录
-                        //        //await _azureStorage.SaveBILog("tabledd-update", $"{tmdName}【{tmdId}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
-                        //        await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{tmdName}【{tmdId}】醍摩豆账号和{itemUser.name}【{itemUser.userId}】钉钉账户绑定成功", _dingDing, tid: itemUser.tmdId, tname: itemUser.name, twebsite: Website, httpContext: HttpContext);
-                        //    }
-                        //    else return Ok(new { state = 400, message = "该手机没有注册醍摩豆账号信息" });
-                        //}
-                        //else return Ok(new { state = responseMessage.StatusCode });
                     }
                     //自己写的
                     id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, itemUser.tmdId?.ToString(), itemUser.tmdName?.ToString(), itemUser.picture?.ToString(), _option.JwtSecretKey, scope: "assist", webSite: Website, isex: false, itemUser.userId?.ToString(), itemUser.name?.ToString(), itemUser.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
@@ -647,6 +565,7 @@ namespace TEAMModelBI.Controllers
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("set-bizuser")]
         public async Task<IActionResult> SetBizUserLogin(JsonElement jsonElement)
         {

+ 1 - 0
TEAMModelBI/Controllers/ManySiteCut/SystemConfigController.cs

@@ -43,6 +43,7 @@ namespace TEAMModelBI.Controllers.ManySiteCut
         /// 获取应用配置文件
         /// </summary>
         /// <returns></returns>
+        [ProducesDefaultResponseType]
         [HttpPost("get-config")]
         public async Task<IActionResult> GetConfigJson() 
         {