diff --git a/VOL.Ai/IServices/IAiAppService.cs b/VOL.Ai/IServices/IAiAppService.cs
index b70d08d..8be40b3 100644
--- a/VOL.Ai/IServices/IAiAppService.cs
+++ b/VOL.Ai/IServices/IAiAppService.cs
@@ -2,11 +2,13 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using VOL.Model;
using VOL.Model.Ai;
using VOL.Model.Ai.Request;
using VOL.Model.Ai.Response;
using VOL.Model.IOT.Response;
+using VOL.Model.Training.Response;
namespace VOL.Ai.IServices
{
@@ -191,14 +193,24 @@ namespace VOL.Ai.IServices
///
Task IsActivityInList(IsActivityInListRequest paramDto);
+ #endregion
+
+ #region 2.0 接口
///
- /// Ai一体机扫描那登录轮询
+ /// Ai一体机扫描登录轮询
///
///
///
Task ScanCodeLogin(Ai_Request paramDto);
+ ///
+ /// 用户名密码登录
+ ///
+ ///
+ ///
+ Task Login(Ai_LoginRequest paramDto);
+
///
/// 退出登录
///
@@ -206,6 +218,51 @@ namespace VOL.Ai.IServices
///
Task LogOut(LoginOutDto paramDto);
+ ///
+ /// 获取课堂记录列表
+ ///
+ ///
+ ///
+ Task> ClassRoomRecordPageList(ClassRoomRecordPageListRequest paramDto);
+
+ ///
+ /// 获取课堂阶段列表
+ ///
+ ///
+ ///
+ Task> ClassroomStagePageList(Ai_Request paramDto);
+
+ ///
+ /// 新增课堂设置
+ ///
+ ///
+ ///
+ Task AddClassroomSetting(AddClassroomSettingRequest paramDto);
+
+ ///
+ /// 更新课堂设置
+ ///
+ ///
+ ///
+ Task UpdateClassroomSetting(UpdateClassroomSettingRequest paramDto);
+
+ ///
+ /// 获取课堂心率报告
+ ///
+ Task HeartRateReport(HeartRateReportRequest paramDto);
+
+ ///
+ /// 获取学生心率报告
+ ///
+ ///
+ ///
+ Task StudentHeartRateReport(GetStudentClassReportDetailsDto paramDto);
+
+ ///
+ /// 获取课堂跳绳报告
+ ///
+ Task JumpRopeReport(HeartRateReportRequest paramDto);
+
#endregion
}
}
diff --git a/VOL.Ai/Services/AiAppService.cs b/VOL.Ai/Services/AiAppService.cs
index a63ee49..3efa7ba 100644
--- a/VOL.Ai/Services/AiAppService.cs
+++ b/VOL.Ai/Services/AiAppService.cs
@@ -22,6 +22,7 @@ using Microsoft.AspNetCore.Http;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using System.Collections.Concurrent;
using VOL.Core.Services;
+using VOL.Model.Training.Response;
namespace VOL.Ai.Services
{
@@ -78,6 +79,7 @@ namespace VOL.Ai.Services
_fastJumpRopeDataRepository = fastJumpRopeDataRepository;
}
+ #region New
public async Task Ai_DeviceInfo(AiRequestDto paramDto)
{
var res = await (
@@ -1200,8 +1202,12 @@ namespace VOL.Ai.Services
return res;
}
+ #endregion
+
+ #region 2.0 接口
+
///
- /// Ai一体机扫描那登录轮询
+ /// Ai一体机扫描登录轮询
///
///
///
@@ -1259,5 +1265,47 @@ namespace VOL.Ai.Services
_scanCodeLoginRepository.Delete(teacher);
return await _teacherRepository.SaveChangesAsync() > 0;
}
+
+ public Task Login(Ai_LoginRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task> ClassRoomRecordPageList(ClassRoomRecordPageListRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task> ClassroomStagePageList(Ai_Request paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task AddClassroomSetting(AddClassroomSettingRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task UpdateClassroomSetting(UpdateClassroomSettingRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task HeartRateReport(HeartRateReportRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task StudentHeartRateReport(GetStudentClassReportDetailsDto paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Task JumpRopeReport(HeartRateReportRequest paramDto)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
}
}
diff --git a/VOL.Model/Ai/Request/AddClassroomSettingRequest.cs b/VOL.Model/Ai/Request/AddClassroomSettingRequest.cs
new file mode 100644
index 0000000..96c9d3c
--- /dev/null
+++ b/VOL.Model/Ai/Request/AddClassroomSettingRequest.cs
@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 添加课堂设置
+ ///
+ public class AddClassroomSettingRequest
+ {
+ ///
+ /// 课堂记录Id
+ ///
+ [Required(ErrorMessage = "课堂Id不能为空")]
+ public int ClassRoomRecordId { get; set; }
+
+ ///
+ /// 课堂设置列表
+ ///
+ public List ClassroomSettingList { get; set; }
+ }
+
+ ///
+ /// 获取课堂阶段列表
+ ///
+ public class ClassroomSettingDto
+ {
+ ///
+ /// 阶段Id
+ ///
+ public int ClassroomStageId { get; set; }
+
+ ///
+ /// 时长
+ ///
+ public int Duration { get; set; }
+
+ ///
+ /// 密度
+ ///
+ public int Density { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Request/Ai_LoginRequest.cs b/VOL.Model/Ai/Request/Ai_LoginRequest.cs
new file mode 100644
index 0000000..09a8acd
--- /dev/null
+++ b/VOL.Model/Ai/Request/Ai_LoginRequest.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 用户名密码登录
+ ///
+ public class Ai_LoginRequest: Ai_Request
+ {
+ ///
+ /// 用户名
+ ///
+ public string UserName { get; set; }
+
+ ///
+ /// 密码
+ ///
+ public string Password { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Request/ClassRoomRecordPageListRequest.cs b/VOL.Model/Ai/Request/ClassRoomRecordPageListRequest.cs
new file mode 100644
index 0000000..77c73d7
--- /dev/null
+++ b/VOL.Model/Ai/Request/ClassRoomRecordPageListRequest.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 课堂记录分页列表请求参数
+ ///
+ public class ClassRoomRecordPageListRequest : PageDto
+ {
+ ///
+ /// 学校Code
+ ///
+ public string SchoolCode { get; set; }
+
+ ///
+ /// AI设备的唯一编码
+ ///
+ public string Code { get; set; }
+
+
+ ///
+ /// 教师Id
+ ///
+ public int TeacherId { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Request/ClassroomStageDto.cs b/VOL.Model/Ai/Request/ClassroomStageDto.cs
new file mode 100644
index 0000000..5675497
--- /dev/null
+++ b/VOL.Model/Ai/Request/ClassroomStageDto.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 课堂阶段
+ ///
+ public class ClassroomStageDto
+ {
+ ///
+ /// 阶段Id
+ ///
+ public int Id { get; set; }
+
+ ///
+ /// 阶段名称
+ ///
+
+ public string Name { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Request/HeartRateReportRequest.cs b/VOL.Model/Ai/Request/HeartRateReportRequest.cs
new file mode 100644
index 0000000..0217e8f
--- /dev/null
+++ b/VOL.Model/Ai/Request/HeartRateReportRequest.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 心率报告请求
+ ///
+ public class HeartRateReportRequest : Ai_Request
+ {
+ ///
+ /// 课堂记录Id
+ ///
+ public int ClassRoomRecordId { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Request/UpdateClassroomSettingRequest.cs b/VOL.Model/Ai/Request/UpdateClassroomSettingRequest.cs
new file mode 100644
index 0000000..0659822
--- /dev/null
+++ b/VOL.Model/Ai/Request/UpdateClassroomSettingRequest.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Request
+{
+ ///
+ /// 修改课堂设置
+ ///
+ public class UpdateClassroomSettingRequest
+ {
+
+ ///
+ /// 课堂记录Id
+ ///
+ [Required(ErrorMessage = "课堂Id不能为空")]
+ public int ClassRoomRecordId { get; set; }
+
+ ///
+ /// 阶段Id
+ ///
+ [Required(ErrorMessage = "阶段Id不能为空")]
+ public int ClassroomStageId { get; set; }
+
+ ///
+ /// 时长
+ ///
+ public int Duration { get; set; }
+
+ ///
+ /// 密度
+ ///
+ public int Density { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Response/.editorconfig b/VOL.Model/Ai/Response/.editorconfig
deleted file mode 100644
index fa631d4..0000000
--- a/VOL.Model/Ai/Response/.editorconfig
+++ /dev/null
@@ -1,232 +0,0 @@
-# 如果要从更高级别的目录继承 .editorconfig 设置,请删除以下行
-root = true
-
-# c# 文件
-[*.cs]
-
-#### Core EditorConfig 选项 ####
-
-# 缩进和间距
-indent_size = 4
-indent_style = space
-tab_width = 4
-
-# 新行首选项
-end_of_line = crlf
-insert_final_newline = false
-
-#### .NET 编码约定 ####
-
-# 组织 Using
-dotnet_separate_import_directive_groups = false
-dotnet_sort_system_directives_first = false
-file_header_template = unset
-
-# this. 和 Me. 首选项
-dotnet_style_qualification_for_event = false
-dotnet_style_qualification_for_field = false
-dotnet_style_qualification_for_method = false
-dotnet_style_qualification_for_property = false
-
-# 语言关键字与 bcl 类型首选项
-dotnet_style_predefined_type_for_locals_parameters_members = true
-dotnet_style_predefined_type_for_member_access = true
-
-# 括号首选项
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
-
-# 修饰符首选项
-dotnet_style_require_accessibility_modifiers = for_non_interface_members
-
-# 表达式级首选项
-dotnet_style_coalesce_expression = true
-dotnet_style_collection_initializer = true
-dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
-dotnet_style_null_propagation = true
-dotnet_style_object_initializer = true
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true
-dotnet_style_prefer_collection_expression = when_types_loosely_match
-dotnet_style_prefer_compound_assignment = true
-dotnet_style_prefer_conditional_expression_over_assignment = true
-dotnet_style_prefer_conditional_expression_over_return = true
-dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
-dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_style_prefer_inferred_tuple_names = true
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true
-dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_style_prefer_simplified_interpolation = true
-
-# 字段首选项
-dotnet_style_readonly_field = true
-
-# 参数首选项
-dotnet_code_quality_unused_parameters = all
-
-# 禁止显示首选项
-dotnet_remove_unnecessary_suppression_exclusions = none
-
-# 新行首选项
-dotnet_style_allow_multiple_blank_lines_experimental = true
-dotnet_style_allow_statement_immediately_after_block_experimental = true
-
-#### c# 编码约定 ####
-
-# var 首选项
-csharp_style_var_elsewhere = false
-csharp_style_var_for_built_in_types = false
-csharp_style_var_when_type_is_apparent = false
-
-# Expression-bodied 成员
-csharp_style_expression_bodied_accessors = true
-csharp_style_expression_bodied_constructors = false
-csharp_style_expression_bodied_indexers = true
-csharp_style_expression_bodied_lambdas = true
-csharp_style_expression_bodied_local_functions = false
-csharp_style_expression_bodied_methods = false
-csharp_style_expression_bodied_operators = false
-csharp_style_expression_bodied_properties = true
-
-# 模式匹配首选项
-csharp_style_pattern_matching_over_as_with_null_check = true
-csharp_style_pattern_matching_over_is_with_cast_check = true
-csharp_style_prefer_extended_property_pattern = true
-csharp_style_prefer_not_pattern = true
-csharp_style_prefer_pattern_matching = true
-csharp_style_prefer_switch_expression = true
-
-# Null 检查首选项
-csharp_style_conditional_delegate_call = true
-
-# 修饰符首选项
-csharp_prefer_static_anonymous_function = true
-csharp_prefer_static_local_function = true
-csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
-csharp_style_prefer_readonly_struct = true
-csharp_style_prefer_readonly_struct_member = true
-
-# 代码块首选项
-csharp_prefer_braces = true
-csharp_prefer_simple_using_statement = true
-csharp_style_namespace_declarations = block_scoped
-csharp_style_prefer_method_group_conversion = true
-csharp_style_prefer_primary_constructors = true
-csharp_style_prefer_top_level_statements = true
-
-# 表达式级首选项
-csharp_prefer_simple_default_expression = true
-csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true
-csharp_style_inlined_variable_declaration = true
-csharp_style_prefer_index_operator = true
-csharp_style_prefer_local_over_anonymous_function = true
-csharp_style_prefer_null_check_over_type_check = true
-csharp_style_prefer_range_operator = true
-csharp_style_prefer_tuple_swap = true
-csharp_style_prefer_utf8_string_literals = true
-csharp_style_throw_expression = true
-csharp_style_unused_value_assignment_preference = discard_variable
-csharp_style_unused_value_expression_statement_preference = discard_variable
-
-# "using" 指令首选项
-csharp_using_directive_placement = outside_namespace
-
-# 新行首选项
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
-csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
-csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
-csharp_style_allow_embedded_statements_on_same_line_experimental = true
-
-#### C# 格式规则 ####
-
-# 新行首选项
-csharp_new_line_before_catch = true
-csharp_new_line_before_else = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
-csharp_new_line_between_query_expression_clauses = true
-
-# 缩进首选项
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
-csharp_indent_switch_labels = true
-
-# 空格键首选项
-csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
-# 包装首选项
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true
-
-#### 命名样式 ####
-
-# 命名规则
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-# 符号规范
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers =
-
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers =
-
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers =
-
-# 命名样式
-
-dotnet_naming_style.pascal_case.required_prefix =
-dotnet_naming_style.pascal_case.required_suffix =
-dotnet_naming_style.pascal_case.word_separator =
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix =
-dotnet_naming_style.begins_with_i.word_separator =
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
diff --git a/VOL.Model/Ai/Response/Ai_ClassRoomRecordPageListDto.cs b/VOL.Model/Ai/Response/Ai_ClassRoomRecordPageListDto.cs
new file mode 100644
index 0000000..09034d0
--- /dev/null
+++ b/VOL.Model/Ai/Response/Ai_ClassRoomRecordPageListDto.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Response
+{
+ ///
+ /// 课堂记录分页
+ ///
+ public class Ai_ClassRoomRecordPageListDto
+ {
+ ///
+ /// 年级班级名称
+ ///
+ public string GradeAndClassName { get; set; }
+
+ ///
+ /// 老师名称
+ ///
+ public string TeacherName { get; set; }
+
+ ///
+ /// 开始结束时间
+ ///
+ public string StartEndTime { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Response/Ai_HeartRateReportDto.cs b/VOL.Model/Ai/Response/Ai_HeartRateReportDto.cs
new file mode 100644
index 0000000..dccaa34
--- /dev/null
+++ b/VOL.Model/Ai/Response/Ai_HeartRateReportDto.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VOL.Model.Norm.Response;
+
+namespace VOL.Model.Ai.Response
+{
+ ///
+ /// 心率报告
+ ///
+ public class Ai_HeartRateReportDto
+ {
+ ///
+ /// 课堂记录名称
+ ///
+ public string ClassRoomRecordName { get; set; }
+
+ ///
+ /// 年级-班级
+ ///
+ public string GradeAndClass { get; set; }
+
+ ///
+ ///教师姓名
+ ///
+ public string TeacherName { get; set; }
+
+ ///
+ /// 课程起止时间
+ ///
+ public string StartingEndingTime { get; set; }
+
+ ///
+ /// 参与人数
+ ///
+ public string PeopleNumber { get; set; }
+
+ ///
+ /// 男女生人数
+ ///
+ public string PeopleNumberBySex { get; set; }
+
+ ///
+ /// 平均心率
+ ///
+ public string AvgHR { get; set; }
+
+ ///
+ /// 中高强度达标人数
+ ///
+ public string HighIntensity { get; set; }
+
+ ///
+ /// 运动密度
+ ///
+ public string Density { get; set; }
+
+ ///
+ /// 平均消耗
+ ///
+ public string Consumption { get; set; }
+
+ ///
+ /// 学生运动记录
+ ///
+ public List StudentTrainingRecordList { get; set; } = new List();
+
+ ///
+ /// 心率个数
+ ///
+ public List HeartRateNumber { get; set; } = new List();
+
+ ///
+ /// 心率变化趋势
+ ///
+ public List HeartRateTrend { get; set; } = new List();
+ }
+}
diff --git a/VOL.Model/Ai/Response/Ai_JumpRopeReportDto.cs b/VOL.Model/Ai/Response/Ai_JumpRopeReportDto.cs
new file mode 100644
index 0000000..0a5b324
--- /dev/null
+++ b/VOL.Model/Ai/Response/Ai_JumpRopeReportDto.cs
@@ -0,0 +1,64 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VOL.Model.Ai.Response
+{
+ ///
+ /// 跳绳报告
+ ///
+ public class Ai_JumpRopeReportDto
+ {
+ ///
+ /// 模型类型
+ ///
+ public int ModelType { get; set; }
+
+ ///
+ /// 模型名称
+ ///
+ public string ModelName { get; set; }
+
+ ///
+ ///运动时长/分钟
+ ///
+ public int MotionDuration { get; set; }
+
+ ///
+ /// 学生人数
+ ///
+ public int StudentCount { get; set; }
+
+ ///
+ /// 学生列表
+ ///
+ public List StudentList { get; set; }
+ }
+ public class Ai_StudentJumpRopeReportListDto
+ {
+ ///
+ ///学号
+ ///
+ public string StudentNo { get; set; }
+
+ ///
+ ///姓名
+ ///
+ public string StudentName { get; set; }
+
+ ///
+ /// 排行
+ ///
+ public int Ranking { get; set; }
+
+ ///
+ ///正确个数
+ ///
+ public int? JumpValue { get; set; }
+ }
+}
diff --git a/VOL.Model/Ai/Response/Ai_RankingListDto.cs b/VOL.Model/Ai/Response/Ai_RankingListDto.cs
index 46db4d9..7d7e5fb 100644
--- a/VOL.Model/Ai/Response/Ai_RankingListDto.cs
+++ b/VOL.Model/Ai/Response/Ai_RankingListDto.cs
@@ -104,5 +104,10 @@ namespace VOL.Model.Ai
///正确个数
///
public int? JumpValue { get; set; }
+
+ ///
+ /// 等级
+ ///
+ public int Rank { get; set; }
}
}
\ No newline at end of file
diff --git a/VOL.Model/Training/Response/GetClassReportDetailsModel.cs b/VOL.Model/Training/Response/GetClassReportDetailsModel.cs
index 220b994..de304b9 100644
--- a/VOL.Model/Training/Response/GetClassReportDetailsModel.cs
+++ b/VOL.Model/Training/Response/GetClassReportDetailsModel.cs
@@ -129,5 +129,10 @@ namespace VOL.Model
/// 平均消耗
///
public int Consumption { get; set; } = 0;
+
+ ///
+ /// 是否达标
+ ///
+ public bool IsAccreditation { get; set; }
}
}
diff --git a/VOL.Model/VOL.Model.csproj b/VOL.Model/VOL.Model.csproj
index 2ce1123..bc9c6c8 100644
--- a/VOL.Model/VOL.Model.csproj
+++ b/VOL.Model/VOL.Model.csproj
@@ -22,10 +22,6 @@
-
-
-
-