diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll index 54019ec..40a8015 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb index e30de3f..cd21646 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs index ebd2dee..d80295e 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1551bbc8f250d58485459e2eaff2dfbaef6692b0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a17e26de84b0fe37820a7775d2ea64536f4ffab3")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache index ebf8bbe..2b0c4c4 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -9abf130079da7e1969064f6ab9b9b5d7414efe37b2af546805ba6297cefa6d52 +a9df4680535370cdcb1084d7f17a683cc1b02063bcc8b864aa199e56009823a2 diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll index 54019ec..40a8015 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb index e30de3f..cd21646 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json index 26f6496..be5ab07 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1551bbc8f250d58485459e2eaff2dfbaef6692b0&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=a17e26de84b0fe37820a7775d2ea64536f4ffab3&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll index e9a1e82..2387a30 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll index e9a1e82..2387a30 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_CameraInfo.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_CameraInfo.cs new file mode 100644 index 0000000..54bcdd8 --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_CameraInfo.cs @@ -0,0 +1,46 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using YD_XinWei.Api.Entitys; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_CameraInfo")] + public class XW_CameraInfo : EntityBase + { + /// + /// 编号 + /// + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("编号")] + public int Id { get; set; } + /// + /// 摄像头序列号 + /// + [Display(Name = "SerialNumber")] + [Comment("摄像头序列号")] + public string? SerialNumber { get; set; } + + /// + /// 摄像头版本信息 + /// + [Display(Name = "Version")] + [Comment("摄像头版本信息")] + public string? Version { get; set; } + + /// + /// 设备Id + /// + + public int XW_DeviceId { get; set; } + + /// + /// 导航属性 + /// + public XW_Device XW_Device { get; set; } + } +} diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_Device.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_Device.cs new file mode 100644 index 0000000..b17f1ab --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_Device.cs @@ -0,0 +1,199 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using YD_XinWei.Api.Entitys; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_Device")] + public class XW_Device : EntityBase + { + /// + /// 编号 + /// + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("编号")] + public int Id { get; set; } + + /// + /// 类型 (1 平板, 2 跳绳, ...) + /// + [Display(Name = "Type")] + [Comment("类型")] + [Column(TypeName = "double")] + public double? Type { get; set; } + + /// + /// 设备型号 + /// + [Display(Name = "DeviceType")] + [Comment("设备型号")] + public string? DeviceType { get; set; } + + /// + /// 设备序列号 + /// + [Display(Name = "DeviceSerial")] + [Comment("设备序列号")] + public string? DeviceSerial { get; set; } + + /// + /// 设备 MAC 地址 + /// + [Display(Name = "DeviceMac")] + [Comment("设备 MAC 地址")] + public string? DeviceMac { get; set; } + + /// + /// 设备 IMEI 地址 + /// + [Display(Name = "DeviceImei")] + [Comment("设备 IMEI 地址")] + public string? DeviceImei { get; set; } + + /// + /// AI 摄像机 IP 地址 (多个 IP 用 , 隔开) + /// + [Display(Name = "CameraIp")] + [Comment("AI 摄像机 IP 地址")] + public string? CameraIp { get; set; } + + /// + /// 抢跑 IP (短跑) + /// + [Display(Name = "GunJumpingIp")] + [Comment("抢跑 IP")] + public string? GunJumpingIp { get; set; } + + /// + /// 是否是 EAI100 摄像头 + /// + [Display(Name = "Eai100Flag")] + [Comment("是否是 EAI100 摄像头")] + public bool? Eai100Flag { get; set; } + + /// + /// 组织 ID + /// + [Display(Name = "OrgId")] + [Comment("组织 ID")] + public int? OrgId { get; set; } + + /// + /// 组织名称 + /// + [Display(Name = "OrgName")] + [Comment("组织名称")] + public string? OrgName { get; set; } + + /// + /// 用户 ID + /// + [Display(Name = "UserId")] + [Comment("用户 ID")] + public int? UserId { get; set; } + + /// + /// 用户名称 + /// + [Display(Name = "UserName")] + [Comment("用户名称")] + public string? UserName { get; set; } + + /// + /// 软件版本 + /// + [Display(Name = "SoftWareVer")] + [Comment("软件版本")] + public string? SoftWareVer { get; set; } + + /// + /// 硬件版本 + /// + [Display(Name = "HardwareVer")] + [Comment("硬件版本")] + public string? HardwareVer { get; set; } + + /// + /// 应用时间 + /// + [Display(Name = "DeployTime")] + [Comment("应用时间")] + public string? DeployTime { get; set; } + + /// + /// 最后登录时间 + /// + [Display(Name = "LastLoginTime")] + [Comment("最后登录时间")] + public string? LastLoginTime { get; set; } + + /// + /// 备注 + /// + [Display(Name = "Remark")] + [Comment("备注")] + public string? Remark { get; set; } + + /// + /// 授权状态 (0 无效, 1 有效) + /// + [Display(Name = "State")] + [Comment("授权状态")] + public int? State { get; set; } + + /// + /// 状态 (0 无效, 1 有效) + /// + [Display(Name = "Status")] + [Comment("状态")] + public int? Status { get; set; } + + /// + /// 创建时间 + /// + [Display(Name = "CreateTime")] + [Comment("创建时间")] + public string? CreateTime { get; set; } + + /// + /// 创建人 + /// + [Display(Name = "CreateBy")] + [Comment("创建人")] + public string? CreateBy { get; set; } + + /// + /// 修改时间 + /// + [Display(Name = "UpdateTime")] + [Comment("修改时间")] + public string? UpdateTime { get; set; } + + /// + /// 修改人 + /// + [Display(Name = "UpdateBy")] + [Comment("修改人")] + public string? UpdateBy { get; set; } + + /// + /// 学校人脸的相似度 (80-99 之间的整数) + /// + [Display(Name = "SimilarNumber")] + [Comment("学校人脸的相似度")] + public int? SimilarNumber { get; set; } + + + /// + /// 摄像头序列号、版本信息 + /// + [Display(Name = "摄像头序列号、版本信息")] + [Comment("摄像头序列号、版本信息")] + public List CameraInfoList { get; set; } = new List(); + } +} diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs new file mode 100644 index 0000000..3cf28ba --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs @@ -0,0 +1,604 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using YD_XinWei.Api.Entitys; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_SportsTestData")] + public class XW_SportsTestData : EntityBase + { + /// + /// 编号 + /// + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("Id")] + public int? Id { get; set; } + + /// + /// 考试id + /// + [Display(Name = "ExaminationId")] + [Comment("考试id")] + public int? ExaminationId { get; set; } + + /// + /// 考试名称 + /// + [Display(Name = "ExaminationName")] + [Comment("考试名称")] + public string ExaminationName { get; set; } + + /// + /// 项目类型(1体检 2体质) + /// + [Display(Name = "ProjectType")] + [Comment("项目类型(1体检 2体质)")] + public int? ProjectType { get; set; } + + /// + /// 项目ID + /// + [Display(Name = "ProjectId")] + [Comment("项目ID")] + public int? ProjectId { get; set; } + + /// + /// 项目名称 + /// + [Display(Name = "ProjectName")] + [Comment("项目名称")] + public string ProjectName { get; set; } + + /// + /// 模式类型(1随堂模式2名单模式3刷卡或手动录入) + /// + [Display(Name = "RosterType")] + [Comment("模式类型(1随堂模式2名单模式3刷卡或手动录入)")] + public int? RosterType { get; set; } + + /// + /// 学校ID + /// + [Display(Name = "OrgId")] + [Comment("学校ID")] + public int? OrgId { get; set; } + + /// + /// 年级ID + /// + [Display(Name = "GradeId")] + [Comment("年级ID")] + public int? GradeId { get; set; } + + /// + /// 年级名称 + /// + [Display(Name = "GradeName")] + [Comment("年级名称")] + public string GradeName { get; set; } + + /// + /// 班级或者名单id（根据roster_type来判断） + /// + [Display(Name = "ClassId")] + [Comment("班级或者名单id（根据roster_type来判断）")] + public int? ClassId { get; set; } + + /// + /// 班级名称 + /// + [Display(Name = "ClassName")] + [Comment("班级名称")] + public string ClassName { get; set; } + + /// + /// 组别 + /// + [Display(Name = "GroupId")] + [Comment("组别")] + public string GroupId { get; set; } + + /// + /// 老师ID + /// + [Display(Name = "TeacherId")] + [Comment("老师ID")] + public int? TeacherId { get; set; } + + /// + /// 老师名称 + /// + [Display(Name = "TeacherName")] + [Comment("老师名称")] + public string TeacherName { get; set; } + + /// + /// 训练模式 + /// + [Display(Name = "ModelType")] + [Comment("训练模式")] + public int? ModelType { get; set; } + + /// + /// 评分标准类型(1国家标准2地方标准3自定义标准) + /// + [Display(Name = "MarkType")] + [Comment("评分标准类型(1国家标准2地方标准3自定义标准)")] + public int? MarkType { get; set; } + + /// + /// 项目类型(1跳绳2跑步) + /// + [Display(Name = "ProjectKind")] + [Comment("项目类型(1跳绳2跑步)")] + public int? ProjectKind { get; set; } + + /// + /// 训练标准ID + /// + [Display(Name = "ProjectRuleId")] + [Comment("训练标准ID")] + public int? ProjectRuleId { get; set; } + + /// + /// 项目类型名称 + /// + [Display(Name = "ProjectKindName")] + [Comment("项目类型名称")] + public string ProjectKindName { get; set; } + + /// + /// 评分标准类型名称 + /// + [Display(Name = "MarkTypeName")] + [Comment("评分标准类型名称")] + public string MarkTypeName { get; set; } + + /// + /// 项目模式名称 + /// + [Display(Name = "ModelTypeName")] + [Comment("项目模式名称")] + public string ModelTypeName { get; set; } + + /// + /// 训练人数 + /// + [Display(Name = "TrainCount")] + [Comment("训练人数")] + public int? TrainCount { get; set; } + + /// + /// 开始时间 + /// + [Display(Name = "StartTime")] + [Comment("开始时间")] + public string StartTime { get; set; } + + /// + /// 结束时间 + /// + [Display(Name = "EndTime")] + [Comment("结束时间")] + public string EndTime { get; set; } + + /// + /// 男生总数 + /// + [Display(Name = "MaleTotal")] + [Comment("男生总数")] + public int? MaleTotal { get; set; } + + /// + /// 女生总数 + /// + [Display(Name = "FemaleTotal")] + [Comment("女生总数")] + public int? FemaleTotal { get; set; } + + /// + /// 男生总成绩 + /// + [Display(Name = "MaleCount")] + [Comment("男生总成绩")] + public decimal? MaleCount { get; set; } + + /// + /// 男生最大值 + /// + [Display(Name = "MaleMaxCount")] + [Comment("男生最大值")] + public int? MaleMaxCount { get; set; } + + /// + /// 男生最小值 + /// + [Display(Name = "MaleMinCount")] + [Comment("男生最小值")] + public int? MaleMinCount { get; set; } + + /// + /// 女生总成绩 + /// + [Display(Name = "FemaleCount")] + [Comment("女生总成绩")] + public decimal? FemaleCount { get; set; } + + /// + /// 女生最大值 + /// + [Display(Name = "FemaleMaxCount")] + [Comment("女生最大值")] + public int? FemaleMaxCount { get; set; } + + /// + /// 女生最小值 + /// + [Display(Name = "FemaleMinCount")] + [Comment("女生最小值")] + public int? FemaleMinCount { get; set; } + + /// + /// 男生总分数 + /// + [Display(Name = "MaleScore")] + [Comment("男生总分数")] + public decimal? MaleScore { get; set; } + + /// + /// 男生最大分数 + /// + [Display(Name = "MaleMaxScore")] + [Comment("男生最大分数")] + public decimal? MaleMaxScore { get; set; } + + /// + /// 男生最小分数 + /// + [Display(Name = "MaleMinScore")] + [Comment("男生最小分数")] + public decimal? MaleMinScore { get; set; } + + /// + /// 女生总分数 + /// + [Display(Name = "FemaleScore")] + [Comment("女生总分数")] + public decimal? FemaleScore { get; set; } + + /// + /// 女生最大分数 + /// + [Display(Name = "FemaleMaxScore")] + [Comment("女生最大分数")] + public decimal? FemaleMaxScore { get; set; } + + /// + /// 女生最小分数 + /// + [Display(Name = "FemaleMinScore")] + [Comment("女生最小分数")] + public decimal? FemaleMinScore { get; set; } + + /// + /// 男生优秀人数 + /// + [Display(Name = "MaleFine")] + [Comment("男生优秀人数")] + public int? MaleFine { get; set; } + + /// + /// 男生良好人数 + /// + [Display(Name = "MaleGood")] + [Comment("男生良好人数")] + public int? MaleGood { get; set; } + + /// + /// 男生及格人数 + /// + [Display(Name = "MalePass")] + [Comment("男生及格人数")] + public int? MalePass { get; set; } + + /// + /// 男生不及格人数 + /// + [Display(Name = "MaleFail")] + [Comment("男生不及格人数")] + public int? MaleFail { get; set; } + + /// + /// 女生优秀人数 + /// + [Display(Name = "FemaleFine")] + [Comment("女生优秀人数")] + public int? FemaleFine { get; set; } + + /// + /// 女生良好人数 + /// + [Display(Name = "FemaleGood")] + [Comment("女生良好人数")] + public int? FemaleGood { get; set; } + + /// + /// 女生及格人数 + /// + [Display(Name = "FemalePass")] + [Comment("女生及格人数")] + public int? FemalePass { get; set; } + + /// + /// 女生不及格人数 + /// + [Display(Name = "FemaleFail")] + [Comment("女生不及格人数")] + public int? FemaleFail { get; set; } + + /// + /// 及格率 + /// + [Display(Name = "PassingRate")] + [Comment("及格率")] + public decimal? PassingRate { get; set; } + + /// + /// 男生平均个数 + /// + [Display(Name = "MaleAvgCount")] + [Comment("男生平均个数")] + public decimal? MaleAvgCount { get; set; } + + /// + /// 女生平均个数 + /// + [Display(Name = "FemaleAvgCount")] + [Comment("女生平均个数")] + public decimal? FemaleAvgCount { get; set; } + + /// + /// 男生平均分数 + /// + [Display(Name = "MaleAvgScore")] + [Comment("男生平均分数")] + public decimal? MaleAvgScore { get; set; } + + /// + /// 女生平均分数 + /// + [Display(Name = "FemaleAvgScore")] + [Comment("女生平均分数")] + public decimal? FemaleAvgScore { get; set; } + + /// + /// 男生中位数 + /// + [Display(Name = "MaleMedianCount")] + [Comment("男生中位数")] + public decimal? MaleMedianCount { get; set; } + + /// + /// 女生中位数 + /// + [Display(Name = "FemaleMedianCount")] + [Comment("女生中位数")] + public decimal? FemaleMedianCount { get; set; } + + /// + /// 男生平均值 + /// + [Display(Name = "MaleAvgImproveCount")] + [Comment("男生平均值")] + public int? MaleAvgImproveCount { get; set; } + + /// + /// 男生最大值 + /// + [Display(Name = "MaleMaxImproveCount")] + [Comment("男生最大值")] + public int? MaleMaxImproveCount { get; set; } + + /// + /// 男生最小值 + /// + [Display(Name = "MaleMinImproveCount")] + [Comment("男生最小值")] + public int? MaleMinImproveCount { get; set; } + + /// + /// 女生平均值 + /// + [Display(Name = "FemaleAvgImproveCount")] + [Comment("女生平均值")] + public int? FemaleAvgImproveCount { get; set; } + + /// + /// 女生最大值 + /// + [Display(Name = "FemaleMaxImproveCount")] + [Comment("女生最大值")] + public int? FemaleMaxImproveCount { get; set; } + + /// + /// 女生最小值 + /// + [Display(Name = "FemaleMinImproveCount")] + [Comment("女生最小值")] + public int? FemaleMinImproveCount { get; set; } + + /// + /// 男生平均分数 + /// + [Display(Name = "MaleAvgImproveScore")] + [Comment("男生平均分数")] + public decimal? MaleAvgImproveScore { get; set; } + + /// + /// 男生最大分数 + /// + [Display(Name = "MaleMaxImproveScore")] + [Comment("男生最大分数")] + public decimal? MaleMaxImproveScore { get; set; } + + /// + /// 男生最小分数 + /// + [Display(Name = "MaleMinImproveScore")] + [Comment("男生最小分数")] + public decimal? MaleMinImproveScore { get; set; } + + /// + /// 女生平均分数 + /// + [Display(Name = "FemaleAvgImproveScore")] + [Comment("女生平均分数")] + public decimal? FemaleAvgImproveScore { get; set; } + + /// + /// 女生最大分数 + /// + [Display(Name = "FemaleMaxImproveScore")] + [Comment("女生最大分数")] + public decimal? FemaleMaxImproveScore { get; set; } + + /// + /// 女生最小分数 + /// + [Display(Name = "FemaleMinImproveScore")] + [Comment("女生最小分数")] + public decimal? FemaleMinImproveScore { get; set; } + + /// + /// 失误最少的同学次数 + /// + [Display(Name = "MinErrorCount")] + [Comment("失误最少的同学次数")] + public int? MinErrorCount { get; set; } = 99999; // 默认值 + + /// + /// 进入状态最快的同学耗时（心率借用这个字段。班级运动时间） + /// + [Display(Name = "MinIntoStateTime")] + [Comment("进入状态最快的同学耗时（心率借用这个字段。班级运动时间）")] + public int? MinIntoStateTime { get; set; } = 999999; + + /// + /// 第一名平均耗时 + /// + [Display(Name = "MinAvgTime")] + [Comment("第一名平均耗时")] + public int? MinAvgTime { get; set; } = 999999; + + /// + /// 失误总次数 + /// + [Display(Name = "TotalErrorCount")] + [Comment("失误总次数")] + public int? TotalErrorCount { get; set; } = 0; + + /// + /// 失误损失次数 + /// + [Display(Name = "LossesCount1")] + [Comment("失误损失次数")] + public int? LossesCount1 { get; set; } = 0; + + /// + /// 甩绳速度偏慢损失次数 + /// + [Display(Name = "LossesCount2")] + [Comment("甩绳速度偏慢损失次数")] + public int? LossesCount2 { get; set; } = 0; + + /// + /// 进入状态过慢损失次数 + /// + [Display(Name = "LossesCount3")] + [Comment("进入状态过慢损失次数")] + public int? LossesCount3 { get; set; } = 0; + + /// + /// 提交标识 + /// + [Display(Name = "CheckCode")] + [Comment("提交标识")] + public string CheckCode { get; set; } + + /// + /// 班级明细 + /// + //[Display(Name = "DetailInfo")] + //[Comment("班级明细")] + //public object DetailInfo { get; set; } + + /// + /// 创建时间 + /// + [Display(Name = "CreateTime")] + [Comment("创建时间")] + public string CreateTime { get; set; } + + /// + /// 创建人 + /// + [Display(Name = "CreateBy")] + [Comment("创建人")] + public string CreateBy { get; set; } + + /// + /// 修改时间 + /// + [Display(Name = "UpdateTime")] + [Comment("修改时间")] + public string UpdateTime { get; set; } + + /// + /// 修改人 + /// + [Display(Name = "UpdateBy")] + [Comment("修改人")] + public string UpdateBy { get; set; } + + /// + /// 是否双人模式 + /// + [Display(Name = "DoubleFlag")] + [Comment("是否双人模式")] + public bool? DoubleFlag { get; set; } + + /// + /// 数据来源(1:pad, 2:微信小程序) + /// + [Display(Name = "Source")] + [Comment("数据来源(1:pad, 2:微信小程序)")] + public int? Source { get; set; } + + /// + /// 学生姓名 + /// + [Display(Name = "StudentName")] + [Comment("学生姓名")] + public string StudentName { get; set; } + + /// + /// 学生列表 + /// + [Display(Name = "StudentList")] + [Comment("学生列表")] + public List StudentList { get; set; } = new List(); + + + /// + /// 训练设置 + /// + //[Display(Name = "TrainSetting")] + //[Comment("训练设置")] + //public XW_TrainSetting TrainSetting { get; set; } = new XW_TrainSetting(); + } +} diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs new file mode 100644 index 0000000..1e9093b --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs @@ -0,0 +1,108 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using YD_XinWei.Api.Entitys; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_TrainSetting")] + public class XW_TrainSetting : EntityBase + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("Id")] + public int? Id { get; set; } + + /// + /// 训练ID + /// + [Display(Name = "TrainId")] + [Comment("训练ID")] + public int? TrainId { get; set; } + + /// + /// 圈数 + /// + [Display(Name = "CircleCount")] + [Comment("圈数")] + public int? CircleCount { get; set; } + + /// + /// 每圈时间间隔 + /// + [Display(Name = "CircleInterval")] + [Comment("每圈时间间隔")] + public int? CircleInterval { get; set; } + + /// + /// 首圈是否整圈(1-不完整，2-完整) + /// + [Display(Name = "FirstCircleWhole")] + [Comment("首圈是否整圈(1-不完整，2-完整)")] + public decimal? FirstCircleWhole { get; set; } + + /// + /// 首圈时间间隔 + /// + [Display(Name = "FirstCircleInterval")] + [Comment("首圈时间间隔")] + public int? FirstCircleInterval { get; set; } + + /// + /// 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） + /// + [Display(Name = "DecimalPlace")] + [Comment("保留秒以下的小数位数")] + public decimal? DecimalPlace { get; set; } + + /// + /// 女生圈数 + /// + [Display(Name = "CircleCountGirl")] + [Comment("女生圈数")] + public int? CircleCountGirl { get; set; } + + /// + /// 女生每圈时间间隔 + /// + [Display(Name = "CircleIntervalGirl")] + [Comment("女生每圈时间间隔")] + public int? CircleIntervalGirl { get; set; } + + /// + /// 女生首圈是否整圈(1-不完整，2-完整) + /// + [Display(Name = "FirstCircleWholeGirl")] + [Comment("女生首圈是否整圈(1-不完整，2-完整)")] + public decimal? FirstCircleWholeGirl { get; set; } + + /// + /// 女生首圈时间间隔 + /// + [Display(Name = "FirstCircleIntervalGirl")] + [Comment("女生首圈时间间隔")] + public int? FirstCircleIntervalGirl { get; set; } + + /// + /// 创建时间 + /// + [Display(Name = "CreateTime")] + [Comment("创建时间")] + public string CreateTime { get; set; } + + /// + /// 创建人 + /// + [Display(Name = "CreateBy")] + [Comment("创建人")] + public string CreateBy { get; set; } + + public int XW_SportsTestDataId { get; set; } + + + //public XW_SportsTestData XW_SportsTestData { get; set; } + } +} diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs new file mode 100644 index 0000000..71d0f78 --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs @@ -0,0 +1,347 @@ +using Microsoft.EntityFrameworkCore; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using YD_XinWei.Api.Entitys; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_TrainStudents")] + public class XW_TrainStudents : EntityBase + { + /// + /// 编号 + /// + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("Id")] + public int? Id { get; set; } + + + /// + /// 训练ID + /// + [Display(Name = "TrainId")] + [Comment("训练ID")] + public int? TrainId { get; set; } + + /// + /// 项目ID + /// + [Display(Name = "ProjectId")] + [Comment("项目ID")] + public int? ProjectId { get; set; } + + /// + /// 项目类型(1跳绳2跑步) + /// + [Display(Name = "ProjectKind")] + [Comment("项目类型(1跳绳2跑步)")] + public double? ProjectKind { get; set; } + + /// + /// 学校ID + /// + [Display(Name = "OrgId")] + [Comment("学校ID")] + public int? OrgId { get; set; } + + /// + /// 年级ID + /// + [Display(Name = "GradeId")] + [Comment("年级ID")] + public int? GradeId { get; set; } + + /// + /// 年级名称 + /// + [Display(Name = "GradeName")] + [Comment("年级名称")] + public string GradeName { get; set; } + + /// + /// 班级ID + /// + [Display(Name = "ClassId")] + [Comment("班级ID")] + public int? ClassId { get; set; } + + /// + /// 班级名称 + /// + [Display(Name = "ClassName")] + [Comment("班级名称")] + public string ClassName { get; set; } + + /// + /// 组别 + /// + [Display(Name = "GroupName")] + [Comment("组别")] + public string GroupName { get; set; } + + /// + /// 组号 + /// + [Display(Name = "GroupOrder")] + [Comment("组号")] + public int? GroupOrder { get; set; } + + /// + /// 老师ID + /// + [Display(Name = "TeacherId")] + [Comment("老师ID")] + public int? TeacherId { get; set; } + + /// + /// 设备ID + /// + [Display(Name = "DeviceId")] + [Comment("设备ID")] + public string DeviceId { get; set; } + + /// + /// 学生ID + /// + [Display(Name = "StudentId")] + [Comment("学生ID")] + public int? StudentId { get; set; } + + /// + /// 学生名称 + /// + [Display(Name = "StudentName")] + [Comment("学生名称")] + public string StudentName { get; set; } + + /// + /// 性别(1男2女) + /// + [Display(Name = "Sex")] + [Comment("性别(1男2女)")] + public double? Sex { get; set; } + + /// + /// 学号 + /// + [Display(Name = "StudentNo")] + [Comment("学号")] + public string StudentNo { get; set; } + + /// + /// 标准成绩 + /// + [Display(Name = "Achievement")] + [Comment("标准成绩")] + public int? Achievement { get; set; } + + /// + /// 原始标准成绩（被格式化小数点之前的） + /// + [Display(Name = "OriginalAchievement")] + [Comment("原始标准成绩（被格式化小数点之前的）")] + public int? OriginalAchievement { get; set; } + + /// + /// 标准成绩2 + /// + [Display(Name = "Achievement2")] + [Comment("标准成绩2")] + public int? Achievement2 { get; set; } + + /// + /// 原始标准成绩2（被格式化小数点之前的） + /// + [Display(Name = "OriginalAchievement2")] + [Comment("原始标准成绩2（被格式化小数点之前的）")] + public int? OriginalAchievement2 { get; set; } + + /// + /// 得分 + /// + [Display(Name = "Score")] + [Comment("得分")] + public double? Score { get; set; } + + /// + /// 加分项得分 + /// + [Display(Name = "PlusesScore")] + [Comment("加分项得分")] + public double? PlusesScore { get; set; } + + /// + /// 评分等级 + /// + [Display(Name = "Rating")] + [Comment("评分等级")] + public int? Rating { get; set; } + + /// + /// 男生或女生排名 + /// + [Display(Name = "RankingInGender")] + [Comment("男生或女生排名")] + public int? RankingInGender { get; set; } + + /// + /// 全体排名 + /// + [Display(Name = "Ranking")] + [Comment("全体排名")] + public int? Ranking { get; set; } + + /// + /// 失误总次数 + /// + [Display(Name = "ErrorCount")] + [Comment("失误总次数")] + public int? ErrorCount { get; set; } = 0; + + /// + /// 失误总耗时 + /// + [Display(Name = "ErrorTime")] + [Comment("失误总耗时")] + public int? ErrorTime { get; set; } = 0; + + /// + /// 平均耗时 + /// + [Display(Name = "AvgTime")] + [Comment("平均耗时")] + public int? AvgTime { get; set; } = 0; + + /// + /// 有效平均值(中位数) + /// + [Display(Name = "MedianTime")] + [Comment("有效平均值(中位数)")] + public int? MedianTime { get; set; } = 0; + + /// + /// 失误损失次数 + /// + [Display(Name = "LossesCount1")] + [Comment("失误损失次数")] + public int? LossesCount1 { get; set; } = 0; + + /// + /// 甩绳速度偏慢损失次数 + /// + [Display(Name = "LossesCount2")] + [Comment("甩绳速度偏慢损失次数")] + public int? LossesCount2 { get; set; } = 0; + + /// + /// 进入状态过慢损失次数 + /// + [Display(Name = "LossesCount3")] + [Comment("进入状态过慢损失次数")] + public int? LossesCount3 { get; set; } = 0; + + /// + /// 高一档分数段 + /// + [Display(Name = "HigherScore")] + [Comment("高一档分数段")] + public int? HigherScore { get; set; } = 0; + + /// + /// 进入状态耗时 + /// + [Display(Name = "进入状态耗时")] + [Comment("进入状态耗时")] + public int? IntoStateTime { get; set; } = 0; + + /// + /// 次数提升空间 + /// + [Display(Name = "次数提升空间")] + [Comment("次数提升空间")] + public int? ImproveCount { get; set; } = 0; + + /// + /// 分数提升空间 + /// + [Display(Name = "分数提升空间")] + [Comment("分数提升空间")] + public double? ImproveScore { get; set; } = 0.0; + + /// + /// 家长消息发送标识 + /// + [Display(Name = "家长消息发送标识")] + [Comment("家长消息发送标识")] + public int? FamilySendFlag { get; set; } + + /// + /// 是否已经完成 + /// + [Display(Name = "是否已经完成")] + [Comment("是否已经完成")] + public bool? Completed { get; set; } + + /// + /// 实际完成的数量（圈数 + /// + [Display(Name = "实际完成的数量（圈数")] + [Comment("实际完成的数量（圈数）")] + public int? QuantityCompleted { get; set; } + + /// + /// 报表显示 + /// + [Display(Name = "报表显示")] + [Comment("报表显示")] + public int? ModelType { get; set; } + + /// + /// 开始时间 + /// + [Display(Name = "开始时间")] + [Comment("开始时间")] + public string StartTime { get; set; } + + /// + /// 教师 + /// + [Display(Name = "教师")] + [Comment("教师")] + public string Teacher { get; set; } + + + /// + /// 创建时间 + /// + [Display(Name = "创建时间")] + [Comment("创建时间")] + public string CreateTime { get; set; } + + + /// + /// 创建人 + /// + [Display(Name = "创建人")] + [Comment("创建人")] + public string CreateBy { get; set; } + + /// + /// 修改时间 + /// + [Display(Name = "修改时间")] + [Comment("修改时间")] + public string UpdateTime { get; set; } + + /// + /// 修改人 + /// + [Display(Name = "修改人")] + [Comment("修改人")] + public string UpdateBy { get; set; } + + public XW_SportsTestData XW_SportsTestData { get; set; } + } +} diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll index 6b9fd98..0e919ec 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe index 599f61c..439ad31 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb index a25f7c3..0b9ac2e 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml index 537a197..000fba0 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml @@ -880,5 +880,865 @@ 修改时间 + + + 编号 + + + + + 摄像头序列号 + + + + + 摄像头版本信息 + + + + + 设备Id + + + + + 导航属性 + + + + + 编号 + + + + + 类型 (1 平板, 2 跳绳, ...) + + + + + 设备型号 + + + + + 设备序列号 + + + + + 设备 MAC 地址 + + + + + 设备 IMEI 地址 + + + + + AI 摄像机 IP 地址 (多个 IP 用 , 隔开) + + + + + 抢跑 IP (短跑) + + + + + 是否是 EAI100 摄像头 + + + + + 组织 ID + + + + + 组织名称 + + + + + 用户 ID + + + + + 用户名称 + + + + + 软件版本 + + + + + 硬件版本 + + + + + 应用时间 + + + + + 最后登录时间 + + + + + 备注 + + + + + 授权状态 (0 无效, 1 有效) + + + + + 状态 (0 无效, 1 有效) + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + + + + 学校人脸的相似度 (80-99 之间的整数) + + + + + 摄像头序列号、版本信息 + + + + + 编号 + + + + + 考试id + + + + + 考试名称 + + + + + 项目类型(1体检 2体质) + + + + + 项目ID + + + + + 项目名称 + + + + + 模式类型(1随堂模式2名单模式3刷卡或手动录入) + + + + + 学校ID + + + + + 年级ID + + + + + 年级名称 + + + + + 班级或者名单id（根据roster_type来判断） + + + + + 班级名称 + + + + + 组别 + + + + + 老师ID + + + + + 老师名称 + + + + + 训练模式 + + + + + 评分标准类型(1国家标准2地方标准3自定义标准) + + + + + 项目类型(1跳绳2跑步) + + + + + 训练标准ID + + + + + 项目类型名称 + + + + + 评分标准类型名称 + + + + + 项目模式名称 + + + + + 训练人数 + + + + + 开始时间 + + + + + 结束时间 + + + + + 男生总数 + + + + + 女生总数 + + + + + 男生总成绩 + + + + + 男生最大值 + + + + + 男生最小值 + + + + + 女生总成绩 + + + + + 女生最大值 + + + + + 女生最小值 + + + + + 男生总分数 + + + + + 男生最大分数 + + + + + 男生最小分数 + + + + + 女生总分数 + + + + + 女生最大分数 + + + + + 女生最小分数 + + + + + 男生优秀人数 + + + + + 男生良好人数 + + + + + 男生及格人数 + + + + + 男生不及格人数 + + + + + 女生优秀人数 + + + + + 女生良好人数 + + + + + 女生及格人数 + + + + + 女生不及格人数 + + + + + 及格率 + + + + + 男生平均个数 + + + + + 女生平均个数 + + + + + 男生平均分数 + + + + + 女生平均分数 + + + + + 男生中位数 + + + + + 女生中位数 + + + + + 男生平均值 + + + + + 男生最大值 + + + + + 男生最小值 + + + + + 女生平均值 + + + + + 女生最大值 + + + + + 女生最小值 + + + + + 男生平均分数 + + + + + 男生最大分数 + + + + + 男生最小分数 + + + + + 女生平均分数 + + + + + 女生最大分数 + + + + + 女生最小分数 + + + + + 失误最少的同学次数 + + + + + 进入状态最快的同学耗时（心率借用这个字段。班级运动时间） + + + + + 第一名平均耗时 + + + + + 失误总次数 + + + + + 失误损失次数 + + + + + 甩绳速度偏慢损失次数 + + + + + 进入状态过慢损失次数 + + + + + 提交标识 + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + + + + 是否双人模式 + + + + + 数据来源(1:pad, 2:微信小程序) + + + + + 学生姓名 + + + + + 学生列表 + + + + + 训练ID + + + + + 圈数 + + + + + 每圈时间间隔 + + + + + 首圈是否整圈(1-不完整，2-完整) + + + + + 首圈时间间隔 + + + + + 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） + + + + + 女生圈数 + + + + + 女生每圈时间间隔 + + + + + 女生首圈是否整圈(1-不完整，2-完整) + + + + + 女生首圈时间间隔 + + + + + 创建时间 + + + + + 创建人 + + + + + 编号 + + + + + 训练ID + + + + + 项目ID + + + + + 项目类型(1跳绳2跑步) + + + + + 学校ID + + + + + 年级ID + + + + + 年级名称 + + + + + 班级ID + + + + + 班级名称 + + + + + 组别 + + + + + 组号 + + + + + 老师ID + + + + + 设备ID + + + + + 学生ID + + + + + 学生名称 + + + + + 性别(1男2女) + + + + + 学号 + + + + + 标准成绩 + + + + + 原始标准成绩（被格式化小数点之前的） + + + + + 标准成绩2 + + + + + 原始标准成绩2（被格式化小数点之前的） + + + + + 得分 + + + + + 加分项得分 + + + + + 评分等级 + + + + + 男生或女生排名 + + + + + 全体排名 + + + + + 失误总次数 + + + + + 失误总耗时 + + + + + 平均耗时 + + + + + 有效平均值(中位数) + + + + + 失误损失次数 + + + + + 甩绳速度偏慢损失次数 + + + + + 进入状态过慢损失次数 + + + + + 高一档分数段 + + + + + 进入状态耗时 + + + + + 次数提升空间 + + + + + 分数提升空间 + + + + + 家长消息发送标识 + + + + + 是否已经完成 + + + + + 实际完成的数量（圈数 + + + + + 报表显示 + + + + + 开始时间 + + + + + 教师 + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll index 54019ec..40a8015 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb index e30de3f..cd21646 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs index f67ca8a..1306bb9 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1551bbc8f250d58485459e2eaff2dfbaef6692b0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a17e26de84b0fe37820a7775d2ea64536f4ffab3")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache index cbadab8..9ecbd18 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -66ec4cb52990084a4ce8fa67c51fdf0a495eaba2c3ef9d716482a4d185ec71e6 +65d74aa79d1be1807080cf130a3d46cfcc584723efbfba9ae485ca96d725f21f diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache index 5e3182b..a671618 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache index 6312eb6..839d6e5 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2fa952f1455473f4d6a3c69e16c78cb0b8100ea2d950e64cc9c3a714c86c1807 +65ca0c03df4b5aeccfc799b9a69893d50e3091ab6d116ecdd06ab1499e662190 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll index 6b9fd98..0e919ec 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb index a25f7c3..0b9ac2e 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json index 26f6496..be5ab07 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1551bbc8f250d58485459e2eaff2dfbaef6692b0&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=a17e26de84b0fe37820a7775d2ea64536f4ffab3&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml index 537a197..000fba0 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml @@ -880,5 +880,865 @@ 修改时间 + + + 编号 + + + + + 摄像头序列号 + + + + + 摄像头版本信息 + + + + + 设备Id + + + + + 导航属性 + + + + + 编号 + + + + + 类型 (1 平板, 2 跳绳, ...) + + + + + 设备型号 + + + + + 设备序列号 + + + + + 设备 MAC 地址 + + + + + 设备 IMEI 地址 + + + + + AI 摄像机 IP 地址 (多个 IP 用 , 隔开) + + + + + 抢跑 IP (短跑) + + + + + 是否是 EAI100 摄像头 + + + + + 组织 ID + + + + + 组织名称 + + + + + 用户 ID + + + + + 用户名称 + + + + + 软件版本 + + + + + 硬件版本 + + + + + 应用时间 + + + + + 最后登录时间 + + + + + 备注 + + + + + 授权状态 (0 无效, 1 有效) + + + + + 状态 (0 无效, 1 有效) + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + + + + 学校人脸的相似度 (80-99 之间的整数) + + + + + 摄像头序列号、版本信息 + + + + + 编号 + + + + + 考试id + + + + + 考试名称 + + + + + 项目类型(1体检 2体质) + + + + + 项目ID + + + + + 项目名称 + + + + + 模式类型(1随堂模式2名单模式3刷卡或手动录入) + + + + + 学校ID + + + + + 年级ID + + + + + 年级名称 + + + + + 班级或者名单id（根据roster_type来判断） + + + + + 班级名称 + + + + + 组别 + + + + + 老师ID + + + + + 老师名称 + + + + + 训练模式 + + + + + 评分标准类型(1国家标准2地方标准3自定义标准) + + + + + 项目类型(1跳绳2跑步) + + + + + 训练标准ID + + + + + 项目类型名称 + + + + + 评分标准类型名称 + + + + + 项目模式名称 + + + + + 训练人数 + + + + + 开始时间 + + + + + 结束时间 + + + + + 男生总数 + + + + + 女生总数 + + + + + 男生总成绩 + + + + + 男生最大值 + + + + + 男生最小值 + + + + + 女生总成绩 + + + + + 女生最大值 + + + + + 女生最小值 + + + + + 男生总分数 + + + + + 男生最大分数 + + + + + 男生最小分数 + + + + + 女生总分数 + + + + + 女生最大分数 + + + + + 女生最小分数 + + + + + 男生优秀人数 + + + + + 男生良好人数 + + + + + 男生及格人数 + + + + + 男生不及格人数 + + + + + 女生优秀人数 + + + + + 女生良好人数 + + + + + 女生及格人数 + + + + + 女生不及格人数 + + + + + 及格率 + + + + + 男生平均个数 + + + + + 女生平均个数 + + + + + 男生平均分数 + + + + + 女生平均分数 + + + + + 男生中位数 + + + + + 女生中位数 + + + + + 男生平均值 + + + + + 男生最大值 + + + + + 男生最小值 + + + + + 女生平均值 + + + + + 女生最大值 + + + + + 女生最小值 + + + + + 男生平均分数 + + + + + 男生最大分数 + + + + + 男生最小分数 + + + + + 女生平均分数 + + + + + 女生最大分数 + + + + + 女生最小分数 + + + + + 失误最少的同学次数 + + + + + 进入状态最快的同学耗时（心率借用这个字段。班级运动时间） + + + + + 第一名平均耗时 + + + + + 失误总次数 + + + + + 失误损失次数 + + + + + 甩绳速度偏慢损失次数 + + + + + 进入状态过慢损失次数 + + + + + 提交标识 + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + + + + 是否双人模式 + + + + + 数据来源(1:pad, 2:微信小程序) + + + + + 学生姓名 + + + + + 学生列表 + + + + + 训练ID + + + + + 圈数 + + + + + 每圈时间间隔 + + + + + 首圈是否整圈(1-不完整，2-完整) + + + + + 首圈时间间隔 + + + + + 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） + + + + + 女生圈数 + + + + + 女生每圈时间间隔 + + + + + 女生首圈是否整圈(1-不完整，2-完整) + + + + + 女生首圈时间间隔 + + + + + 创建时间 + + + + + 创建人 + + + + + 编号 + + + + + 训练ID + + + + + 项目ID + + + + + 项目类型(1跳绳2跑步) + + + + + 学校ID + + + + + 年级ID + + + + + 年级名称 + + + + + 班级ID + + + + + 班级名称 + + + + + 组别 + + + + + 组号 + + + + + 老师ID + + + + + 设备ID + + + + + 学生ID + + + + + 学生名称 + + + + + 性别(1男2女) + + + + + 学号 + + + + + 标准成绩 + + + + + 原始标准成绩（被格式化小数点之前的） + + + + + 标准成绩2 + + + + + 原始标准成绩2（被格式化小数点之前的） + + + + + 得分 + + + + + 加分项得分 + + + + + 评分等级 + + + + + 男生或女生排名 + + + + + 全体排名 + + + + + 失误总次数 + + + + + 失误总耗时 + + + + + 平均耗时 + + + + + 有效平均值(中位数) + + + + + 失误损失次数 + + + + + 甩绳速度偏慢损失次数 + + + + + 进入状态过慢损失次数 + + + + + 高一档分数段 + + + + + 进入状态耗时 + + + + + 次数提升空间 + + + + + 分数提升空间 + + + + + 家长消息发送标识 + + + + + 是否已经完成 + + + + + 实际完成的数量（圈数 + + + + + 报表显示 + + + + + 开始时间 + + + + + 教师 + + + + + 创建时间 + + + + + 创建人 + + + + + 修改时间 + + + + + 修改人 + + diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe index 599f61c..439ad31 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe and b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll index c42bd1f..6c4fa73 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll index c42bd1f..6c4fa73 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll differ