VOL.Ai/Services/AiAppService.cs

@@ -43,31 +43,24 @@ namespace VOL.Ai.Services
         private readonly ISportsTestDataRepository _sportsTestDataRepository;
         private readonly ITrainingDataRepository _trainingDataRepository;
         private readonly IFastJumpRopeDataRepository _fastJumpRopeDataRepository;
-        private readonly ISys_UserRepository _userRepository;
-        private readonly IClassroomStageRepository _classroomStageRepository;
-        private readonly IClassroomSettingRepository _classroomSettingRepository;
-
 
         [ActivatorUtilitiesConstructor]
         public AiAppService(IMapper mapper,
-                IS_StudentRepository studentRepository,
+            IS_StudentRepository studentRepository,
-                IS_TeacherRepository teacherRepository,
+            IS_TeacherRepository teacherRepository,
-                IS_ClassRepository classRepository,
+            IS_ClassRepository classRepository,
-                IN_SportsTestCategoryRepository sportsTestCategoryRepository,
+            IN_SportsTestCategoryRepository sportsTestCategoryRepository,
-                IN_HealthStandardsRepository healthStandardsRepository,
+            IN_HealthStandardsRepository healthStandardsRepository,
-                IScanCodeLoginRepository scanCodeLoginRepository,
+            IScanCodeLoginRepository scanCodeLoginRepository,
-                IN_SportsTrainingCategoryRepository sportsTrainingCategoryRepository,
+            IN_SportsTrainingCategoryRepository sportsTrainingCategoryRepository,
-                IClassRoomRecordRepository classRoomRecordRepository,
+            IClassRoomRecordRepository classRoomRecordRepository,
-                IHeartRateDataRepository heartRateDataRepository,
+            IHeartRateDataRepository heartRateDataRepository,
-                IActivitiestDataRepository activitiestDataRepository,
+            IActivitiestDataRepository activitiestDataRepository,
-                ILevelExamDataRepository levelExamDataRepository,
+            ILevelExamDataRepository levelExamDataRepository,
-                ISportsTestDataRepository sportsTestDataRepository,
+            ISportsTestDataRepository sportsTestDataRepository,
-                ITrainingDataRepository trainingDataRepository,
+            ITrainingDataRepository trainingDataRepository,
-                IFastJumpRopeDataRepository fastJumpRopeDataRepository,
+            IFastJumpRopeDataRepository fastJumpRopeDataRepository
-                ISys_UserRepository userRepository,
+            )
-                IClassroomStageRepository classroomStageRepository,
-                IClassroomSettingRepository classroomSettingRepository
-                )
         {
             _mapper = mapper;
             _studentRepository = studentRepository;
@@ -84,9 +77,6 @@ namespace VOL.Ai.Services
             _trainingDataRepository = trainingDataRepository;
             _classRepository = classRepository;
             _fastJumpRopeDataRepository = fastJumpRopeDataRepository;
-            _userRepository = userRepository;
-            _classroomStageRepository = classroomStageRepository;
-            _classroomSettingRepository = classroomSettingRepository;
         }
 
         #region New
@@ -1244,49 +1234,6 @@ namespace VOL.Ai.Services
             if (res == null)
                 throw new Exception("未查询到登陆信息");
 
-            var grades = await (
-               from t in _studentRepository.DbContext.Set<S_ClassAssocTeacher>()
-               join c in _studentRepository.DbContext.Set<S_Class>() on t.ClassId equals c.Id into classGroup
-               from c in classGroup.DefaultIfEmpty()
-               where t.TeacherId == res.Id && c != null
-               select new Classes()
-               {
-                   Id = c.Id,
-                   Name = $"{c.GradeName}-{c.ClassName}",
-               }).ToListAsync();
-
-            res.GradeAndClassList = grades;
-
-            return res;
-        }
-
-        /// <summary>
-        /// 登录
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<Ai_TeacherFaceInfo> Login(Ai_LoginRequest paramDto)
-        {
-            var userInfo = await _userRepository.FindFirstAsync(x => x.UserName == paramDto.UserName && x.UserPwd == paramDto.Password);
-            if (userInfo == null)
-                throw new Exception("用户名或密码错误");
-
-            var res = await _teacherRepository.FindAsIQueryable(x => x.SchoolCode == paramDto.SchoolCode && x.TeacherStatus != TeacherStatus.Depart && x.TeacherPhoneNo == userInfo.UserName)
-                           .Select(x =>
-                           new Ai_TeacherFaceInfo()
-                           {
-                               Id = x.Id,
-                               Age = x.Age,
-                               //SchoolCode = x.SchoolCode,
-                               Sex = x.Sex,
-                               Phone = x.TeacherPhoneNo,
-                               TeacherName = x.TeacherName,
-                               Photo = x.TeacherPhoto,
-                           }).FirstOrDefaultAsync();
-
-            if (res == null)
-                throw new Exception("未查询到登陆信息");
-
 
             var grades = await (
                from t in _studentRepository.DbContext.Set<S_ClassAssocTeacher>()
@@ -1319,180 +1266,34 @@ namespace VOL.Ai.Services
             return await _teacherRepository.SaveChangesAsync() > 0;
         }
 
-        /// <summary>
+        public Task<Ai_TeacherFaceInfo> Login(Ai_LoginRequest paramDto)
-        /// 获取课堂记录列表
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<PageDataDto<Ai_ClassRoomRecordPageListDto>> ClassRoomRecordPageList(ClassRoomRecordPageListRequest paramDto)
         {
-            var res = new PageDataDto<Ai_ClassRoomRecordPageListDto>();
+            throw new NotImplementedException();
-
-            var query = _classRoomRecordRepository.FindAsIQueryable(x => x.TeacherId == paramDto.TeacherId);
-
-            // 获取总记录数
-            res.Total = await query.CountAsync();
-
-            // 分页查询
-            var list = await query
-                .OrderByDescending(x => x.StartTime)
-                .Skip((paramDto.PageIndex - 1) * paramDto.PageSize)
-                .Take(paramDto.PageSize)
-                .Select(x => new Ai_ClassRoomRecordPageListDto
-                {
-                    GradeAndClassName = $"{x.GradeName}-{x.ClassName}",
-                    StartEndTime = $"{x.StartTime.ToString("yyyy-MM-dd HH:mm")}-{x.EndTime.ToString("yyyy-MM-dd HH:mm")}",
-                    TeacherName = x.TeacherName
-                }).ToListAsync();
-
-            res.Datas = list;
-
-            return res;
         }
 
-        /// <summary>
+        public Task<PageDataDto<Ai_ClassRoomRecordPageListDto>> ClassRoomRecordPageList(ClassRoomRecordPageListRequest paramDto)
-        /// 获取课堂阶段列表
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<List<ClassroomStageDto>> ClassroomStagePageList(Ai_Request paramDto)
         {
-            var res = await _classroomStageRepository.FindAsIQueryable(x => true).Select(x => new ClassroomStageDto()
+            throw new NotImplementedException();
-            {
-                Id = x.Id,
-                Name = x.Name
-            }).ToListAsync();
-
-
-            return res;
         }
 
-        /// <summary>
+        public Task<List<ClassroomStageDto>> ClassroomStagePageList(Ai_Request paramDto)
-        /// 添加课堂设置
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<bool> AddClassroomSetting(AddClassroomSettingRequest paramDto)
         {
-            var classroomSettingList = new List<Ai_ClassroomSetting>();
+            throw new NotImplementedException();
-
-            foreach (var item in paramDto.ClassroomSettingList)
-            {
-                classroomSettingList.Add(new Ai_ClassroomSetting()
-                {
-                    ClassRoomRecordId = paramDto.ClassRoomRecordId,
-                    ClassroomStageId = item.ClassroomStageId,
-                    Density = item.Density,
-                    Duration = item.Duration
-                });
-            }
-
-            if (classroomSettingList.Count > 0)
-            {
-                await _classroomSettingRepository.AddRangeAsync(classroomSettingList);
-                return await _classroomSettingRepository.SaveChangesAsync() > 0;
-            }
-            return false;
         }
 
-        /// <summary>
+        public Task<bool> AddClassroomSetting(AddClassroomSettingRequest paramDto)
-        /// 更新课堂设置 
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<bool> UpdateClassroomSetting(UpdateClassroomSettingRequest paramDto)
         {
-            var classroomSetting = await _classroomSettingRepository.FindAsyncFirst(x => x.ClassRoomRecordId == paramDto.ClassRoomRecordId && x.ClassroomStageId == paramDto.ClassroomStageId);
+            throw new NotImplementedException();
-
-            if (classroomSetting == null)
-                return false;
-
-            classroomSetting.Density = paramDto.Density;
-            classroomSetting.Duration = paramDto.Duration;
-
-            _classroomSettingRepository.Update(classroomSetting);
-            return await _classroomSettingRepository.SaveChangesAsync() > 0;
         }
 
-        /// <summary>
+        public Task<bool> UpdateClassroomSetting(UpdateClassroomSettingRequest paramDto)
-        /// 获取课堂心率报告
-        /// </summary>
-        /// <param name="paramDto"></param>
-        /// <returns></returns>
-        public async Task<Ai_HeartRateReportDto> HeartRateReport(HeartRateReportRequest paramDto)
         {
-            var res = new GetClassReportDetailsModel();
+            throw new NotImplementedException();
+        }
 
-            var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>() 
+        public Task<Ai_HeartRateReportDto> HeartRateReport(HeartRateReportRequest paramDto)
-                        where  hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId && 
+        {
-                        select hrd;
+            throw new NotImplementedException();
-
-            var heartRateDataList = await query.ToListAsync();
-
-            if (heartRateDataList.Count == 0)
-                return res;
-
-            var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord)
-                .Where(x => x.SchoolCode == UserContext.Current.TenantId && x.Id == id)
-                .FirstAsync();
-
-            var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>()
-                .Where(x => x.SchoolCode == UserContext.Current.TenantId && x.ClassRoomRecordId == id)
-                .ToListAsync();
-
-            res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}";
-            res.TeacherName = classRoom.TeacherName;
-            res.StartingEndingTime = $"{(classRoom.StartTime.HasValue ? classRoom.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}{(classRoom.EndTime.HasValue ? " - " + classRoom.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}";
-            res.PeopleNumber = $"{heartRateDataList.GroupBy(x => x.StudentNo).Count()}/{classRoomStudent.Count}";
-            res.PeopleNumberBySex = $"{classRoomStudent.Count(x => x.Sex == SexType.Male)}/{classRoomStudent.Count(x => x.Sex == SexType.Female)}";
-
-            res.AvgHR = $"{(int)(heartRateDataList.Sum(x => x.Value) / heartRateDataList.Count)} 次/分";
-            res.Consumption = $"{Math.Abs(heartRateDataList.Sum(x => x.Consumption ?? 0) / heartRateDataList.Count)} 千卡";
-            //res.Density = $"{(int)(heartRateDataList.Where(x => x.Strength > 50).Sum(x => x.Strength) / heartRateDataList.Count)} %";
-
-            res.Density = $"{(int)CalculatePercentage(heartRateDataList.Count(x => x.Strength > 50), heartRateDataList.Count)} %";
-            res.HighIntensity = $"{heartRateDataList.Where(x => x.Strength > 50).GroupBy(x => x.StudentNo).Count()} 人";
-
-            var studentTrainingRecordList = classRoom.ClassroomStudentRecord.ToList();
-            List<StudentTrainingRecordDto> studentList = new List<StudentTrainingRecordDto>();
-
-            foreach (var item in studentTrainingRecordList)
-            {
-                var studentTrainingData = heartRateDataList.Where(x => x.StudentNo == item.StudentNo).ToList();
-
-                if (studentTrainingData.Count > 0)
-                {
-                    var student = new StudentTrainingRecordDto()
-                    {
-                        StudentNo = item.StudentNo,
-                        Age = item.Age,
-                        Sex = item.Sex
-                    };
-
-                    student.StudentName = studentTrainingData[0].StudentName;
-
-                    student.AvgHR = (int)(studentTrainingData.Sum(x => x.Value) / studentTrainingData.Count);
-                    student.Density = (int)CalculatePercentage(studentTrainingData.Count(x => x.Strength > 50), studentTrainingData.Count);
-                    student.Strength = (int)studentTrainingData.Average(x => x.Strength);
-                    student.Consumption = Math.Abs((int)studentTrainingData.Average(x => x.Consumption ?? 0));
-
-                    studentList.Add(student);
-                }
-            }
-
-            res.HeartRateNumber = GetHeartRateNumber(heartRateDataList);
-            res.HeartRateTrend = GetHeartRateTrend(heartRateDataList);
-            res.StudentTrainingRecordList = studentList;
-
-            //return new GetClassReportDetailsModel()
-            //{
-            //    HeartRateNumber = GetHeartRateNumber(heartRateDataList),
-            //    HeartRateTrend = GetHeartRateTrend(heartRateDataList),
-            //    HeartRateIntensityNumber = GetHeartRateIntensityNumber(heartRateDataList),
-            //    TimeIntervalHeartRateIntensityNumber = GetTimeIntervalHeartRateIntensityNumber(heartRateDataList)
-            //};
-
-            return res;
         }
 
         public Task<GetStudentClassReportDetailsModel> StudentHeartRateReport(GetStudentClassReportDetailsDto paramDto)

VOL.Core/Migrations/20250710032907_20250710v3.cs

@@ -1,39 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace VOL.Core.Migrations
-{
-    public partial class _20250710v3 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ClassroomStageId",
-                table: "Ai_ClassRoomRecord");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ClassroomStageId",
-                table: "Ai_HeartRateData",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                comment: "阶段Id");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ClassroomStageId",
-                table: "Ai_HeartRateData");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ClassroomStageId",
-                table: "Ai_ClassRoomRecord",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                comment: "阶段Id");
-        }
-    }
-}

VOL.Core/Migrations/VOLContextModelSnapshot.cs

@@ -205,6 +205,10 @@ namespace VOL.Core.Migrations
                         .HasColumnType("nvarchar(100)")
                         .HasComment("班级名称");
 
+                    b.Property<int>("ClassroomStageId")
+                        .HasColumnType("int")
+                        .HasComment("阶段Id");
+
                     b.Property<string>("Code")
                         .HasColumnType("nvarchar(100)")
                         .HasComment("AI设备的唯一编码");
@@ -613,10 +617,6 @@ namespace VOL.Core.Migrations
                         .HasColumnType("int")
                         .HasComment("课堂记录Id");
 
-                    b.Property<int>("ClassroomStageId")
-                        .HasColumnType("int")
-                        .HasComment("阶段Id");
-
                     b.Property<string>("Code")
                         .HasColumnType("nvarchar(100)")
                         .HasComment("AI设备的唯一编码");

VOL.Entity/DomainModels/Ai/Ai_ClassRoomRecord.cs

@@ -45,6 +45,14 @@ namespace VOL.Entity.DomainModels
         [Column(TypeName = "nvarchar(200)")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// 阶段Id
+        /// </summary>
+        [Display(Name = "阶段Id")]
+        [Comment("阶段Id")]
+        [Column(TypeName = "int")]
+        public int ClassroomStageId { get; set; }
+
         /// <summary>
         /// 年级编号
         /// </summary>

VOL.Model/Ai/Request/ClassroomStageDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VOL.Model.Ai.Response
+namespace VOL.Model.Ai.Request
 {
     /// <summary>
     /// 课堂阶段

VOL.Model/Ai/Request/HeartRateReportRequest.cs

@@ -15,10 +15,5 @@ namespace VOL.Model.Ai.Request
         /// 课堂记录Id
         /// </summary>
         public int ClassRoomRecordId { get; set; }
-
-        /// <summary>
-        /// 课堂阶段Id
-        /// </summary>
-        public int ClassRoomStageId { get; set; }
     }
 }