diff --git a/YD_AllHeartRates.Api/Entitys/HeartRateData.cs b/YD_AllHeartRates.Api/Entitys/HeartRateData.cs index d76a228..11297d9 100644 --- a/YD_AllHeartRates.Api/Entitys/HeartRateData.cs +++ b/YD_AllHeartRates.Api/Entitys/HeartRateData.cs @@ -134,6 +134,14 @@ namespace YD_AllHeartRates.Api.Entitys [Column(TypeName = "int")] public int Value { get; set; } + /// + ///瞬时心率 + /// + [Display(Name = "瞬时心率")] + [Comment("瞬时心率")] + [Column(TypeName = "int")] + public int InstantValue { get; set; } + /// ///电量 /// @@ -141,5 +149,31 @@ namespace YD_AllHeartRates.Api.Entitys [Comment("电量")] [Column(TypeName = "int")] public int QuantityOfElectricity { get; set; } + + /// + ///上传时间 + /// + [Display(Name = "上传时间")] + [Comment("上传时间")] + [Column(TypeName = "datetime")] + [Editable(true)] + public DateTime UploadTime { get; set; } + + /// + ///创建时间 + /// + [Display(Name = "创建时间")] + [Comment("创建时间")] + [Column(TypeName = "datetime")] + [Editable(true)] + public DateTime CreateTime { get; set; } + + /// + ///行政区 + /// + [Display(Name = "行政区")] + [Comment("行政区")] + [Column(TypeName = "nvarchar(100)")] + public string Area { get; set; } } } 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 f6b0eb8..63473ad 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.fakesconfig b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.fakesconfig index 35d1293..ddbf9c2 100644 Binary files a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.fakesconfig and b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.fakesconfig 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 36d7a36..32c48ad 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 @@ -1597,6 +1597,90 @@ 设置 SportsRoutineReportResponse.set_msg(SportsRoutineReportResponse this, String value) 的 填充码 + + YD_AllHeartRates.Commons.Dto.DataPush.StudentCacheInfo 的填充码类型 + + + 初始化新的填充码实例 + + + 初始化给定实例的新填充码 + + + 为所有实例成员定义填充码 + + + 设置 StudentCacheInfo.get_ClassName(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_ClassName(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_EduId(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_EduId(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_Grade(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_Grade(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_Name(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_Name(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_School(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_School(StudentCacheInfo this, String value) 的 填充码 + + + 为已填充的类型的所有方法分配“Current”行为 + + + 为已填充的类型的所有方法分配“NotImplemented”行为 + + + 为已填充的类型的所有方法分配行为 + + + 设置 StudentCacheInfo.get_ClassName(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_ClassName(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.StudentCacheInfo(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.get_EduId(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_EduId(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_Grade(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_Grade(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_Name(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_Name(StudentCacheInfo this, String value) 的 填充码 + + + 设置 StudentCacheInfo.get_School(StudentCacheInfo this) 的 填充码 + + + 设置 StudentCacheInfo.set_School(StudentCacheInfo this, String value) 的 填充码 + YD_AllHeartRates.Commons.Dto.DataPush.StudentData 的填充码类型 @@ -1813,6 +1897,24 @@ 获取或设置实例观察者。 + + YD_AllHeartRates.Commons.Dto.DataPush.StudentCacheInfo 的存根类型 + + + 初始化新实例 + + + 获取或设置一个值,该值指示是否应调用基方法而不调用回退行为 + + + 初始化 type StubStudentCacheInfo 的新实例 + + + 获取或设置实例行为。 + + + 获取或设置实例观察者。 + YD_AllHeartRates.Commons.Dto.DataPush.StudentData 的存根类型 diff --git a/YD_AllHeartRates.Api/Middlewares/SportsRoutineReportJob.cs b/YD_AllHeartRates.Api/Middlewares/SportsRoutineReportJob.cs index 8393e7c..7e2d42b 100644 --- a/YD_AllHeartRates.Api/Middlewares/SportsRoutineReportJob.cs +++ b/YD_AllHeartRates.Api/Middlewares/SportsRoutineReportJob.cs @@ -1,6 +1,9 @@ using Newtonsoft.Json; using System; +using YD_AllHeartRates.Api.Context; +using YD_AllHeartRates.Api.Entitys; using YD_AllHeartRates.Api.Services.Interface; +using YD_AllHeartRates.Api.Utilities; using YD_AllHeartRates.Commons.Dto.DataPush; using YD_AllHeartRates.Commons.MemoryCaches; using YD_AllHeartRates.Commons.Utils; @@ -13,6 +16,7 @@ namespace YD_AllHeartRates.Api.Middlewares private Timer _timer; private readonly ICaching _caching; + public UserContext _userContext; private static string[] ChangXing = new string[] { @@ -94,33 +98,48 @@ namespace YD_AllHeartRates.Api.Middlewares "朱紫芸" }; - private static List _eduIds = new List(); + private readonly List _students = new(); - public SportsRoutineReportJob(IDataPushService dataPushService, ICaching caching) + public SportsRoutineReportJob(IDataPushService dataPushService, UserContext userContext, ICaching caching) { _dataPushService = dataPushService; + _userContext = userContext; _caching = caching; - // 尝试从 Redis 获取缓存 - var cachedEduIds = _caching.Get>("StudentEduIds"); - if (cachedEduIds != null && cachedEduIds.Count > 0) + // Redis 中缓存键 + const string redisKey = "StudentEduInfos"; + + // 1. 尝试从 Redis 获取缓存 + var cachedList = _caching.Get>(redisKey); + if (cachedList != null && cachedList.Count > 0) { - _eduIds = cachedEduIds; - Console.WriteLine("从 Redis 加载学生 EduId 完成。"); - return; // 已有缓存直接返回 + _students = cachedList; + Console.WriteLine("从 Redis 加载学生信息完成。"); + return; } + // 2. 缓存不存在 → 调用接口获取 + var result = new List(); + // 正大中学 foreach (var name in ZhengDa) { var student = _dataPushService .GetStudentEduId("上海市崇明区正大中学", "七年级", "5班", name, "") - .Result + .Result? .FirstOrDefault(); if (student != null) { - _eduIds.Add(student.EduId); + result.Add(new StudentCacheInfo + { + School = "上海市崇明区正大中学", + Grade = "七年级", + ClassName = "5班", + Name = name, + EduId = student.EduId + }); + Console.WriteLine($"正大中学:[{DateTime.Now}] {name}: {student.EduId}"); } } @@ -130,23 +149,33 @@ namespace YD_AllHeartRates.Api.Middlewares { var student = _dataPushService .GetStudentEduId("上海市崇明区长兴小学", "二年级", "二年级2班", name, "") - .Result + .Result? .FirstOrDefault(); if (student != null) { - _eduIds.Add(student.EduId); + result.Add(new StudentCacheInfo + { + School = "上海市崇明区长兴小学", + Grade = "二年级", + ClassName = "二年级2班", + Name = name, + EduId = student.EduId + }); + Console.WriteLine($"长兴小学:[{DateTime.Now}] {name}: {student.EduId}"); } } - var json = JsonConvert.SerializeObject(_eduIds); - _caching.AddObject("StudentEduIds", json); - Console.WriteLine("学生 EduId 已缓存到 Redis。"); + // 写入 Redis(直接存对象,不再存 json 字符串) + _caching.AddObject(redisKey, result); + _students = result; + + Console.WriteLine("学生信息已缓存到 Redis。"); } public Task StartAsync(CancellationToken cancellationToken) - { + { // 每分钟检查一次时间,看是否在8-16点并整点执行 _timer = new Timer(async _ => await DoWork(), null, TimeSpan.Zero, TimeSpan.FromMinutes(1)); return Task.CompletedTask; @@ -156,40 +185,71 @@ namespace YD_AllHeartRates.Api.Middlewares { var now = DateTime.Now; - // 定时任务:每天 8:30 ~ 18:30,每小时执行一次 + var heartRateDatas = new List(); + + // 每天 8:30 ~ 18:30,每小时的第 30 分钟执行 if (now.Hour >= 8 && now.Hour <= 18 && now.Minute == 30) { var random = new Random(); var data = new List(); - for (int i = 0; i < _eduIds.Count; i++) + for (int i = 0; i < _students.Count; i++) { + var stu = _students[i]; // 学生完整信息(含学校/班级/姓名/EduId) var hdsjList = new List(); - // 每个学生生成 60 条心率数据,间隔可平均分在过去 24 小时 - var beginTime = now.AddHours(-24); - var intervalMinutes = 24 * 60 / 60; // 24 小时 / 60 条 = 每条间隔分钟数 + // 从当前时间往前推 59 分钟 + var recordTime = now.AddMinutes(-59); for (int j = 0; j < 60; j++) { - var recordTime = beginTime.AddMinutes(j * intervalMinutes); - + var xl = random.Next(70, 111); + var jxxl = random.Next(60, 91); hdsjList.Add(new HeartRateRecordDto { SJSJ = recordTime.ToString("yyyy-MM-dd HH:mm:ss"), - XL = random.Next(70, 111), // 正常心率 70~110 - JXXL = random.Next(60, 91) // 静息心率 + XL = xl, + JXXL = jxxl + }); + + recordTime = recordTime.AddMinutes(1); // 间隔 1 分钟 + + heartRateDatas.Add(new HeartRateData() + { + SchoolCode = stu.School, + Area = "本部", + Code = stu.EduId, + GradeName = stu.Grade, + ClassName = stu.ClassName, + GradeId = 1, + ClassId = 1, + StudentName = stu.Name, + Sex = 0, + Consumption = 0, + CreateTime = now, + UploadTime = now, + Value = xl, + InstantValue = jxxl, + ScoreTime = recordTime, + MotionDuration = 0, + Strength = 0, + QuantityOfElectricity = 0, + StudentNo = stu.EduId }); } + // SBID = 设备编号(按顺序递增) var student = new StudentData { SBID = (i + 1).ToString("D2"), - XSEDUID = _eduIds[i], + XSEDUID = stu.EduId, HDSJ = hdsjList }; data.Add(student); + + Console.WriteLine( + $"生成数据 → {stu.School}-{stu.Grade}-{stu.ClassName}-{stu.Name} | EduId:{stu.EduId}"); } try @@ -201,10 +261,22 @@ namespace YD_AllHeartRates.Api.Middlewares { Console.WriteLine($"[{DateTime.Now}] HeartRate job msg:{ex.Message}"); } + + try + { + await _userContext.HeartRateData.AddRangeAsync(heartRateDatas); + await _userContext.SaveChangesAsync(); + + Console.WriteLine($"[{DateTime.Now}] HeartRate Add:{heartRateDatas.Count}"); + + } + catch (Exception ex) + { + Console.WriteLine($"[{DateTime.Now}] HeartRate Add:{ex.Message}"); + } } } - public Task StopAsync(CancellationToken cancellationToken) { _timer?.Change(Timeout.Infinite, 0); diff --git a/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.Designer.cs b/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.Designer.cs new file mode 100644 index 0000000..6a1d43d --- /dev/null +++ b/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.Designer.cs @@ -0,0 +1,319 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using YD_AllHeartRates.Api.Context; + +#nullable disable + +namespace YD_AllHeartRates.Api.Migrations +{ + [DbContext(typeof(UserContext))] + [Migration("20251217092150_12051217v1")] + partial class _12051217v1 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.HeartRateData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ClassId") + .HasColumnType("int") + .HasComment("班级Id"); + + b.Property("ClassName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("班级名称"); + + b.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("AI设备的唯一编码"); + + b.Property("Consumption") + .HasColumnType("int") + .HasComment("运动消耗"); + + b.Property("CreateTime") + .HasColumnType("datetime") + .HasComment("创建时间"); + + b.Property("GradeId") + .HasColumnType("int") + .HasComment("年级编号"); + + b.Property("GradeName") + .HasColumnType("nvarchar(100)") + .HasComment("年级名称"); + + b.Property("InstantValue") + .HasColumnType("int") + .HasComment("瞬时心率"); + + b.Property("MotionDuration") + .HasColumnType("int") + .HasComment("运动时长/分钟"); + + b.Property("QuantityOfElectricity") + .HasColumnType("int") + .HasComment("电量"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校Code"); + + b.Property("ScoreTime") + .HasColumnType("datetime") + .HasComment("测试时间"); + + b.Property("Sex") + .HasColumnType("int") + .HasComment("学校Co性别de"); + + b.Property("Strength") + .HasColumnType("int") + .HasComment("运动强度"); + + b.Property("StudentName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("姓名"); + + b.Property("StudentNo") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学号"); + + b.Property("UploadTime") + .HasColumnType("datetime") + .HasComment("上传时间"); + + b.Property("Value") + .HasColumnType("int") + .HasComment("心率"); + + b.HasKey("Id"); + + b.ToTable("HeartRateData"); + }); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.JumpRopeData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ClassId") + .HasColumnType("int") + .HasComment("班级Id"); + + b.Property("ClassName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("班级名称"); + + b.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("AI设备的唯一编码"); + + b.Property("ErrorNumber") + .HasColumnType("int") + .HasComment("错误个数"); + + b.Property("GradeId") + .HasColumnType("int") + .HasComment("年级编号"); + + b.Property("GradeName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("年级名称"); + + b.Property("JumpValue") + .HasColumnType("int") + .HasComment("正确个数"); + + b.Property("QuantityOfElectricity") + .HasColumnType("int") + .HasComment("电量"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校Code"); + + b.Property("ScoreTime") + .HasColumnType("datetime") + .HasComment("测试时间"); + + b.Property("Sex") + .HasColumnType("int") + .HasComment("学校Co性别de"); + + b.Property("StudentName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("姓名"); + + b.Property("StudentNo") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学号"); + + b.HasKey("Id"); + + b.ToTable("JumpRopeData"); + }); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.User", b => + { + b.Property("User_Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("User_Id"), 1L, 1); + + b.Property("Address") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("地址"); + + b.Property("BirthDate") + .HasColumnType("datetime") + .HasComment("出生日期"); + + b.Property("CreateDate") + .HasColumnType("datetime") + .HasComment("创建时间"); + + b.Property("Creator") + .HasColumnType("int)") + .HasComment("创建人"); + + b.Property("Email") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)") + .HasComment("Email"); + + b.Property("Enable") + .HasColumnType("tinyint") + .HasComment("是否可用"); + + b.Property("Gender") + .HasColumnType("int") + .HasComment("性别"); + + b.Property("HeadImageUrl") + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasComment("头像"); + + b.Property("Height") + .HasColumnType("float") + .HasComment("身高"); + + b.Property("Modifier") + .HasColumnType("int)") + .HasComment("修改人"); + + b.Property("ModifyDate") + .HasColumnType("datetime") + .HasComment("修改时间"); + + b.Property("PhoneNo") + .HasMaxLength(11) + .HasColumnType("nvarchar(11)") + .HasComment("手机号"); + + b.Property("RelevanceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Remarks") + .HasColumnType("text") + .HasComment("备注"); + + b.Property("RoleName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("角色"); + + b.Property("Role_Id") + .HasColumnType("int") + .HasComment("角色Id"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校编号"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)") + .HasComment("帐号"); + + b.Property("UserPwd") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("密码"); + + b.Property("UserTrueName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("姓名"); + + b.Property("Weight") + .HasColumnType("float") + .HasComment("体重"); + + b.Property("wx_HeadImgUrl") + .HasMaxLength(2000) + .HasColumnType("nvarchar(2000)") + .HasComment("微信头像"); + + b.Property("wx_NickName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信昵称"); + + b.Property("wx_OpenID") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信OpenId"); + + b.Property("wx_UnionID") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信UnionId"); + + b.HasKey("User_Id"); + + b.ToTable("User"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.cs b/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.cs new file mode 100644 index 0000000..a8a1dff --- /dev/null +++ b/YD_AllHeartRates.Api/Migrations/20251217092150_12051217v1.cs @@ -0,0 +1,97 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace YD_AllHeartRates.Api.Migrations +{ + public partial class _12051217v1 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "JumpValue", + table: "JumpRopeData", + type: "int", + nullable: false, + defaultValue: 0, + comment: "正确个数", + oldClrType: typeof(int), + oldType: "int", + oldNullable: true, + oldComment: "正确个数"); + + migrationBuilder.AlterColumn( + name: "ErrorNumber", + table: "JumpRopeData", + type: "int", + nullable: false, + defaultValue: 0, + comment: "错误个数", + oldClrType: typeof(int), + oldType: "int", + oldNullable: true, + oldComment: "错误个数"); + + migrationBuilder.AddColumn( + name: "CreateTime", + table: "HeartRateData", + type: "datetime2", + nullable: false, + defaultValue: DateTime.MinValue, // 0001-01-01 + comment: "创建时间"); + + migrationBuilder.AddColumn( + name: "UploadTime", + table: "HeartRateData", + type: "datetime2", + nullable: false, + defaultValue: DateTime.MinValue, + comment: "上传时间"); + + + migrationBuilder.AddColumn( + name: "InstantValue", + table: "HeartRateData", + type: "int", + nullable: false, + defaultValue: 0, + comment: "瞬时心率"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CreateTime", + table: "HeartRateData"); + + migrationBuilder.DropColumn( + name: "InstantValue", + table: "HeartRateData"); + + migrationBuilder.DropColumn( + name: "UploadTime", + table: "HeartRateData"); + + migrationBuilder.AlterColumn( + name: "JumpValue", + table: "JumpRopeData", + type: "int", + nullable: true, + comment: "正确个数", + oldClrType: typeof(int), + oldType: "int", + oldComment: "正确个数"); + + migrationBuilder.AlterColumn( + name: "ErrorNumber", + table: "JumpRopeData", + type: "int", + nullable: true, + comment: "错误个数", + oldClrType: typeof(int), + oldType: "int", + oldComment: "错误个数"); + } + } +} diff --git a/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.Designer.cs b/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.Designer.cs new file mode 100644 index 0000000..4e63673 --- /dev/null +++ b/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.Designer.cs @@ -0,0 +1,324 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using YD_AllHeartRates.Api.Context; + +#nullable disable + +namespace YD_AllHeartRates.Api.Migrations +{ + [DbContext(typeof(UserContext))] + [Migration("20251217095824_12051217v2")] + partial class _12051217v2 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.HeartRateData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Area") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("行政区"); + + b.Property("ClassId") + .HasColumnType("int") + .HasComment("班级Id"); + + b.Property("ClassName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("班级名称"); + + b.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("AI设备的唯一编码"); + + b.Property("Consumption") + .HasColumnType("int") + .HasComment("运动消耗"); + + b.Property("CreateTime") + .HasColumnType("datetime") + .HasComment("创建时间"); + + b.Property("GradeId") + .HasColumnType("int") + .HasComment("年级编号"); + + b.Property("GradeName") + .HasColumnType("nvarchar(100)") + .HasComment("年级名称"); + + b.Property("InstantValue") + .HasColumnType("int") + .HasComment("瞬时心率"); + + b.Property("MotionDuration") + .HasColumnType("int") + .HasComment("运动时长/分钟"); + + b.Property("QuantityOfElectricity") + .HasColumnType("int") + .HasComment("电量"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校Code"); + + b.Property("ScoreTime") + .HasColumnType("datetime") + .HasComment("测试时间"); + + b.Property("Sex") + .HasColumnType("int") + .HasComment("学校Co性别de"); + + b.Property("Strength") + .HasColumnType("int") + .HasComment("运动强度"); + + b.Property("StudentName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("姓名"); + + b.Property("StudentNo") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学号"); + + b.Property("UploadTime") + .HasColumnType("datetime") + .HasComment("上传时间"); + + b.Property("Value") + .HasColumnType("int") + .HasComment("心率"); + + b.HasKey("Id"); + + b.ToTable("HeartRateData"); + }); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.JumpRopeData", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ClassId") + .HasColumnType("int") + .HasComment("班级Id"); + + b.Property("ClassName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("班级名称"); + + b.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("AI设备的唯一编码"); + + b.Property("ErrorNumber") + .HasColumnType("int") + .HasComment("错误个数"); + + b.Property("GradeId") + .HasColumnType("int") + .HasComment("年级编号"); + + b.Property("GradeName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("年级名称"); + + b.Property("JumpValue") + .HasColumnType("int") + .HasComment("正确个数"); + + b.Property("QuantityOfElectricity") + .HasColumnType("int") + .HasComment("电量"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校Code"); + + b.Property("ScoreTime") + .HasColumnType("datetime") + .HasComment("测试时间"); + + b.Property("Sex") + .HasColumnType("int") + .HasComment("学校Co性别de"); + + b.Property("StudentName") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("姓名"); + + b.Property("StudentNo") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学号"); + + b.HasKey("Id"); + + b.ToTable("JumpRopeData"); + }); + + modelBuilder.Entity("YD_AllHeartRates.Api.Entitys.User", b => + { + b.Property("User_Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasComment("Id"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("User_Id"), 1L, 1); + + b.Property("Address") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("地址"); + + b.Property("BirthDate") + .HasColumnType("datetime") + .HasComment("出生日期"); + + b.Property("CreateDate") + .HasColumnType("datetime") + .HasComment("创建时间"); + + b.Property("Creator") + .HasColumnType("int)") + .HasComment("创建人"); + + b.Property("Email") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)") + .HasComment("Email"); + + b.Property("Enable") + .HasColumnType("tinyint") + .HasComment("是否可用"); + + b.Property("Gender") + .HasColumnType("int") + .HasComment("性别"); + + b.Property("HeadImageUrl") + .HasMaxLength(500) + .HasColumnType("nvarchar(500)") + .HasComment("头像"); + + b.Property("Height") + .HasColumnType("float") + .HasComment("身高"); + + b.Property("Modifier") + .HasColumnType("int)") + .HasComment("修改人"); + + b.Property("ModifyDate") + .HasColumnType("datetime") + .HasComment("修改时间"); + + b.Property("PhoneNo") + .HasMaxLength(11) + .HasColumnType("nvarchar(11)") + .HasComment("手机号"); + + b.Property("RelevanceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Remarks") + .HasColumnType("text") + .HasComment("备注"); + + b.Property("RoleName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("角色"); + + b.Property("Role_Id") + .HasColumnType("int") + .HasComment("角色Id"); + + b.Property("SchoolCode") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("学校编号"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)") + .HasComment("帐号"); + + b.Property("UserPwd") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("密码"); + + b.Property("UserTrueName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("姓名"); + + b.Property("Weight") + .HasColumnType("float") + .HasComment("体重"); + + b.Property("wx_HeadImgUrl") + .HasMaxLength(2000) + .HasColumnType("nvarchar(2000)") + .HasComment("微信头像"); + + b.Property("wx_NickName") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信昵称"); + + b.Property("wx_OpenID") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信OpenId"); + + b.Property("wx_UnionID") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)") + .HasComment("微信UnionId"); + + b.HasKey("User_Id"); + + b.ToTable("User"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.cs b/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.cs new file mode 100644 index 0000000..5aebebd --- /dev/null +++ b/YD_AllHeartRates.Api/Migrations/20251217095824_12051217v2.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace YD_AllHeartRates.Api.Migrations +{ + public partial class _12051217v2 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Area", + table: "HeartRateData", + type: "nvarchar(100)", + nullable: false, + defaultValue: "", + comment: "行政区"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Area", + table: "HeartRateData"); + } + } +} diff --git a/YD_AllHeartRates.Api/Migrations/UserContextModelSnapshot.cs b/YD_AllHeartRates.Api/Migrations/UserContextModelSnapshot.cs index 503bc84..e87293f 100644 --- a/YD_AllHeartRates.Api/Migrations/UserContextModelSnapshot.cs +++ b/YD_AllHeartRates.Api/Migrations/UserContextModelSnapshot.cs @@ -31,6 +31,11 @@ namespace YD_AllHeartRates.Api.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + b.Property("Area") + .IsRequired() + .HasColumnType("nvarchar(100)") + .HasComment("行政区"); + b.Property("ClassId") .HasColumnType("int") .HasComment("班级Id"); @@ -49,6 +54,10 @@ namespace YD_AllHeartRates.Api.Migrations .HasColumnType("int") .HasComment("运动消耗"); + b.Property("CreateTime") + .HasColumnType("datetime") + .HasComment("创建时间"); + b.Property("GradeId") .HasColumnType("int") .HasComment("年级编号"); @@ -57,6 +66,10 @@ namespace YD_AllHeartRates.Api.Migrations .HasColumnType("nvarchar(100)") .HasComment("年级名称"); + b.Property("InstantValue") + .HasColumnType("int") + .HasComment("瞬时心率"); + b.Property("MotionDuration") .HasColumnType("int") .HasComment("运动时长/分钟"); @@ -92,6 +105,10 @@ namespace YD_AllHeartRates.Api.Migrations .HasColumnType("nvarchar(100)") .HasComment("学号"); + b.Property("UploadTime") + .HasColumnType("datetime") + .HasComment("上传时间"); + b.Property("Value") .HasColumnType("int") .HasComment("心率"); @@ -124,7 +141,7 @@ namespace YD_AllHeartRates.Api.Migrations .HasColumnType("nvarchar(100)") .HasComment("AI设备的唯一编码"); - b.Property("ErrorNumber") + b.Property("ErrorNumber") .HasColumnType("int") .HasComment("错误个数"); @@ -137,7 +154,7 @@ namespace YD_AllHeartRates.Api.Migrations .HasColumnType("nvarchar(100)") .HasComment("年级名称"); - b.Property("JumpValue") + b.Property("JumpValue") .HasColumnType("int") .HasComment("正确个数"); 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 f244c7f..b2f8a89 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+24ee15b7b50692742c8b3b473f35816e9066b2b1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+011f3fa3a42013578e38a444dc772a11385294fb")] [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 f02c22e..1cccff3 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 @@ -9974da8b4c2c60d16c128ae3f34b19149b967ee33d081a58b7674b52fa6c3185 +ecffa5d967cb875f0853baf5a760205cf86862807fa88bc6d1529980a4227736 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 563de87..5cfcca5 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.csproj.CoreCompileInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.CoreCompileInputs.cache index 799ec2e..161b059 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.CoreCompileInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -567f2220a101ec6f7987622521fa90162c707a3dd991877160fc0262bc9e514b +ace2f8cd508a97aab61fe53ad211290a1089ef674bbdabf4d3660f4e95ac0455 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 fdf4042..a7b92fd 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 77972c4..a44094b 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 13e7ee6..7b8dcc7 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 b9dfe45..9df4937 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 @@ -271,11 +271,31 @@ 心率 + + + 瞬时心率 + + 电量 + + + 上传时间 + + + + + 创建时间 + + + + + 行政区 + + 跳绳数据 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe index 668c938..11a2245 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 07073fa..f3c8bb5 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 07073fa..f3c8bb5 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.Api/obj/Release/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Release/net6.0/apphost.exe index 668c938..11a2245 100644 Binary files a/YD_AllHeartRates.Api/obj/Release/net6.0/apphost.exe and b/YD_AllHeartRates.Api/obj/Release/net6.0/apphost.exe differ diff --git a/YD_AllHeartRates.Api/obj/YD_AllHeartRates.Api.csproj.nuget.dgspec.json b/YD_AllHeartRates.Api/obj/YD_AllHeartRates.Api.csproj.nuget.dgspec.json index d20b5aa..0747c05 100644 --- a/YD_AllHeartRates.Api/obj/YD_AllHeartRates.Api.csproj.nuget.dgspec.json +++ b/YD_AllHeartRates.Api/obj/YD_AllHeartRates.Api.csproj.nuget.dgspec.json @@ -143,7 +143,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } } }, @@ -235,7 +235,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/YD_AllHeartRates.Api/obj/project.assets.json b/YD_AllHeartRates.Api/obj/project.assets.json index 063950e..5e3956d 100644 --- a/YD_AllHeartRates.Api/obj/project.assets.json +++ b/YD_AllHeartRates.Api/obj/project.assets.json @@ -7340,7 +7340,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/YD_AllHeartRates.Api/obj/project.nuget.cache b/YD_AllHeartRates.Api/obj/project.nuget.cache index c5f990c..2a52359 100644 --- a/YD_AllHeartRates.Api/obj/project.nuget.cache +++ b/YD_AllHeartRates.Api/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "nEMOlcYlR+g=", + "dgSpecHash": "INeCvY02y7M=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_AllHeartRates.Api\\YD_AllHeartRates.Api\\YD_AllHeartRates.Api.csproj", "expectedPackageFiles": [ diff --git a/YD_AllHeartRates.Api/obj/publish/linux-x64/project.assets.json b/YD_AllHeartRates.Api/obj/publish/linux-x64/project.assets.json index 1cb08df..7163651 100644 --- a/YD_AllHeartRates.Api/obj/publish/linux-x64/project.assets.json +++ b/YD_AllHeartRates.Api/obj/publish/linux-x64/project.assets.json @@ -10157,7 +10157,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } }, "runtimes": { diff --git a/YD_AllHeartRates.Api/obj/publish/linux-x64/project.nuget.cache b/YD_AllHeartRates.Api/obj/publish/linux-x64/project.nuget.cache index 4b968e4..842c24b 100644 --- a/YD_AllHeartRates.Api/obj/publish/linux-x64/project.nuget.cache +++ b/YD_AllHeartRates.Api/obj/publish/linux-x64/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "7OYOAiPONks=", + "dgSpecHash": "FJU+n2AUOOQ=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_AllHeartRates.Api\\YD_AllHeartRates.Api\\YD_AllHeartRates.Api.csproj", "expectedPackageFiles": [ diff --git a/YD_AllHeartRates.Commons/Dto/DataPush/StudentCacheInfo.cs b/YD_AllHeartRates.Commons/Dto/DataPush/StudentCacheInfo.cs new file mode 100644 index 0000000..971f7a9 --- /dev/null +++ b/YD_AllHeartRates.Commons/Dto/DataPush/StudentCacheInfo.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_AllHeartRates.Commons.Dto.DataPush +{ + public class StudentCacheInfo + { + public string School { get; set; } + public string Grade { get; set; } + public string ClassName { get; set; } + public string Name { get; set; } + public string EduId { get; set; } + } + +} 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 dc75347..5700edc 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 2c82617..ece66f9 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 0a66ae1..fa90f54 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+24ee15b7b50692742c8b3b473f35816e9066b2b1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+011f3fa3a42013578e38a444dc772a11385294fb")] [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 708f2ad..8d14ba6 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 @@ -5ff03eace3a6603ede58a64881e5f61ecc32706ffbd9bd5953b29181564fa8be +9f65588d9b03ce7a818fcd204c4449109376bfc3f4de79f74a9fc3bf306fd9f5 diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.csproj.CoreCompileInputs.cache b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.csproj.CoreCompileInputs.cache index 2851280..69e426f 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.csproj.CoreCompileInputs.cache +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8e02dde6e94a4a804cc21d90f5877c232cd302195aeeb06a472732d2f1368c3b +5617ddf650573efc2a5b590948cc293b00556029726aefa94703a4ffd27eb76e 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 dc75347..5700edc 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 2c82617..ece66f9 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 4eb4b5a..764a569 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 4eb4b5a..764a569 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 diff --git a/YD_AllHeartRates.Commons/obj/YD_AllHeartRates.Commons.csproj.nuget.dgspec.json b/YD_AllHeartRates.Commons/obj/YD_AllHeartRates.Commons.csproj.nuget.dgspec.json index 73942fa..9a98f7f 100644 --- a/YD_AllHeartRates.Commons/obj/YD_AllHeartRates.Commons.csproj.nuget.dgspec.json +++ b/YD_AllHeartRates.Commons/obj/YD_AllHeartRates.Commons.csproj.nuget.dgspec.json @@ -92,7 +92,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/YD_AllHeartRates.Commons/obj/project.assets.json b/YD_AllHeartRates.Commons/obj/project.assets.json index 9ecd24f..ae59eda 100644 --- a/YD_AllHeartRates.Commons/obj/project.assets.json +++ b/YD_AllHeartRates.Commons/obj/project.assets.json @@ -1054,7 +1054,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/YD_AllHeartRates.Commons/obj/project.nuget.cache b/YD_AllHeartRates.Commons/obj/project.nuget.cache index f9bf444..ca4b5ae 100644 --- a/YD_AllHeartRates.Commons/obj/project.nuget.cache +++ b/YD_AllHeartRates.Commons/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "66S6RYy996A=", + "dgSpecHash": "ooOpzCmP9kE=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_AllHeartRates.Api\\YD_AllHeartRates.Commons\\YD_AllHeartRates.Commons.csproj", "expectedPackageFiles": [