1

Edu.Model/Entity/AI/RB_AI_PresetsApplication.cs

@@ -37,7 +37,7 @@ namespace Edu.Model.Entity.AI
         /// <summary>
         /// 适用范围
         /// </summary>
-        public string Range { get; set; }
+        public string RangeName { get; set; }
 
         /// <summary>
         /// 适用地区
@@ -47,7 +47,7 @@ namespace Edu.Model.Entity.AI
         /// <summary>
         /// 描述
         /// </summary>
-        public string Describe { get; set; }
+        public string DescribeName { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>

Edu.WebApi/Controllers/AI/AIController.cs

@@ -224,9 +224,9 @@ namespace Edu.WebApi.Controllers.AI
                 Logo = extModel?.Logo ?? "",
                 Name = extModel?.Name ?? "",
                 Content = extModel?.Content ?? "",
-                Range = extModel?.Range ?? "",
+                Range = extModel?.RangeName ?? "",
                 Area = extModel?.Area ?? "",
-                Describe = extModel?.Describe ?? "",
+                Describe = extModel?.DescribeName ?? "",
                 SupplierName = extModel?.SupplierName ?? "",
                 SupplierId = extModel?.SupplierId ?? 0,
                 Enable = extModel?.Enable ?? 0,
@@ -254,9 +254,9 @@ namespace Edu.WebApi.Controllers.AI
                 Logo = extModel?.Logo ?? "",
                 Name = extModel?.Name ?? "",
                 Content = extModel?.Content ?? "",
-                Range = extModel?.Range ?? "",
+                Range = extModel?.RangeName ?? "",
                 Area = extModel?.Area ?? "",
-                Describe = extModel?.Describe ?? "",
+                Describe = extModel?.DescribeName ?? "",
                 SupplierName = extModel?.SupplierName ?? "",
                 SupplierId = extModel?.SupplierId ?? 0,
                 Enable = extModel?.Enable ?? 0,
@@ -287,9 +287,9 @@ namespace Edu.WebApi.Controllers.AI
                 Logo = extModel?.Logo ?? "",
                 Name = extModel?.Name ?? "",
                 Content = extModel?.Content ?? "",
-                Range = extModel?.Range ?? "",
+                Range = extModel?.RangeName ?? "",
                 Area = extModel?.Area ?? "",
-                Describe = extModel?.Describe ?? "",
+                Describe = extModel?.DescribeName ?? "",
                 SupplierName = extModel?.SupplierName ?? "",
                 SupplierId = extModel?.SupplierId ?? 0,
                 Enable = extModel?.Enable ?? 0,
@@ -313,9 +313,9 @@ namespace Edu.WebApi.Controllers.AI
                 Name = base.ParmJObj.GetStringValue("Name"),
                 Logo = base.ParmJObj.GetStringValue("Logo"),
                 Content = base.ParmJObj.GetStringValue("Content"),
-                Range = base.ParmJObj.GetStringValue("Range"),
+                RangeName = base.ParmJObj.GetStringValue("Range"),
                 Area = base.ParmJObj.GetStringValue("Area"),
-                Describe = base.ParmJObj.GetStringValue("Describe"),
+                DescribeName = base.ParmJObj.GetStringValue("Describe"),
                 SupplierId = base.ParmJObj.GetInt("SupplierId", 0),
                 Enable = base.ParmJObj.GetInt("Enable", 0),
                 LanguageType = base.ParmJObj.GetInt("LanguageType", 0),
@@ -330,7 +330,7 @@ namespace Edu.WebApi.Controllers.AI
             {
                 return ApiResult.ParamIsNull();
             }
-            extModel.Status = (DateStateEnum)base.ParmJObj.GetInt("Status");
+            extModel.Status = DateStateEnum.Normal;  //(DateStateEnum)base.ParmJObj.GetInt("Status");
             bool flag = aiModule.SetAIPresetsApplicationModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/AI/AIStudentController.cs

@@ -242,42 +242,42 @@ namespace Edu.WebApi.Controllers.AI
         public ApiResult GetYouDaoGrade()
         {
             List<RB_AI_PresetsApplication_ViewModel> listChina = new List<RB_AI_PresetsApplication_ViewModel>();
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "一年级", Content = "g1" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "二年级", Content = "g2" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "三年级", Content = "g3" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "四年级", Content = "g4" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "五年级", Content = "g5" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "六年级", Content = "g6" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "七年级", Content = "g7" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "八年级", Content = "g8" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "九年级", Content = "g9" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "高一", Content = "g10" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "高二", Content = "g11" });
-            listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "高三", Content = "g12" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "一年级", Content = "g1" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "二年级", Content = "g2" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "三年级", Content = "g3" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "四年级", Content = "g4" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "五年级", Content = "g5" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "六年级", Content = "g6" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "七年级", Content = "g7" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "八年级", Content = "g8" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "九年级", Content = "g9" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "高一", Content = "g10" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "高二", Content = "g11" });
+            listChina.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "高三", Content = "g12" });
 
 
             List<RB_AI_PresetsApplication_ViewModel> listEnglish = new List<RB_AI_PresetsApplication_ViewModel>();
 
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "默认", Content = "default", Range = "100" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "小学", Content = "elementary", Range = "100" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "初中", Content = "junior", Range = "100" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "高中", Content = "high", Range = "25" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "四级", Content = "cet4", Range = "106.5" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "六级", Content = "cet6", Range = "106.5" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "考研", Content = "graduate", Range = "20" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "考研英语(一)大作文", Content = "graduate_b1", Range = "20" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "考研英语(一)小作文", Content = "graduate_a1", Range = "10" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "考研英语(二)小作文", Content = "graduate_a2", Range = "10" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "考研英语(二)大作文", Content = "graduate_b2", Range = "15" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "托福", Content = "toefl", Range = "30" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "托福-独立写作", Content = "toefl_independent", Range = "30" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "托福-综合写作", Content = "toefl_comprehensive", Range = "30" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "GRE", Content = "gre", Range = "6" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "雅思", Content = "ielts", Range = "9" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "雅思-task1", Content = "ielts_task1", Range = "9" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "雅思-task2", Content = "ielts_task2", Range = "9" });
-            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "学术写作", Content = "academic", Range = "100" });
-            return ApiResult.Success(data: new { ChinaGradeList = listChina.Select(x => new { Name = x.Describe, Value = x.Content }), EnglishGradeList = listEnglish.Select(x => new { Name = x.Describe, Value = x.Content, Score = x.Range }) });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "默认", Content = "default", RangeName = "100" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "小学", Content = "elementary", RangeName = "100" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "初中", Content = "junior", RangeName = "100" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "高中", Content = "high", RangeName = "25" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "四级", Content = "cet4", RangeName = "106.5" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "六级", Content = "cet6", RangeName = "106.5" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "考研", Content = "graduate", RangeName = "20" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "考研英语(一)大作文", Content = "graduate_b1", RangeName = "20" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "考研英语(一)小作文", Content = "graduate_a1", RangeName = "10" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "考研英语(二)小作文", Content = "graduate_a2", RangeName = "10" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "考研英语(二)大作文", Content = "graduate_b2", RangeName = "15" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "托福", Content = "toefl", RangeName = "30" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "托福-独立写作", Content = "toefl_independent", RangeName = "30" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "托福-综合写作", Content = "toefl_comprehensive", RangeName = "30" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "GRE", Content = "gre", RangeName = "6" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "雅思", Content = "ielts", RangeName = "9" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "雅思-task1", Content = "ielts_task1", RangeName = "9" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "雅思-task2", Content = "ielts_task2", RangeName = "9" });
+            listEnglish.Add(new RB_AI_PresetsApplication_ViewModel { DescribeName = "学术写作", Content = "academic", RangeName = "100" });
+            return ApiResult.Success(data: new { ChinaGradeList = listChina.Select(x => new { Name = x.DescribeName, Value = x.Content }), EnglishGradeList = listEnglish.Select(x => new { Name = x.DescribeName, Value = x.Content, Score = x.RangeName }) });
         }
     }
 }