Browse Source

更改项目名称

Li 3 năm trước cách đây
mục cha
commit
fb1ad9d2c9

+ 1 - 1
TEAMModelBI/Controllers/Activity/ActivitySticsController.cs

@@ -11,7 +11,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 using System.Text.Json;
 
-namespace TEAMModeBI.Controllers.Activity
+namespace TEAMModelBI.Controllers.Activity
 {
     [Route("activity")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BIAbility/AbilityMgmtController.cs

@@ -15,9 +15,9 @@ using HTEXLib.COMM.Helpers;
 using System.Text;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 
-namespace TEAMModeBI.Controllers.BIAbility
+namespace TEAMModelBI.Controllers.BIAbility
 {
     [Route("biabilitymgmt")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BIAbility/AbilityTaskMgmtController.cs

@@ -14,10 +14,10 @@ using Azure.Cosmos;
 using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using System.Text;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 using TEAMModelOS.SDK.Services;
 
-namespace TEAMModeBI.Controllers.BIAbility
+namespace TEAMModelBI.Controllers.BIAbility
 {
     [Route("biabilitytask")]
     [ApiController]

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

@@ -14,7 +14,7 @@ using System.Text;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Extension;
 
-namespace TEAMModeBI.Controllers.BIHome
+namespace TEAMModelBI.Controllers.BIHome
 {
     [Route("homestatis")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BISchool/AreaRelevantController.cs

@@ -7,14 +7,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 
-namespace TEAMModeBI.Controllers.BISchool
+namespace TEAMModelBI.Controllers.BISchool
 {
     [Route("area")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BISchool/BatchAreaController.cs

@@ -20,9 +20,9 @@ using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Messaging.ServiceBus;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 
-namespace TEAMModeBI.Controllers.BISchool
+namespace TEAMModelBI.Controllers.BISchool
 {
     [Route("batcharea")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -22,9 +22,9 @@ using System.Net.Http;
 using Microsoft.Extensions.Configuration;
 using System.Net.Http.Json;
 using System.Net;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 
-namespace TEAMModeBI.Controllers.BISchool
+namespace TEAMModelBI.Controllers.BISchool
 {
     [Route("batchschool")]
     [ApiController]

+ 28 - 20
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -7,14 +7,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 
-namespace TEAMModeBI.Controllers.BISchool
+namespace TEAMModelBI.Controllers.BISchool
 {
     [Route("schoolcheck")]
     [ApiController]
@@ -135,33 +135,41 @@ namespace TEAMModeBI.Controllers.BISchool
         [HttpPost("get-assustschool")]
         public async Task<IActionResult> GetAssistSchool(JsonElement jsonElement)
         {
-            if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
-            List<string> schoolIds = new List<string>();
-            List<object> schools = new List<object>();
-            var cosmosClient = _azureCosmos.GetCosmosClient();
-            string sqlTxt = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId FROM c WHERE c.pk = 'Teacher' AND c.status = 'join' AND ARRAY_CONTAINS(c.roles, 'assist', true) AND c.id='{tmdId}' ";
-            await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
+            try
             {
-                using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                if (!jsonElement.TryGetProperty("tmdId", out JsonElement tmdId)) return BadRequest();
+                List<string> schoolIds = new List<string>();
+                List<object> schools = new List<object>();
+                var cosmosClient = _azureCosmos.GetCosmosClient();
+                string sqlTxt = $"SELECT DISTINCT REPLACE(c.code, 'Teacher-', '') AS schoolId FROM c WHERE c.pk = 'Teacher' AND c.status = 'join' AND ARRAY_CONTAINS(c.roles, 'assist', true) AND c.id='{tmdId}' ";
+                await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqlTxt, requestOptions: new QueryRequestOptions() { }))
                 {
-                    schoolIds.Add(obj.GetProperty("schoolId").GetString());
+                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
+                    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                    {
+                        schoolIds.Add(obj.GetProperty("schoolId").GetString());
+                    }
                 }
-            }
 
-            foreach (var item in schoolIds)
-            {
-                await foreach (var itemBase in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: $"select c.id,c.code,c.name,c.picture,c.region,c.province,c.city,c.dist from c where c.id='{item}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
+                foreach (var item in schoolIds)
                 {
-                    var json = await JsonDocument.ParseAsync(itemBase.ContentStream);
-                    foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                    await foreach (var itemBase in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: $"select c.id,c.code,c.name,c.picture,c.region,c.province,c.city,c.dist from c where c.id='{item}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
                     {
-                        schools.Add(obj.ToObject<object>());
+                        var json = await JsonDocument.ParseAsync(itemBase.ContentStream);
+                        foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
+                        {
+                            schools.Add(obj.ToObject<object>());
+                        }
                     }
                 }
-            }
 
-            return Ok(new { state = 200, schools });
+                return Ok(new { state = 200, schools });
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"BI,{_option.Location}   /schoolcheck/get-assustschool   {ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
+                return BadRequest();
+            }
         }
 
         /// <summary>

+ 1 - 1
TEAMModelBI/Controllers/BIServer/BiServersController.cs

@@ -16,7 +16,7 @@ using System.Net;
 using HTEXLib.COMM.Helpers;
 using System.Net.Http.Json;
 
-namespace TEAMModeBI.Controllers.BIServer
+namespace TEAMModelBI.Controllers.BIServer
 {
     [Route("biservers")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/BITest/TestController.cs

@@ -16,7 +16,7 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;//引用创建学校Code
 using TEAMModelOS.SDK.Context.Attributes.Azure;
@@ -29,7 +29,7 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Table;
 
-namespace TEAMModeBI.Controllers.BITest
+namespace TEAMModelBI.Controllers.BITest
 {
     [Route("apitest")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/Core/BlobController.cs

@@ -7,14 +7,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using static TEAMModelOS.SDK.DI.AzureStorageBlobExtensions;
 
-namespace TEAMModeBI.Controllers.Core
+namespace TEAMModelBI.Controllers.Core
 {
     [Route("blob")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/DingDingStruc/DDStructController.cs

@@ -16,12 +16,12 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Service;
 using Azure.Cosmos;
 using TEAMModelOS.SDK.Models;
-using TEAMModeBI.Controllers.BISchool;
+using TEAMModelBI.Controllers.BISchool;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Microsoft.Azure.Cosmos.Table;
 
 
-namespace TEAMModeBI.Controllers.DingDingStruc
+namespace TEAMModelBI.Controllers.DingDingStruc
 {
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]

+ 2 - 2
TEAMModelBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -21,9 +21,9 @@ using OpenXmlPowerTools;
 using System.Text;
 using Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Table;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 
-namespace TEAMModeBI.Controllers.DingDingStruc
+namespace TEAMModelBI.Controllers.DingDingStruc
 {
     [Route("tabledd")]
     [ApiController]

+ 1 - 1
TEAMModelBI/Controllers/Lesson/LessonSticsController.cs

@@ -12,7 +12,7 @@ using System.Text.Json;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models;
 
-namespace TEAMModeBI.Controllers.Lesson
+namespace TEAMModelBI.Controllers.Lesson
 {
     [Route("lesson")]
     [ApiController]

+ 2 - 2
TEAMModelBI/Controllers/LoginController.cs

@@ -29,10 +29,10 @@ using Newtonsoft.Json.Linq;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Storage.Sas;
 using System.Net.Http.Json;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 //using static DingTalk.Api.Response.OapiV2UserGetResponse;
 
-namespace TEAMModeBI.Controllers
+namespace TEAMModelBI.Controllers
 {
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]

+ 2 - 2
TEAMModelBI/Controllers/OperateRecord/OperateLogController.cs

@@ -12,9 +12,9 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using System.Text;
 using TEAMModelOS.SDK.Models.Table;
-using TEAMModeBI.Filter;
+using TEAMModelBI.Filter;
 
-namespace TEAMModeBI.Controllers.OperateRecord
+namespace TEAMModelBI.Controllers.OperateRecord
 {
     [Route("operatelog")]
     [ApiController]

+ 1 - 1
TEAMModelBI/Controllers/Product/ProductStatisController.cs

@@ -12,7 +12,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 
-namespace TEAMModeBI.Controllers.Product
+namespace TEAMModelBI.Controllers.Product
 {
     [Route("productstatis")]
     [ApiController]

+ 1 - 1
TEAMModelBI/Controllers/SchoolSettingController.cs

@@ -8,7 +8,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK;
 
-namespace TEAMModeBI
+namespace TEAMModelBI
 {
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]

+ 1 - 1
TEAMModelBI/Filter/AuthTokenAttribute.cs

@@ -10,7 +10,7 @@ using TEAMModelOS.SDK.Extension;
 using System.IdentityModel.Tokens.Jwt;
 using TEAMModelOS.Models;
 
-namespace TEAMModeBI.Filter
+namespace TEAMModelBI.Filter
 {
     public class AuthTokenAttribute:Attribute, IFilterFactory
     {

+ 1 - 1
TEAMModelBI/Program.cs

@@ -12,7 +12,7 @@ using TEAMModelOS.Controllers.Third.Helpers;
 using TEAMModelOS.SDK.Extension;
 using System.Text;
 
-namespace TEAMModeBI
+namespace TEAMModelBI
 {
     public class Program
     {     

+ 1 - 1
TEAMModelBI/Properties/launchSettings.json

@@ -16,7 +16,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "TEAMModeBI": {
+    "TEAMModelBI": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

+ 1 - 1
TEAMModelBI/Startup.cs

@@ -22,7 +22,7 @@ using TEAMModelOS.SDK.Filter;
 using TEAMModelOS.SDK.Models.Service;
 using VueCliMiddleware;
 
-namespace TEAMModeBI
+namespace TEAMModelBI
 {
     public class Startup
     {