diff --git a/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs b/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs index 199435c..2eef9dc 100644 --- a/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs +++ b/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs @@ -36,5 +36,37 @@ namespace YD_AllHeartRates.Api.Controllers var res = await _rateReportService.SchoolHeartRateReport(scoreTime); return res; } + /// + /// 年级心率报告 + /// + /// + [HttpGet(nameof(GradeHeartRateReport))] + public async Task GradeHeartRateReport(int gradeId, DateTime? scoreTime = null) + { + var res = await _rateReportService.GradeHeartRateReport(gradeId, scoreTime); + return res; + } + + /// + /// 班级心率报告 + /// + /// + [HttpGet(nameof(ClassHeartRateReport))] + public async Task ClassHeartRateReport(int classId, DateTime? scoreTime = null) + { + var res = await _rateReportService.ClassHeartRateReport(classId,scoreTime); + return res; + } + + /// + /// 学生心率报告 + /// + /// + [HttpGet(nameof(StudentHeartRateReport))] + public async Task StudentHeartRateReport(string studentNo, DateTime? scoreTime = null) + { + var res = await _rateReportService.StudentHeartRateReport(studentNo, scoreTime); + return res; + } } } diff --git a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 2f0101b..272afc5 100644 Binary files a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml index cad2613..f881bca 100644 --- a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml +++ b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml @@ -1624,6 +1624,12 @@ 设置 ClassListDto.set_FemaleReachCount(ClassListDto this, Int32 value) 的 填充码 + + 设置 ClassListDto.get_GradeName(ClassListDto this) 的 填充码 + + + 设置 ClassListDto.set_GradeName(ClassListDto this, String value) 的 填充码 + 设置 ClassListDto.get_MaleReachCount(ClassListDto this) 的 填充码 @@ -1681,6 +1687,12 @@ 设置 ClassListDto.set_FemaleReachCount(ClassListDto this, Int32 value) 的 填充码 + + 设置 ClassListDto.get_GradeName(ClassListDto this) 的 填充码 + + + 设置 ClassListDto.set_GradeName(ClassListDto this, String value) 的 填充码 + 设置 ClassListDto.get_MaleReachCount(ClassListDto this) 的 填充码 diff --git a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs index 3f8bd43..a2d5c8e 100644 --- a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs +++ b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs @@ -82,7 +82,8 @@ namespace YD_AllHeartRates.Api.Services.Impl } res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); - res.SportsData.AvgHeartRate = (int)data.Average(x => x.Value); + + res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average(); var durationsByStudent = HeartRateReportHelper.CalculateDurations( data, x => (x.StudentNo, x.Sex, x.GradeId)); @@ -136,6 +137,7 @@ namespace YD_AllHeartRates.Api.Services.Impl { ClassId = c.Id, ClassName = c.ClassName, + GradeName = c.GradeName, TeacherName = t.TeacherName }).OrderBy(x => x.ClassId).ToListAsync(); @@ -143,9 +145,9 @@ namespace YD_AllHeartRates.Api.Services.Impl from s in _sportsContext.Student join c in _sportsContext.Class on s.ClassId equals c.Id where c.SchoolCode == schoolCode && c.GradeId == gradeId - select new { s.StudentNo, s.Sex, ClassId = c.Id, c.GradeName }).ToListAsync(); + select new { s.StudentNo, s.Sex, ClassId = c.Id }).ToListAsync(); - res.GradeName = studentList.FirstOrDefault()?.GradeName ?? ""; + res.GradeName = classList.FirstOrDefault()?.GradeName ?? ""; res.ClassCount = classList.Count; res.MaleCount = studentList.Count(x => x.Sex == 1); res.FemaleCount = studentList.Count(x => x.Sex == 2); @@ -165,8 +167,9 @@ namespace YD_AllHeartRates.Api.Services.Impl var data = allData.Where(x => x.GradeId == gradeId).ToList(); - res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); - res.SportsData.AvgHeartRate = (int)data.Average(x => x.Value); + res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); + res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average(); + var durationsByStudent = HeartRateReportHelper.CalculateDurations(data, x => (x.StudentNo, x.Sex, x.ClassId)); @@ -191,6 +194,7 @@ namespace YD_AllHeartRates.Api.Services.Impl ClassId = cls.ClassId, ClassName = cls.ClassName, TeacherName = cls.TeacherName, + GradeName = cls.GradeName, StudentCount = total, MaleReachCount = maleQualified, FemaleReachCount = femaleQualified, @@ -246,7 +250,8 @@ namespace YD_AllHeartRates.Api.Services.Impl var data = allData.Where(x => x.GradeId == classId).ToList(); res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); - res.SportsData.AvgHeartRate = (int)data.Average(x => x.Value); + + res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average(); var durationsByStudent = HeartRateReportHelper.CalculateDurations(data, x => x.StudentNo); res.SportsData.AvgDuration = (int)durationsByStudent.Values.DefaultIfEmpty(0).Average(); diff --git a/YD_AllHeartRates.Api/SmartSportsEntitys/S_Class.cs b/YD_AllHeartRates.Api/SmartSportsEntitys/S_Class.cs index 8cd1466..861498c 100644 --- a/YD_AllHeartRates.Api/SmartSportsEntitys/S_Class.cs +++ b/YD_AllHeartRates.Api/SmartSportsEntitys/S_Class.cs @@ -36,7 +36,7 @@ namespace YD_AllHeartRates.Api.SmartSportsEntitys [Display(Name = "年级名称")] [Comment("年级名称")] [Column(TypeName = "nvarchar(100)")] - public string GradeName { get; set; } + public string? GradeName { get; set; } /// ///班级名称 diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.dll index baae75d..16a3999 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.exe b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.exe index 3a38d56..faea54d 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.exe and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.exe differ diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.pdb b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.pdb index 1d69898..886f66b 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.pdb and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.pdb differ diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.xml b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.xml index 6d343fb..6ab8483 100644 --- a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.xml +++ b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Api.xml @@ -31,6 +31,24 @@ + + + 年级心率报告 + + + + + + 班级心率报告 + + + + + + 学生心率报告 + + + 大屏 diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 2f0101b..272afc5 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll index 3bcc147..fc811a8 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb index 886dbd0..fd242ef 100644 Binary files a/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb and b/YD_AllHeartRates.Api/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json index 62965f6..a77dd6b 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json @@ -1,4 +1,66 @@ [ + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", + "Method": "ClassHeartRateReport", + "RelativePath": "ClassHeartRateReport", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "classId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "scoreTime", + "Type": "System.Nullable\u00601[[System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.ClassHeartRateReportDataDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", + "Method": "GradeHeartRateReport", + "RelativePath": "GradeHeartRateReport", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "gradeId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "scoreTime", + "Type": "System.Nullable\u00601[[System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.GradeHeartRateReportDataDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "YD_AllHeartRates.Api.Controllers.LargeScreenController", "Method": "HeartRateData", @@ -70,5 +132,36 @@ "StatusCode": 200 } ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", + "Method": "StudentHeartRateReport", + "RelativePath": "StudentHeartRateReport", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "studentNo", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "scoreTime", + "Type": "System.Nullable\u00601[[System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.StudentHeartRateReportDataDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] } ] \ No newline at end of file diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json index ee106ae..6ebcf9c 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json @@ -46,6 +46,149 @@ } } }, + "/GradeHeartRateReport": { + "get": { + "tags": [ + "HeartRateReport" + ], + "summary": "年级心率报告", + "parameters": [ + { + "name": "gradeId", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "scoreTime", + "in": "query", + "schema": { + "type": "string", + "format": "date-time" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/GradeHeartRateReportDataDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/GradeHeartRateReportDataDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/GradeHeartRateReportDataDto" + } + } + } + } + } + } + }, + "/ClassHeartRateReport": { + "get": { + "tags": [ + "HeartRateReport" + ], + "summary": "班级心率报告", + "parameters": [ + { + "name": "classId", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "scoreTime", + "in": "query", + "schema": { + "type": "string", + "format": "date-time" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ClassHeartRateReportDataDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ClassHeartRateReportDataDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ClassHeartRateReportDataDto" + } + } + } + } + } + } + }, + "/StudentHeartRateReport": { + "get": { + "tags": [ + "HeartRateReport" + ], + "summary": "学生心率报告", + "parameters": [ + { + "name": "studentNo", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "scoreTime", + "in": "query", + "schema": { + "type": "string", + "format": "date-time" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/StudentHeartRateReportDataDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/StudentHeartRateReportDataDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/StudentHeartRateReportDataDto" + } + } + } + } + } + } + }, "/SchoolInfo": { "get": { "tags": [ @@ -140,6 +283,94 @@ }, "additionalProperties": false }, + "ClassHeartRateReportDataDto": { + "type": "object", + "properties": { + "maleCount": { + "type": "integer", + "format": "int32" + }, + "femaleCount": { + "type": "integer", + "format": "int32" + }, + "studentCount": { + "type": "integer", + "format": "int32", + "readOnly": true + }, + "startEndTime": { + "type": "string", + "nullable": true + }, + "sportsData": { + "$ref": "#/components/schemas/SportsDataDto" + }, + "gradeName": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "teacherName": { + "type": "string", + "nullable": true + }, + "studentList": { + "type": "array", + "items": { + "$ref": "#/components/schemas/StudentListDto" + }, + "nullable": true + } + }, + "additionalProperties": false + }, + "ClassListDto": { + "type": "object", + "properties": { + "classId": { + "type": "integer", + "format": "int32" + }, + "gradeName": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "teacherName": { + "type": "string", + "nullable": true + }, + "studentCount": { + "type": "integer", + "format": "int32" + }, + "reachCount": { + "type": "integer", + "format": "int32", + "readOnly": true + }, + "maleReachCount": { + "type": "integer", + "format": "int32" + }, + "femaleReachCount": { + "type": "integer", + "format": "int32" + }, + "reachRate": { + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false + }, "Classes": { "type": "object", "properties": { @@ -154,6 +385,47 @@ }, "additionalProperties": false }, + "GradeHeartRateReportDataDto": { + "type": "object", + "properties": { + "maleCount": { + "type": "integer", + "format": "int32" + }, + "femaleCount": { + "type": "integer", + "format": "int32" + }, + "studentCount": { + "type": "integer", + "format": "int32", + "readOnly": true + }, + "startEndTime": { + "type": "string", + "nullable": true + }, + "sportsData": { + "$ref": "#/components/schemas/SportsDataDto" + }, + "gradeName": { + "type": "string", + "nullable": true + }, + "classCount": { + "type": "integer", + "format": "int32" + }, + "classList": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ClassListDto" + }, + "nullable": true + } + }, + "additionalProperties": false + }, "GradeListDto": { "type": "object", "properties": { @@ -391,6 +663,48 @@ } }, "additionalProperties": false + }, + "StudentHeartRateReportDataDto": { + "type": "object", + "properties": { + "heartRateTrend": { + "$ref": "#/components/schemas/ChartDataDto" + } + }, + "additionalProperties": false + }, + "StudentListDto": { + "type": "object", + "properties": { + "studentNo": { + "type": "string", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "sex": { + "type": "integer", + "format": "int32" + }, + "age": { + "type": "integer", + "format": "int32" + }, + "photo": { + "type": "string", + "nullable": true + }, + "isReach": { + "type": "boolean" + }, + "duration": { + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false } }, "securitySchemes": { diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 2f0101b..272afc5 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb index c1ba072..5f1f2d5 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml index cad2613..f881bca 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml @@ -1624,6 +1624,12 @@ 设置 ClassListDto.set_FemaleReachCount(ClassListDto this, Int32 value) 的 填充码 + + 设置 ClassListDto.get_GradeName(ClassListDto this) 的 填充码 + + + 设置 ClassListDto.set_GradeName(ClassListDto this, String value) 的 填充码 + 设置 ClassListDto.get_MaleReachCount(ClassListDto this) 的 填充码 @@ -1681,6 +1687,12 @@ 设置 ClassListDto.set_FemaleReachCount(ClassListDto this, Int32 value) 的 填充码 + + 设置 ClassListDto.get_GradeName(ClassListDto this) 的 填充码 + + + 设置 ClassListDto.set_GradeName(ClassListDto this, String value) 的 填充码 + 设置 ClassListDto.get_MaleReachCount(ClassListDto this) 的 填充码 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah index ad5b919..50e9b48 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah @@ -1 +1 @@ -179d9839 \ No newline at end of file +c9033e1 \ No newline at end of file diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch index 6defd98..7b9d97c 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch @@ -1 +1 @@ -T8L2/Pl4YFVd0LzVElD3k675CXn+Xe1xxjrG3w5fw3Y=WWmIfOUbyYPYdKFHlVpzo+vbEnfIsJNTTcG8+oWdtSc= \ No newline at end of file +OAIdEGg7kUePvtmGLiFappRiZ+t8THQ+PJMVzStNkIk=WWmIfOUbyYPYdKFHlVpzo+vbEnfIsJNTTcG8+oWdtSc= \ No newline at end of file diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs index 204ff77..ae9c793 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 2f0101b..272afc5 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb index c1ba072..5f1f2d5 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 8d9fc8e..1fff828 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 8d9fc8e..1fff828 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs index cc1e4d6..6a9726f 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2791faef427e5055e0b100213d2f516c468a2f23")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cba47da79529d88a9c2535c9c0d6a3ad9378b578")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache index 786b257..36db204 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -a2a833dba9b68d9e097ca4bb10f4e8d37c31e1c7f2353ed088ceaaced6f4b940 +5dadd7f540af7e55599b33b1bde90ec16d8c55e26389806708a87f620f4347bb diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache index df600a4..28f48c9 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache index b175269..fc78c09 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll index baae75d..16a3999 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb index 1d69898..886f66b 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml index 6d343fb..6ab8483 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml @@ -31,6 +31,24 @@ + + + 年级心率报告 + + + + + + 班级心率报告 + + + + + + 学生心率报告 + + + 大屏 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe index 3a38d56..faea54d 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe and b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll index ea08508..56c837a 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll index ea08508..56c837a 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Commons/Dto/LargeScreen/GradeHeartRateReportDataDto.cs b/YD_AllHeartRates.Commons/Dto/LargeScreen/GradeHeartRateReportDataDto.cs index 604c953..64fec42 100644 --- a/YD_AllHeartRates.Commons/Dto/LargeScreen/GradeHeartRateReportDataDto.cs +++ b/YD_AllHeartRates.Commons/Dto/LargeScreen/GradeHeartRateReportDataDto.cs @@ -37,6 +37,11 @@ namespace YD_AllHeartRates.Commons.Dto.LargeScreen /// public int ClassId { get; set; } + /// + /// 年级名称 + /// + public string? GradeName { get; set; } + /// /// 班级名称 /// diff --git a/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateReportDataDto.cs b/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateReportDataDto.cs index 32c0ae2..7b6e9fe 100644 --- a/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateReportDataDto.cs +++ b/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateReportDataDto.cs @@ -34,7 +34,7 @@ namespace YD_AllHeartRates.Commons.Dto.LargeScreen /// /// 运动数据 /// - public SportsDataDto SportsData { get; set; } + public SportsDataDto SportsData { get; set; } = new SportsDataDto(); } /// diff --git a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll index 3bcc147..fc811a8 100644 Binary files a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb index 886dbd0..fd242ef 100644 Binary files a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb and b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs index dfb6ac9..8aefbd7 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2791faef427e5055e0b100213d2f516c468a2f23")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cba47da79529d88a9c2535c9c0d6a3ad9378b578")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache index 7322f4f..65b8718 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -75fe66ac65b777401eca8662675485feb709949edb700f080fb4f1742a74f061 +fe596cc1e95247c75a7a0988e79c591ff26019d760d216a793314f7ca2ab770e diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll index 3bcc147..fc811a8 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb index 886dbd0..fd242ef 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll index a77d82d..1ed8a18 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll index a77d82d..1ed8a18 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll differ