diff --git a/VOL.Ai/Services/JingShiTiJiaoService.cs b/VOL.Ai/Services/JingShiTiJiaoService.cs
index f97e7f2..cb706d0 100644
--- a/VOL.Ai/Services/JingShiTiJiaoService.cs
+++ b/VOL.Ai/Services/JingShiTiJiaoService.cs
@@ -5,7 +5,6 @@ using VOL.Core.Configuration;
using VOL.Core.Extensions.AutofacManager;
using VOL.Core.Utilities;
using VOL.Model.JingShiTiJiao;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace VOL.Ai.Services
{
diff --git a/VOL.Model/School/Response/GradeNameModel.cs b/VOL.Model/School/Response/GradeNameModel.cs
index bd09db7..d34851f 100644
--- a/VOL.Model/School/Response/GradeNameModel.cs
+++ b/VOL.Model/School/Response/GradeNameModel.cs
@@ -24,11 +24,6 @@ namespace VOL.Model
///
public string GradeName { get; set; }
- ///
- /// 性质名称
- ///
- //public string NatureName { get; set; }
-
///
/// 班级集合
///
diff --git a/VOL.WebApi/Controllers/JingShiTiJiao/JingShiTiJiaoController.cs b/VOL.WebApi/Controllers/JingShiTiJiao/JingShiTiJiaoController.cs
index a55bf66..0d45890 100644
--- a/VOL.WebApi/Controllers/JingShiTiJiao/JingShiTiJiaoController.cs
+++ b/VOL.WebApi/Controllers/JingShiTiJiao/JingShiTiJiaoController.cs
@@ -6,6 +6,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using VOL.Ai.IServices;
+using VOL.Ai.Services;
using VOL.Business.IServices;
using VOL.Business.IServices.Training;
using VOL.Core.Filters;
@@ -29,12 +31,16 @@ namespace VOL.WebApi.Controllers.JingShiTiJiao
#region 初始化
private readonly IS_HomeWorkService _homeWorkService;
+ private readonly IJingShiTiJiaoService _jingShiTiJiaoService;
+
+
private readonly II_TrainingDataService _trainingDataService;
public JingShiTiJiaoController(
- IS_HomeWorkService homeWorkService, II_TrainingDataService trainingDataService)
+ IS_HomeWorkService homeWorkService, II_TrainingDataService trainingDataService,IJingShiTiJiaoService jingShiTiJiaoService)
{
_homeWorkService = homeWorkService;
_trainingDataService = trainingDataService;
+ _jingShiTiJiaoService = jingShiTiJiaoService;
}
#endregion
@@ -109,15 +115,39 @@ namespace VOL.WebApi.Controllers.JingShiTiJiao
#endregion
-
///
/// 获取所有年级名称
///
///
- [HttpGet(nameof(GetGradeNames))]
- public async Task> GetGradeNames()
+ ///
+ /// 获取年级列表
+ ///
+ ///
+ [HttpGet(nameof(GetGradeList))]
+ public async Task> GetGradeList(string schoolCode)
{
-
+ if (string.IsNullOrWhiteSpace(schoolCode))
+ return new List();
+
+ // 1️⃣ 调用京师接口获取年级班级
+ var schoolClass = await _jingShiTiJiaoService.GetClassBySchoolAsync(schoolCode);
+
+ if (schoolClass == null || schoolClass.Grades == null || !schoolClass.Grades.Any())
+ return new List();
+
+ // 2️⃣ 将接口结果映射为 GradeNameModel
+ var result = schoolClass.Grades.Select(g => new GradeNameModel
+ {
+ Id = 0, // 如果数据库中没有对应Id,可先填0或后续映射数据库Id
+ GradeName = g.GradeName,
+ Class = g.Classes?.Select(c => new ClassNameModel
+ {
+ Id = 0, // 同理,暂时填0
+ ClassName = c.ClassName
+ }).ToList() ?? new List()
+ }).ToList();
+
+ return result;
}
}
}
diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json
index 34740a3..9768799 100644
--- a/VOL.WebApi/appsettings.json
+++ b/VOL.WebApi/appsettings.json
@@ -115,6 +115,15 @@
"ExpirationDate": 30,
"DataSyncCallBackUrl": "https://test.gonbat.com/aims-api/physicalfitnessthirdparty/yuedong/school/callBack"
},
+
+ "JingShiTiJiao": {
+ "Channel": "sk-yuedong",
+ "SecretKey": "JSTJ-kGfs6J7bkgdxr9mz",
+ "BaseUrl": "https://api-test.aitibao.com",
+ "SchoolCode": "202512240056",
+ "SportsItem": "JS010000"
+ },
+
"QuartzAccessKey": "65EC9387355E4717899C552963CE59FF", //定时任务的值,请自行修改
"OriginalPwd": "000000" //初始密码
}