字符串Equals 处理

TEAMModelFunction/TriggerSurvey.cs

@@ -280,11 +280,11 @@ namespace TEAMModelFunction
 
                             //更新结束状态
                             //data.progress = "finish";
-                            //if (survey.scope == "school")
+                            //if (survey.scope .Equals("school"))
                             //{
                             //    await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<ActivityData>(data, data.id, new Azure.Cosmos.PartitionKey(data.code));
                             //}
-                            //else if (survey.scope == "private")
+                            //else if (survey.scope .Equals("private"))
                             //{
                             //    await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<ActivityData>(data, data.id, new Azure.Cosmos.PartitionKey(data.code));
                             //}

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -83,7 +83,7 @@ namespace TEAMModelOS.Controllers.Client
                         foreach (var obj in value.EnumerateArray())
                         {
                             string statusNow = obj.GetProperty("status").ToString();
-                            if(statusNow == "join") //成為老師的才放入
+                            if(statusNow.Equals("join")) //成為老師的才放入
                             {
                                 dynamic schoolExtobj = new ExpandoObject();
                                 var schoolJson = await client.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{obj.GetProperty("schoolId")}", new PartitionKey("Base"));
@@ -588,7 +588,7 @@ namespace TEAMModelOS.Controllers.Client
                 if (!request.TryGetProperty("grant_type", out JsonElement grant_type)) return BadRequest();
                 string partitionid = string.Empty;
                 string container = string.Empty;
-                if (grant_type.ToString() == "school")
+                if (grant_type.ToString() .Equals("school"))
                 {
                     if (!request.TryGetProperty("school_code", out JsonElement school_code_json))
                     {
@@ -651,7 +651,7 @@ namespace TEAMModelOS.Controllers.Client
                 string order = "createTime"; //排序項目
                 if (request.TryGetProperty("order", out JsonElement order_json))
                 {
-                    if(order_json.ToString() == "useCount")
+                    if(order_json.ToString().Equals("useCount"))
                     {
                         order = order_json.ToString();
                     }
@@ -756,7 +756,7 @@ namespace TEAMModelOS.Controllers.Client
                     queryWhere += $" AND ( {queryOptionForGrade} )";
                 }
                 //科目ID
-                if (request.TryGetProperty("subjectId", out JsonElement subjectId) && container == "School")
+                if (request.TryGetProperty("subjectId", out JsonElement subjectId) && container .Equals("school"))
                 {
                     queryWhere += $" AND c.subjectId = '{subjectId}'";
                 }
@@ -932,7 +932,7 @@ namespace TEAMModelOS.Controllers.Client
             }
             if (!string.IsNullOrWhiteSpace(stulist))
             {
-                string pk = (grant_type.GetString() == "school") ? $"StuList-{school_code}" : $"StuList";
+                string pk = (grant_type.GetString() .Equals("school")) ? $"StuList-{school_code}" : $"StuList";
                 var querystl = $"SELECT c.students, c.tmids FROM c WHERE c.id = '{stulist}'";
                 Dictionary<string, List<string>> stuDic = new Dictionary<string, List<string>>();
                 List<string> tmidList = new List<string>();
@@ -1103,7 +1103,7 @@ namespace TEAMModelOS.Controllers.Client
                 //※規則  owner:"school" => 校園評測  "teacher" => 個人評測 
                 //※規則  scope:"school" => 校本班級  "private" => 個人班級 
                 //※規則  BLOB容器: scope:"school" => {學校ID}下   scope:"private" => {個人ID}下
-                string blobContainer = (!string.IsNullOrWhiteSpace(dbExamInfo.school) && dbExamInfo.scope == "school") ? dbExamInfo.school : id; //blob容器
+                string blobContainer = (!string.IsNullOrWhiteSpace(dbExamInfo.school) && dbExamInfo.scope .Equals("school")) ? dbExamInfo.school : id; //blob容器
                 //dbExamInfo.source = "1"; //評測來源固定為  1:課中評量(不應由API擅自變更)
 
                 //取得課堂紀錄下的試卷資料(blob)、複製到評測紀錄下
@@ -1125,7 +1125,7 @@ namespace TEAMModelOS.Controllers.Client
                         string sourceBlobPath = recordPaperInfoDic["blob"];
                         Azure.Pageable<BlobItem> sourceBlobs = blobPrivateContainer.GetBlobs(prefix: sourceBlobPath);
                         string destBlobPath = $"exam/{dbExamInfo.id}/paper/{recordPaperInfoDic["id"]}/"; //拷貝對象路徑 path:exam/{評測ID}/paper/{試卷ID}/
-                        if (targetScope == "school") //校本
+                        if (targetScope .Equals("school")) //校本
                         {
                             string schoolId = dbExamInfo.school;
                             var blobSchoolContainer = _azureStorage.GetBlobContainerClient(schoolId);
@@ -1339,7 +1339,7 @@ namespace TEAMModelOS.Controllers.Client
 
             foreach (var syllabus in syllabuses)
             {
-                if (syllabus.pid == "")
+                if (syllabus.pid.Equals(""))
                     nodes.Add(new SyllabusNode { id = syllabus.id, name = syllabus.name });
                 else
                 {

TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -333,7 +333,7 @@ namespace TEAMModelOS.Controllers
                 }
                 else
                 {
-                    if (survey.scope == "school" && survey.school.Equals(school))
+                    if (survey.scope .Equals("school") && survey.school.Equals(school))
                     {
                         flag = true;
                     }

TEAMModelOS/Controllers/Common/VoteController.cs

@@ -334,7 +334,7 @@ namespace TEAMModelOS.Controllers.Learn
                     flag = true;
                 }
                 else {
-                    if (vote.scope == "school"&& vote.school.Equals(school)) {
+                    if (vote.scope .Equals("school")&& vote.school.Equals(school)) {
                         flag = true;
                     }
                 }

TEAMModelOS/Controllers/Core/ImportController.cs

@@ -119,17 +119,17 @@ namespace TEAMModelOS.Controllers
                 response.EnsureSuccessStatusCode();
                 Stream stream = await response.Content.ReadAsStreamAsync();
 
-                if (ext.ToLower() == "pptx" || ext.ToLower() == "xml")
+                if (ext.ToLower().Equals("pptx")  || ext.ToLower().Equals("xml"))
                 {
                     string index = await PPTXTranslator(containerid, FileName, stream);
                     await _azureStorage.GetBlobServiceClient().DeleteBlobs(containerid, new List<string>() { FileName });
                     return Ok(new { index = index });
                 }
-                else if (ext.ToLower() == "docx" || ext.ToLower() == "doc")
+                else if (ext.ToLower() .Equals("docx")  || ext.ToLower().Equals("doc") )
                 {
                     return Ok(new { index = "" });
                 }
-                else if (ext.ToLower() == "htex")
+                else if (ext.ToLower() .Equals("htex"))
                 {
                     var index = await HTEXTranslator(containerid, FileName, stream);
                     await _azureStorage.GetBlobServiceClient().DeleteBlobs(containerid, new List<string>() { FileName });

TEAMModelOS/Controllers/Item/ItemController.cs

@@ -723,7 +723,7 @@ namespace TEAMModelOS.Controllers
                     {
                         if (!string.IsNullOrWhiteSpace(item.pid))
                         {
-                            if (item.scope == "school")
+                            if (item.scope .Equals("school"))
                             {
                                 var iteme = await client.GetContainer("TEAMModelOS", "School").ReadItemAsync<ItemInfo>(item.id, new PartitionKey(item.code));
                                 if (iteme != null)
@@ -732,7 +732,7 @@ namespace TEAMModelOS.Controllers
                                 }
 
                             }
-                            else if (item.scope == "private")
+                            else if (item.scope .Equals("private"))
                             {
                                 var iteme = await client.GetContainer("TEAMModelOS", "Teacher").ReadItemAsync<ItemInfo>(item.id, new PartitionKey(item.code));
                                 if (iteme != null)

TEAMModelOS/Controllers/Paper/SheetConfigController.cs

@@ -57,7 +57,7 @@ namespace TEAMModelOS.Controllers.Common
                 if (!request.TryGetProperty("id", out JsonElement id)) return BadRequest();
                 if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 if (!request.TryGetProperty("scope", out JsonElement scope)) return BadRequest();
-                if ($"{scope}" == "school")
+                if ($"{scope}" .Equals("school"))
                 {
                     SheetConfig config = await client.GetContainer("TEAMModelOS", "School").ReadItemAsync<SheetConfig>($"{id}", new PartitionKey($"SheetConfig-{code}"));
                     return Ok(new { config = config, status = 200 });
@@ -314,7 +314,7 @@ namespace TEAMModelOS.Controllers.Common
                 if (!request.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 if (!request.TryGetProperty("scope", out JsonElement scope)) return BadRequest();
                 List<string> idslist = ids.ToObject<List<string>>();
-                if ($"{scope}" == "school")
+                if ($"{scope}" .Equals("school"))
                 {
                     await client.GetContainer("TEAMModelOS", "School").DeleteItemsStreamAsync(idslist, $"SheetConfig-{code}");
                 }

TEAMModelOS/Controllers/School/ClassController.cs

@@ -601,7 +601,7 @@ namespace TEAMModelOS.Controllers
                         deviceBound updDeviceBound = updSerialInfo.deviceBound.Where(d => d.uuid == uuid && d.uuid2 == uuid2).FirstOrDefault();
                         if (updDeviceBound != null)
                         {
-                            if (action == "link")
+                            if (action .Equals("link"))
                             {
                                 if (updDeviceBound.classId != null)
                                 {
@@ -612,7 +612,7 @@ namespace TEAMModelOS.Controllers
                                     updDeviceBound.classId = classId;
                                 }
                             }
-                            else if (action == "unLink")
+                            else if (action .Equals("unLink"))
                             {
                                 updDeviceBound.classId = null;
                             }

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -726,7 +726,7 @@ namespace TEAMModelOS.Controllers
                         {
                             //AClassOne買斷、週期
                             string prodCode = serviceProductRow.GetProperty("prodCode").GetString();
-                            if (prodCode == "RYGVCPLY" || prodCode == "AEGMCPLY")
+                            if (prodCode .Equals("RYGVCPLY") || prodCode .Equals("AEGMCPLY"))
                             {
                                 ServiceProductResult serviceProductResultRow = CalServiceProductAuth(activeMainPeriod, activePeriodOfMain, serviceProductRow.ToObject<ServiceProduct>());
                                 total += serviceProductResultRow.avaliable;
@@ -919,7 +919,7 @@ namespace TEAMModelOS.Controllers
             string action = "all"; //預設回收：固定及動態均回收  sta:回收固定 dync:回收動態
             if (request.TryGetProperty("mode", out JsonElement mode))
             {
-                if(mode.GetString() == "sta" || mode.GetString() == "dync")
+                if(mode.GetString().Equals("sta") || mode.GetString().Equals("dync"))
                 {
                     action = mode.GetString();
                 }

TEAMModelOS/Controllers/School/SchoolTeacherController.cs

@@ -147,7 +147,7 @@ namespace TEAMModelOS.Controllers
                 List<string> pmAddList = new List<string>();
                 List<string> pmRmvList = new List<string>();
                 request.TryGetProperty("job", out JsonElement job);
-                if (mode.GetString() == "multi")
+                if (mode.GetString() .Equals("multi"))
                 {
                     foreach (var pm in pmAdd.EnumerateArray())
                     {
@@ -169,7 +169,7 @@ namespace TEAMModelOS.Controllers
                 foreach (var id in ids.EnumerateArray())
                 {
                     SchoolTeacher st = await client.GetContainer("TEAMModelOS", "School").ReadItemAsync<SchoolTeacher>(id.GetString(), new PartitionKey($"Teacher-{school_code}"));
-                    if(mode.GetString() == "multi")
+                    if(mode.GetString().Equals("multi"))
                     {
                         foreach (var pm in pmRmvList)
                         {
@@ -317,7 +317,7 @@ namespace TEAMModelOS.Controllers
                     }
                 }
                 string bizcode = grant_type.GetString();
-                if (grant_type.GetString() == "join")
+                if (grant_type.GetString() .Equals("join"))
                 {
                     bizcode = "request-join";
                 }
@@ -415,7 +415,7 @@ namespace TEAMModelOS.Controllers
                     var response = await client.GetContainer("TEAMModelOS", "School").CreateItemAsync(st, new PartitionKey($"Teacher-{school_code}"));
                 }
                 string bizcode = grant_type.GetString();
-                if (grant_type.GetString() == "join")
+                if (grant_type.GetString() .Equals("join"))
                 {
                     bizcode = "request-join";
                 }

TEAMModelOS/Controllers/School/StudentCommonController.cs

@@ -124,7 +124,7 @@ namespace TEAMModelOS.Controllers
                 stus.Add(item);
             }
             foreach (var cos in stus) {
-                if (cos.scope == "school")
+                if (cos.scope .Equals("school"))
                 {
                     Course course;
                     try {

TEAMModelOS/Controllers/Syllabus/ShareController.cs

@@ -77,7 +77,7 @@ namespace TEAMModelOS.Controllers
                 if (request.scope.Equals("school"))
                 {
                     Syllabus syllabusD = await client.GetContainer("TEAMModelOS", "School").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.school}"));
-                    if (request.opt == "del")
+                    if (request.opt .Equals("del"))
                     {
                         if (syllabusD.auth.IsNotEmpty())
                         {
@@ -140,7 +140,7 @@ namespace TEAMModelOS.Controllers
                 else if (request.scope.Equals("private"))
                 {
                     Syllabus syllabusD = await client.GetContainer("TEAMModelOS", "Teacher").ReadItemAsync<Syllabus>(request.syllabusId, new PartitionKey($"Syllabus-{request.issuer}"));
-                    if (request.opt == "del")
+                    if (request.opt .Equals("del"))
                     {
                         if (syllabusD.auth.IsNotEmpty())
                         {
@@ -309,7 +309,7 @@ namespace TEAMModelOS.Controllers
                         }
 
                         Syllabus syllabus = null;
-                        if (share.scope == "school")
+                        if (share.scope .Equals("school"))
                         {
                             try
                             {
@@ -320,7 +320,7 @@ namespace TEAMModelOS.Controllers
                                 //仅处理差不到数据的情况
                             }
                         }
-                        else if (share.scope == "private")
+                        else if (share.scope .Equals("private"))
                         {
                             try
                             {
@@ -350,11 +350,11 @@ namespace TEAMModelOS.Controllers
                                     }
                                 });
                             }
-                            if (share.scope == "school")
+                            if (share.scope .Equals("school"))
                             {
                                 syllabus = await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<Syllabus>(syllabus, $"{id}", new PartitionKey($"Syllabus-{share.school}"));
                             }
-                            else if (share.scope == "private")
+                            else if (share.scope .Equals("private"))
                             {
                                 syllabus = await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<Syllabus>(syllabus, $"{id}", new PartitionKey($"Syllabus-{share.issuer}"));
                             }
@@ -467,7 +467,7 @@ namespace TEAMModelOS.Controllers
                 List<string> sid = new List<string>();
                 request.syllabusId.ForEach(x => { sid.Add($"'{x}'"); });
                 var sidSql= string.Join(",", sid);
-                if (request.scope == "school")
+                if (request.scope .Equals("school"))
                 {
                     code = request.school;
                     var queryslt = $"SELECT  value(c) FROM c where c.id in ({sidSql})";
@@ -481,7 +481,7 @@ namespace TEAMModelOS.Controllers
                     volume = await client.GetContainer("TEAMModelOS", "School").ReadItemAsync<Volume>(request.volumeId, new PartitionKey($"Volume-{code}"));
                     
                 }
-                else if (request.scope == "private")
+                else if (request.scope .Equals("private"))
                 {
                     code = request.issuer;
                     var queryslt = $"SELECT  value(c) FROM c where c.id in ({sidSql})";

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -59,7 +59,7 @@ namespace TEAMModelOS.Controllers
                 list= list.Select(x => $"'{x}'").ToList();
                 string lks= string.Join(",", list);
                 StringBuilder queryText = new StringBuilder($"SELECT  c.id as syllabusId,c.volumeId,rnodes.link ,children.id as treeid  FROM c join children  in  c.children join rnodes in children.rnodes    where rnodes.link in ({lks}) ");
-                if (_scope.ValueKind.Equals(JsonValueKind.String) && _scope.GetString() == "school")
+                if (_scope.ValueKind.Equals(JsonValueKind.String) && _scope.GetString() .Equals("school"))
                 {
                     await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<LinkDto>(queryText: queryText.ToString(),
                     requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Syllabus-{_code}") }))
@@ -67,7 +67,7 @@ namespace TEAMModelOS.Controllers
                         links.Add(item);
                     }
                 }
-                else if (_scope.ValueKind.Equals(JsonValueKind.String) && _scope.GetString() == "private") {
+                else if (_scope.ValueKind.Equals(JsonValueKind.String) && _scope.GetString() .Equals("private")) {
                     await foreach (var item in client.GetContainer("TEAMModelOS", "Teacher").GetItemQueryIterator<LinkDto>(queryText: queryText.ToString(),
                     requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"Syllabus-{_code}") }))
                     {
@@ -123,7 +123,7 @@ namespace TEAMModelOS.Controllers
                 if (!string.IsNullOrEmpty(syllabusTree.id))
                 {
                     Syllabus syllabus = null;
-                    if (syllabusTree.scope == "school")
+                    if (syllabusTree.scope .Equals("school"))
                     {
                         try
                         {
@@ -221,7 +221,7 @@ namespace TEAMModelOS.Controllers
                         children=nodes,
                         scope = syllabusTree.scope
                     };
-                    if (syllabusTree.scope == "school") {
+                    if (syllabusTree.scope .Equals("school")) {
                         await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "School").CreateItemAsync<Syllabus>(syllabus, new Azure.Cosmos.PartitionKey($"Syllabus-{syllabusTree.codeval}"));
                     } else {
                         await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").CreateItemAsync<Syllabus>(syllabus, new Azure.Cosmos.PartitionKey($"Syllabus-{syllabusTree.codeval}"));

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -155,14 +155,14 @@ namespace TEAMModelOS.Controllers
                 {
                     request.TryGetProperty("scope", out JsonElement scope);
                     //私有课纲
-                    if (scope.GetString() == "private")
+                    if (scope.GetString() .Equals("private"))
                     {
                         await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").GetItemQueryIterator<Volume>(queryText: $"select value(c) from c where c.status = {status}", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Volume-{code}") }))
                         {
                             volumes.Add(item);
                         }
                     }
-                    else if (scope.GetString() == "school")
+                    else if (scope.GetString() .Equals("school"))
                     {
                         await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "School").GetItemQueryIterator<Volume>(queryText: $"select value(c) from c where c.status = {status} and c.periodId = '{periodCode}' and c.subjectId = '{subjectCode}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Volume-{code}") }))
                         {

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -81,7 +81,7 @@ namespace TEAMModelOS.Controllers
                     if (teacher.schools.IsNotEmpty()) {
                         foreach (var sc in teacher.schools) {
                             string statusNow = sc.status!=null?sc.status:"";
-                            if (statusNow == "join" || statusNow == "invite" || statusNow == "request") {
+                            if (statusNow .Equals("join") || statusNow .Equals("invite") || statusNow.Equals("request")) {
                                 dynamic schoolExtobj = new ExpandoObject();
                                 var schoolJson = await client.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync($"{sc.schoolId}", new PartitionKey("Base"));
                                 var school = await JsonDocument.ParseAsync(schoolJson.ContentStream);
@@ -546,7 +546,7 @@ namespace TEAMModelOS.Controllers
                     long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
                     teacher.schools.Add(new Teacher.School() { schoolId = school_code.GetString(), name = school_name.GetString(), status = grant_type.GetString() ,time= now });
                 }
-                if (grant_type.GetString() == "leave" || grant_type.GetString() == "cancel")
+                if (grant_type.GetString() .Equals("leave") || grant_type.GetString() .Equals("cancel"))
                 {
                     if (teacher.schools.IsNotEmpty())
                     {
@@ -599,7 +599,7 @@ namespace TEAMModelOS.Controllers
                     }
                     if (teachers.IsNotEmpty()) {
                         string code = grant_type.GetString();
-                        if (grant_type.GetString() == "join") {
+                        if (grant_type.GetString() .Equals("join")) {
                             code = "invite-join";
                         }
                             notification = new Notification
@@ -639,7 +639,7 @@ namespace TEAMModelOS.Controllers
 
             foreach (var syllabus in syllabuses)
             {
-                if (syllabus.pid == "")
+                if (syllabus.pid .Equals(""))
                     nodes.Add(new SyllabusNode { id = syllabus.id, name = syllabus.name });
                 else
                 {

TEAMModelOS/Filter/AuthTokenAttribute.cs

@@ -44,12 +44,12 @@ namespace TEAMModelOS.Filter
                     var jwt = new JwtSecurityTokenHandler().ReadJwtToken(authtoken);
                     id = jwt.Payload.Sub;
                     school = jwt.Payload.Azp;
-                    name = jwt.Claims.FirstOrDefault(claim => claim.Type == "name")?.Value;
-                    picture = jwt.Claims.FirstOrDefault(claim => claim.Type == "picture")?.Value;
+                    name = jwt.Claims.FirstOrDefault(claim => claim.Type.Equals("name") )?.Value;
+                    picture = jwt.Claims.FirstOrDefault(claim => claim.Type.Equals("picture"))?.Value;
 
                     if (!string.IsNullOrWhiteSpace(_roles))
                     {
-                        var roles = jwt.Claims.Where(c => c.Type == "roles");
+                        var roles = jwt.Claims.Where(c => c.Type .Equals("roles"));
                         foreach (var role in roles)
                         {
                             if (_roles.Contains(role.Value, StringComparison.Ordinal))

TEAMModelOS/Services/Analysis/AchievementService.cs

@@ -252,7 +252,7 @@ namespace TEAMModelOS.Services.Analysis
                         {
                             stu.Add("-");
                         });
-                        if (stuIds[m] == "0")
+                        if (stuIds[m] .Equals("0"))
                         {
                             people++;
                             n++;

TEAMModelOS/Services/Common/ActivityStudentService.cs

@@ -458,11 +458,11 @@ namespace TEAMModelOS.Services.Common
                                 //保存当前提交人的记录
 
                                 string blobcntr = null;
-                                if (survey.scope == "school")
+                                if (survey.scope .Equals("school"))
                                 {
                                     blobcntr = survey.school;
                                 }
-                                else if (survey.scope == "private")
+                                else if (survey.scope .Equals("private"))
                                 {
                                     blobcntr = survey.creatorId;
                                 }