diff --git a/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs b/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs index a182355..9a1b207 100644 --- a/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs +++ b/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs @@ -143,62 +143,62 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 男生总成绩 /// - public decimal? MaleCount { get; set; } + public double? MaleCount { get; set; } /// /// 男生最大值 /// - public int? MaleMaxCount { get; set; } + public double? MaleMaxCount { get; set; } /// /// 男生最小值 /// - public int? MaleMinCount { get; set; } + public double? MaleMinCount { get; set; } /// /// 女生总成绩 /// - public decimal? FemaleCount { get; set; } + public double? FemaleCount { get; set; } /// /// 女生最大值 /// - public int? FemaleMaxCount { get; set; } + public double? FemaleMaxCount { get; set; } /// /// 女生最小值 /// - public int? FemaleMinCount { get; set; } + public double? FemaleMinCount { get; set; } /// /// 男生总分数 /// - public decimal? MaleScore { get; set; } + public double? MaleScore { get; set; } /// /// 男生最大分数 /// - public decimal? MaleMaxScore { get; set; } + public double? MaleMaxScore { get; set; } /// /// 男生最小分数 /// - public decimal? MaleMinScore { get; set; } + public double? MaleMinScore { get; set; } /// /// 女生总分数 /// - public decimal? FemaleScore { get; set; } + public double? FemaleScore { get; set; } /// /// 女生最大分数 /// - public decimal? FemaleMaxScore { get; set; } + public double? FemaleMaxScore { get; set; } /// /// 女生最小分数 /// - public decimal? FemaleMinScore { get; set; } + public double? FemaleMinScore { get; set; } /// /// 男生优秀人数 @@ -243,37 +243,37 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 及格率 /// - public decimal? PassingRate { get; set; } + public double? PassingRate { get; set; } /// /// 男生平均个数 /// - public decimal? MaleAvgCount { get; set; } + public double? MaleAvgCount { get; set; } /// /// 女生平均个数 /// - public decimal? FemaleAvgCount { get; set; } + public double? FemaleAvgCount { get; set; } /// /// 男生平均分数 /// - public decimal? MaleAvgScore { get; set; } + public double? MaleAvgScore { get; set; } /// /// 女生平均分数 /// - public decimal? FemaleAvgScore { get; set; } + public double? FemaleAvgScore { get; set; } /// /// 男生中位数 /// - public decimal? MaleMedianCount { get; set; } + public double? MaleMedianCount { get; set; } /// /// 女生中位数 /// - public decimal? FemaleMedianCount { get; set; } + public double? FemaleMedianCount { get; set; } /// /// 男生平均值 @@ -308,32 +308,32 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 男生平均分数 /// - public decimal? MaleAvgImproveScore { get; set; } + public double? MaleAvgImproveScore { get; set; } /// /// 男生最大分数 /// - public decimal? MaleMaxImproveScore { get; set; } + public double? MaleMaxImproveScore { get; set; } /// /// 男生最小分数 /// - public decimal? MaleMinImproveScore { get; set; } + public double? MaleMinImproveScore { get; set; } /// /// 女生平均分数 /// - public decimal? FemaleAvgImproveScore { get; set; } + public double? FemaleAvgImproveScore { get; set; } /// /// 女生最大分数 /// - public decimal? FemaleMaxImproveScore { get; set; } + public double? FemaleMaxImproveScore { get; set; } /// /// 女生最小分数 /// - public decimal? FemaleMinImproveScore { get; set; } + public double? FemaleMinImproveScore { get; set; } /// /// 失误最少的同学次数 @@ -385,7 +385,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 创建时间 /// - public string CreateTime { get; set; } + public string CreateTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); /// /// 创建人 @@ -420,12 +420,12 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 学生列表 /// - public List StudentList { get; set; } = new List(); + public List StudentList { get; set; } /// /// 训练设置 /// - public TrainSettingDto TrainSetting { get; set; } = new TrainSettingDto(); + public TrainSettingDto TrainSetting { get; set; } } @@ -645,8 +645,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 创建时间 /// - public string CreateTime { get; set; } - + public string CreateTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); /// /// 创建人 @@ -711,7 +710,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 首圈是否整圈(1-不完整，2-完整) /// - public decimal? FirstCircleWhole { get; set; } + public double? FirstCircleWhole { get; set; } /// /// 首圈时间间隔 @@ -721,7 +720,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） /// - public decimal? DecimalPlace { get; set; } + public double? doublePlace { get; set; } /// /// 女生圈数 @@ -736,7 +735,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 女生首圈是否整圈(1-不完整，2-完整) /// - public decimal? FirstCircleWholeGirl { get; set; } + public double? FirstCircleWholeGirl { get; set; } /// /// 女生首圈时间间隔 @@ -746,7 +745,7 @@ namespace YD_XinWei.Commons.Dto.Open /// /// 创建时间 /// - public string CreateTime { get; set; } + public string CreateTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); /// /// 创建人 diff --git a/Server/YD_XinWei.Commons/Dto/Open/GradeRankingVo.cs b/Server/YD_XinWei.Commons/Dto/Open/GradeRankingVo.cs new file mode 100644 index 0000000..40bee46 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/GradeRankingVo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class GradeRankingVo + { + public string Rating { get; set; } + public string MonthRanking { get; set; } + } +} diff --git a/Server/YD_XinWei.Commons/Dto/Open/GradeVo.cs b/Server/YD_XinWei.Commons/Dto/Open/GradeVo.cs new file mode 100644 index 0000000..86534f9 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/GradeVo.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class GradeVo + { + /// + /// 年级id + /// + public long GradeId { get; set; } + + /// + /// 年级名称 + /// + public string GradeName { get; set; } + } + + public class ScoreRankingDto + { + /// + /// 学校id + /// + public long OrgId { get; set; } + + /// + /// 年级id + /// + public long GradeId { get; set; } + + /// + /// 时间段 + /// 1: 本周, 2: 本月, 3: 本学期 + /// + public string Times { get; set; } + + /// + /// 性别 + /// 1: 男生, 2: 女生, 3: 班级 + /// + public string Sex { get; set; } + + /// + /// 项目编号 + /// + public string ProjectKind { get; set; } + + /// + /// 项目模式 + /// + public string ModelType { get; set; } + } + + + public class ScoreRankingVo + { + /// + /// 榜单列表 + /// + public List Lists { get; set; } + /// + /// 日期区间 + /// + public string Times { get; set; } + } + + public class RankingVo + { + /// + /// 姓名 + /// + public string Name { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 成绩 + /// + public string Achievement { get; set; } + } + + +} diff --git a/Server/YD_XinWei.Commons/Dto/Open/HistoryDetailRequestDto.cs b/Server/YD_XinWei.Commons/Dto/Open/HistoryDetailRequestDto.cs new file mode 100644 index 0000000..5cbb20c --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/HistoryDetailRequestDto.cs @@ -0,0 +1,122 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class HistoryDetailRequestDto + { + /// + /// 必需的学生主键 + /// + public long TrainStudentId { get; set; } + + /// + /// 是否游客 + /// + public bool? TouristFlag { get; set; } + + /// + /// 是否双人模式 + /// + public bool? DoubleFlag { get; set; } + } + + public class TrainAnalusisVo + { + /// + /// 头像 + /// + public string HeadImgUrl { get; set; } + + /// + /// 姓名 + /// + public string StudentName { get; set; } + + /// + /// 性别 + /// + public string Sex { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 成绩 + /// + public string Achievement { get; set; } + + /// + /// 得分 + /// + public string Score { get; set; } + + /// + /// 项目名称 + /// + public string ProjectName { get; set; } + + /// + /// 评定 + /// + public string Rating { get; set; } + + /// + /// 年级排名 + /// + public string GradeRanking { get; set; } + + /// + /// 用时/绊脚次数，返回xx秒或者 xx分xx秒 + /// + public string Times { get; set; } + + /// + /// 违规次数 + /// + public int? ViolationsNumber { get; set; } + + /// + /// 视频路径 + /// + public string VideoRecord { get; set; } + + /// + /// 违规列表 + /// + public List TrainViolationsVo { get; set; } + } + + public class TrainViolationsVo + { + /// + /// 违规动作名称 + /// + public string ViolationName { get; set; } + + /// + /// 违规动作id + /// + public int? ViolationId { get; set; } + + /// + /// 违规动图地址 + /// + public string PicUrl { get; set; } + + /// + /// 违规动作训练时间 + /// + public string TrainTime { get; set; } + + /// + /// 创建时间 + /// + public string CreateTime { get; set; } + } +} diff --git a/Server/YD_XinWei.Commons/Dto/Open/HistoryGetDto.cs b/Server/YD_XinWei.Commons/Dto/Open/HistoryGetDto.cs new file mode 100644 index 0000000..120480f --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/HistoryGetDto.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class HistoryGetDto + { + /// + /// 学校id + /// + public long OrgId { get; set; } + + /// + /// 项目编号 + /// + public string ProjectKind { get; set; } + + /// + /// 项目模式 + /// + public byte ModelType { get; set; } + + /// + /// 页数，默认值为1 + /// + public int PageNo { get; set; } = 1; + + /// + /// 分页大小，默认值为10 + /// + public int PageSize { get; set; } = 10; + + /// + /// 排序列名称 + /// + public string OrderByColumn { get; set; } + + /// + /// 排序方式（升序/降序） + /// + public string IsAsc { get; set; } + } + + public class TrainHistoryResponseDto + { + /// + /// 返回的数据对象 + /// + public object Data { get; set; } + + /// + /// 总记录数 + /// + public int? Total { get; set; } + + /// + /// 列表数据 + /// + public List Rows { get; set; } + + public class TrainHistoryVo + { + /// + /// 主键 + /// + public int? TrainStudentId { get; set; } + + /// + /// 学生姓名 + /// + public string StudentName { get; set; } + + /// + /// 性别 + /// + public string Sex { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 成绩 + /// + public string Achievement { get; set; } + + /// + /// 得分 + /// + public string Score { get; set; } + + /// + /// 评定 + /// + public string Rating { get; set; } + + /// + /// 时间 + /// + public string CreateTime { get; set; } + + /// + /// 是否游客 + /// + public bool? TouristFlag { get; set; } + + /// + /// 是否双人模式 + /// + public bool? DoubleFlag { get; set; } + } + } + +} diff --git a/Server/YD_XinWei.Commons/Dto/Open/HistoryPersonGetDto.cs b/Server/YD_XinWei.Commons/Dto/Open/HistoryPersonGetDto.cs new file mode 100644 index 0000000..b149a75 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/HistoryPersonGetDto.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class HistoryPersonGetDto + { + /// + /// 学校id + /// + public long OrgId { get; set; } + + /// + /// 项目编号 + /// + public string ProjectKind { get; set; } + + /// + /// 项目模式 + /// + public byte ModelType { get; set; } + + /// + /// 学生ID + /// + public int StudentId { get; set; } + } + public class TrainHistoryPersonVo + { + /// + /// 头像 + /// + public string HeadImgUrl { get; set; } + + /// + /// 学生姓名 + /// + public string StudentName { get; set; } + + /// + /// 性别 + /// + public string Sex { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 历史最好成绩 + /// + public string HistoryBestScore { get; set; } + + /// + /// 历史年级排名 + /// + public string HistoryRanking { get; set; } + + /// + /// 本月最好成绩 + /// + public string MonthBestScore { get; set; } + + /// + /// 本月年级排名 + /// + public string MonthRanking { get; set; } + } + public class PersonAnalysisVo + { + /// + /// 主键 + /// + public int TrainStudentId { get; set; } + + /// + /// 成绩 + /// + public string Achievement { get; set; } + + /// + /// 得分 + /// + public string Score { get; set; } + + /// + /// 评定 + /// + public string Rating { get; set; } + + /// + /// 姓名 + /// + public string StudentName { get; set; } + + /// + /// 性别 + /// + public string Sex { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 是否双人模式 + /// + public bool DoubleFlag { get; set; } + + /// + /// 双人模式第二名学生姓名 + /// + public string SecondStudentName { get; set; } + + /// + /// 第二名学生成绩排序 1（第一名） 2（第二名） + /// + public int SecondAchievementSort { get; set; } + + /// + /// 时间 + /// + public string CreateTime { get; set; } + } + + public class TableDataPersonAnalysisVo + { + /// + /// 总记录数 + /// + public int Total { get; set; } + + /// + /// 列表数据 + /// + public List Rows { get; set; } + } + + +} diff --git a/Server/YD_XinWei.Commons/Dto/Open/TrainDto.cs b/Server/YD_XinWei.Commons/Dto/Open/TrainDto.cs new file mode 100644 index 0000000..1a517e6 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Open/TrainDto.cs @@ -0,0 +1,432 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Open +{ + public class TrainDto + { + public int? Id { get; set; } + + /// + /// 考试id + /// + public int? ExaminationId { get; set; } + + /// + /// 考试名称 + /// + public string ExaminationName { get; set; } + + /// + /// 项目类型(1体检 2体质) + /// + public int? ProjectType { get; set; } + + /// + /// 项目ID + /// + public int? ProjectId { get; set; } + + /// + /// 项目名称 + /// + public string ProjectName { get; set; } + + /// + /// 模式类型(1随堂模式2名单模式3刷卡或手动录入) + /// + public int? RosterType { get; set; } + + /// + /// 学校ID + /// + public int? OrgId { get; set; } + + /// + /// 年级ID + /// + public int? GradeId { get; set; } + + /// + /// 年级名称 + /// + public string GradeName { get; set; } + + /// + /// 班级或者名单id（根据roster_type来判断） + /// + public int? ClassId { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 组别 + /// + public string GroupId { get; set; } + + /// + /// 老师ID + /// + public int? TeacherId { get; set; } + + /// + /// 老师名称 + /// + public string TeacherName { get; set; } + + /// + /// 训练模式 + /// + public int? ModelType { get; set; } + + /// + /// 评分标准类型(1国家标准2地方标准3自定义标准) + /// + public int? MarkType { get; set; } + + /// + /// 项目类型(1跳绳2跑步) + /// + public int? ProjectKind { get; set; } + + /// + /// 训练标准ID + /// + public int? ProjectRuleId { get; set; } + + /// + /// 项目类型名称 + /// + public string ProjectKindName { get; set; } + + /// + /// 评分标准类型名称 + /// + public string MarkTypeName { get; set; } + + /// + /// 项目模式名称 + /// + public string ModelTypeName { get; set; } + + /// + /// 训练人数 + /// + public int? TrainCount { get; set; } + + /// + /// 开始时间 + /// + public string StartTime { get; set; } + + /// + /// 结束时间 + /// + public string EndTime { get; set; } + + /// + /// 男生总数 + /// + public int? MaleTotal { get; set; } + + /// + /// 女生总数 + /// + public int? FemaleTotal { get; set; } + + /// + /// 男生总成绩 + /// + public double? MaleCount { get; set; } + /// + /// 男生最大值 + /// + public double? MaleMaxCount { get; set; } + + /// + /// 男生最小值 + /// + public double? MaleMinCount { get; set; } + + /// + /// 女生总成绩 + /// + public double? FemaleCount { get; set; } + + /// + /// 女生最大值 + /// + public double? FemaleMaxCount { get; set; } + + /// + /// 女生最小值 + /// + public double? FemaleMinCount { get; set; } + + /// + /// 男生总分数 + /// + public double? MaleScore { get; set; } + + /// + /// 男生最大分数 + /// + public double? MaleMaxScore { get; set; } + + /// + /// 男生最小分数 + /// + public double? MaleMinScore { get; set; } + + /// + /// 女生总分数 + /// + public double? FemaleScore { get; set; } + + /// + /// 女生最大分数 + /// + public double? FemaleMaxScore { get; set; } + + /// + /// 女生最小分数 + /// + public double? FemaleMinScore { get; set; } + + /// + /// 男生优秀人数 + /// + public int? MaleFine { get; set; } + + /// + /// 男生良好人数 + /// + public int? MaleGood { get; set; } + + /// + /// 男生及格人数 + /// + public int? MalePass { get; set; } + + /// + /// 男生不及格人数 + /// + public int? MaleFail { get; set; } + + /// + /// 女生优秀人数 + /// + public int? FemaleFine { get; set; } + + /// + /// 女生良好人数 + /// + public int? FemaleGood { get; set; } + + /// + /// 女生及格人数 + /// + public int? FemalePass { get; set; } + + /// + /// 女生不及格人数 + /// + public int? FemaleFail { get; set; } + + /// + /// 及格率 + /// + public double? PassingRate { get; set; } + + /// + /// 男生平均个数 + /// + public double? MaleAvgCount { get; set; } + + /// + /// 女生平均个数 + /// + public double? FemaleAvgCount { get; set; } + + /// + /// 男生平均分数 + /// + public double? MaleAvgScore { get; set; } + + /// + /// 女生平均分数 + /// + public double? FemaleAvgScore { get; set; } + + /// + /// 男生中位数 + /// + public double? MaleMedianCount { get; set; } + + /// + /// 女生中位数 + /// + public double? FemaleMedianCount { get; set; } + + /// + /// 男生平均值 + /// + public int? MaleAvgImproveCount { get; set; } + + /// + /// 男生最大值 + /// + public int? MaleMaxImproveCount { get; set; } + + /// + /// 男生最小值 + /// + public int? MaleMinImproveCount { get; set; } + + /// + /// 女生平均值 + /// + public int? FemaleAvgImproveCount { get; set; } + + /// + /// 女生最大值 + /// + public int? FemaleMaxImproveCount { get; set; } + + /// + /// 女生最小值 + /// + public int? FemaleMinImproveCount { get; set; } + + /// + /// 男生平均分数 + /// + public double? MaleAvgImproveScore { get; set; } + + /// + /// 男生最大分数 + /// + public double? MaleMaxImproveScore { get; set; } + + /// + /// 男生最小分数 + /// + public double? MaleMinImproveScore { get; set; } + + /// + /// 女生平均分数 + /// + public double? FemaleAvgImproveScore { get; set; } + + /// + /// 女生最大分数 + /// + public double? FemaleMaxImproveScore { get; set; } + + /// + /// 女生最小分数 + /// + public double? FemaleMinImproveScore { get; set; } + + /// + /// 失误最少的同学次数 + /// + public int? MinErrorCount { get; set; } = 99999; // 默认值 + + /// + /// 进入状态最快的同学耗时（心率借用这个字段。班级运动时间） + /// + public int? MinIntoStateTime { get; set; } = 999999; + + /// + /// 第一名平均耗时 + /// + public int? MinAvgTime { get; set; } = 999999; + + /// + /// 失误总次数 + /// + public int? TotalErrorCount { get; set; } = 0; + + /// + /// 失误损失次数 + /// + public int? LossesCount1 { get; set; } = 0; + + /// + /// 甩绳速度偏慢损失次数 + /// + public int? LossesCount2 { get; set; } = 0; + + /// + /// 进入状态过慢损失次数 + /// + public int? LossesCount3 { get; set; } = 0; + + /// + /// 提交标识 + /// + public string CheckCode { get; set; } + + /// + /// 班级明细 + /// + //[Display(Name = "DetailInfo")] + //[Comment("班级明细")] + //public object DetailInfo { get; set; } + + /// + /// 创建时间 + /// + public string CreateTime { get; set; } + + /// + /// 创建人 + /// + public string CreateBy { get; set; } + + /// + /// 修改时间 + /// + public string UpdateTime { get; set; } + + /// + /// 修改人 + /// + public string UpdateBy { get; set; } + + /// + /// 是否双人模式 + /// + public bool? DoubleFlag { get; set; } + + /// + /// 数据来源(1:pad, 2:微信小程序) + /// + public int? Source { get; set; } + + /// + /// 学生姓名 + /// + public string StudentName { get; set; } + + /// + /// 学生列表 + /// + public List StudentList { get; set; } = new List(); + + /// + /// 训练设置 + /// + public TrainSettingDto TrainSetting { get; set; } = new TrainSettingDto(); + + } +} 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 e509f74..dd0f0b6 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 445a54e..c2adf6d 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 99c747a..f252f0c 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+d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+859d137e45238dcec6a041fc523615e1d43d4b09")] [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 48e6b28..7f38f78 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 @@ -f70f09ef16883c9169f894ddba48aefed4063aacd990643ce566e0aff04c4a79 +3259a41d09ddb64608d55583f36ed4d3271649b18e61d28128c491005f61900e diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache index 5be6924..6ca5296 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache index fbf0049..080e6bd 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e5fdf88230052c4a6cad0f97f01981fc5b983e6febd33dbb0e13fd73dd55ab9e +8b041535db36c9afde60cde36730454dabd1396b7fa30ffc57e55e8983edcee6 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 e509f74..dd0f0b6 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 445a54e..c2adf6d 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 f90e642..89ee890 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\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=859d137e45238dcec6a041fc523615e1d43d4b09&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 573962e..67dec32 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 573962e..67dec32 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/AutoMappers/MappingProfile.cs b/Server/YD_XinWei/AutoMappers/MappingProfile.cs index 3b04d4d..2a9944b 100644 --- a/Server/YD_XinWei/AutoMappers/MappingProfile.cs +++ b/Server/YD_XinWei/AutoMappers/MappingProfile.cs @@ -22,6 +22,11 @@ namespace YD_XinWei.Api.AutoMappers CreateMap(); CreateMap(); CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); } } } diff --git a/Server/YD_XinWei/Context/SmartSportsContext.cs b/Server/YD_XinWei/Context/SmartSportsContext.cs index 11771bc..0e20671 100644 --- a/Server/YD_XinWei/Context/SmartSportsContext.cs +++ b/Server/YD_XinWei/Context/SmartSportsContext.cs @@ -16,6 +16,7 @@ namespace YD_XinWei.Api.Context } public DbSet Class { get; set; } public DbSet Grade { get; set; } + public DbSet SchoolAssocGrade { get; set; } public DbSet Student { get; set; } public DbSet School { get; set; } public DbSet Sys_User { get; set; } diff --git a/Server/YD_XinWei/Controllers/XinWeiController.cs b/Server/YD_XinWei/Controllers/XinWeiController.cs index 49cfc11..0ee5c88 100644 --- a/Server/YD_XinWei/Controllers/XinWeiController.cs +++ b/Server/YD_XinWei/Controllers/XinWeiController.cs @@ -116,10 +116,104 @@ namespace YD_XinWei.Api.Controllers /// [HttpPost] [Route("/sports/{apiVersion}/train/addTrain")] - public async Task AddTrain([FromBody] AddTrainDto dto) + public async Task AddTrain([FromBody] AddTrainDto dto) { - await _xinWeiService.AddTrain(dto); - return Ok("新增成功"); + Console.WriteLine("开始上传"); + var res = await _xinWeiService.AddTrain(dto); + return res; + } + + + /// + /// 年级排名 + /// + /// + /// + /// + [HttpGet] + [Route("/sports/{apiVersion}/trainAnalysis/gradeRankingGet")] + public async Task GradeRankingGet(int studentId, int trainId) + { + var res = await _xinWeiService.GradeRankingGet(studentId, trainId); + return res; + } + + /// + /// 全部历史记录 + /// + /// + /// + [HttpGet] + [Route("/sports/{apiVersion}/trainAnalysis/history/get")] + public async Task HistoryGet(HistoryGetDto dto) + { + var res = await _xinWeiService.HistoryGet(dto); + return res; + } + + /// + /// 历史记录详细 + /// + /// + /// + [HttpGet] + [Route("/sports/{apiVersion}/trainAnalysis/history/detail")] + public async Task TrainAnalysisHistoryDetail(HistoryDetailRequestDto dto) + { + var res = await _xinWeiService.TrainAnalysisHistoryDetail(dto); + return res; + } + + /// + /// 个人历史记录-历史成绩 + /// + /// + /// + [HttpGet] + [Route("/sports/v1/trainAnalysis/history/person/get")] + public async Task HistoryPersonGet(HistoryPersonGetDto dto) + { + var res = await _xinWeiService.HistoryPersonGet(dto); + return res; + } + + /// + /// 个人历史记录-记录列表 + /// + /// + /// + [HttpGet] + [Route("/sports/v1/trainAnalysis/history/person/list")] + public async Task HistoryPersonListGet(HistoryGetDto dto) + { + var res = await _xinWeiService.HistoryPersonListGet(dto); + return res; + } + + /// + /// 成绩榜-年级列表 + /// + /// + /// + [HttpGet] + [Route("/basic/{apiVersion}/open/getGradeListByOrg")] + public async Task> GetGradeListByOrg(int orgId) + { + var res = await _xinWeiService.GetGradeListByOrg(orgId); + return res; + } + + /// + /// 个人历史记录-榜单列表 + /// + /// + /// + [HttpGet] + [Route("/sports/{apiVersion}/trainAnalysis/scoreRanking/list")] + public async Task ScoreRanking(ScoreRankingDto dto) + { + var res = await _xinWeiService.ScoreRanking(dto); + return res; } } } diff --git a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user index d3d579e..974b683 100644 --- a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Users\Administrator\Desktop\web - True|2025-02-25T07:05:56.3704383Z||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||; + True|2025-02-28T03:24:13.9529058Z||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||; \ No newline at end of file diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs index dd4b7f0..cb75a48 100644 --- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs +++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs @@ -186,12 +186,12 @@ namespace YD_XinWei.Api.Services.Impl /// public async Task FaceListOfDevicePage(FaceListOfDeviceDto dto) { - var total = await _sportsContext.Student.CountAsync(); - string schoolCode = await _sportsContext.School.Where(x => x.Id == dto.OrgId).Select(x => x.SchoolCode).FirstAsync(); + var total = await _sportsContext.Student.CountAsync(x => x.SchoolCode == schoolCode && !string.IsNullOrWhiteSpace(x.Photo)); + var list = await _sportsContext.Student - .Where(x => x.SchoolCode == schoolCode) + .Where(x => x.SchoolCode == schoolCode && !string.IsNullOrWhiteSpace(x.Photo)) .Select(s => new DeviceUserFaceVo() { FaceId = s.StudentNo, @@ -208,7 +208,8 @@ namespace YD_XinWei.Api.Services.Impl { Total = total, PageNum = dto.PageNo, - Pages = dto.PageSize, + PageSize = dto.PageSize, + Pages = (int)Math.Ceiling((double)total / dto.PageSize), List = list }; } @@ -318,13 +319,12 @@ namespace YD_XinWei.Api.Services.Impl return res; } - /// /// 新增训练 /// /// /// - public async Task AddTrain(AddTrainDto dto) + public async Task AddTrain(AddTrainDto dto) { var entity = _mapper.Map(dto); @@ -337,14 +337,104 @@ namespace YD_XinWei.Api.Services.Impl try { await _sportsContext.SaveChangesAsync(); + + var res = _mapper.Map(entity); + + Console.WriteLine("新增成功"); + + return res; } catch (Exception e) { Console.WriteLine(e.Message + "/n" + e.InnerException); } - Console.WriteLine("新增成功"); } + + return null; + } + + /// + /// 年级排名 + /// + /// + /// + /// + /// + public Task GradeRankingGet(int studentId, int trainId) + { + throw new NotImplementedException(); + } + + /// + /// 全部历史记录 + /// + /// + /// + public async Task HistoryGet(HistoryGetDto dto) + { + throw new NotImplementedException(); + } + + /// + /// 历史记录详细 + /// + /// + /// + public Task TrainAnalysisHistoryDetail(HistoryDetailRequestDto dto) + { + throw new NotImplementedException(); + } + + /// + /// 个人历史记录-历史成绩 + /// + /// + /// + public Task HistoryPersonGet(HistoryPersonGetDto dto) + { + throw new NotImplementedException(); + } + + /// + /// 个人历史记录-记录列表 + /// + /// + /// + public Task HistoryPersonListGet(HistoryGetDto dto) + { + throw new NotImplementedException(); + } + + /// + /// 成绩榜-年级列表 + /// + /// + /// + public async Task> GetGradeListByOrg(int orgId) + { + string schoolCode = await _sportsContext.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync(); + + var res = await (from s in _sportsContext.SchoolAssocGrade + join g in _sportsContext.Grade on s.GradeId equals g.Id + where s.SchoolCode == schoolCode + select new GradeVo() + { + GradeId = g.Id, + GradeName = g.GradeName + }).ToListAsync(); + + return res; + } + + /// + /// 成绩榜-年级列表 + /// + /// + /// + public Task ScoreRanking(ScoreRankingDto dto) + { + throw new NotImplementedException(); } } } diff --git a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs index 11b6700..2d7fa81 100644 --- a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs +++ b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc; using TGJ.NetworkFreight.SeckillAggregateServices.Pos.UserService; +using VOL.Entity.DomainModels.XinWei; using YD_XinWei.Api; using YD_XinWei.Api.Entitys; using YD_XinWei.Commons; @@ -69,6 +70,57 @@ namespace YD_XinWei.Api.Services.Interface /// /// /// - Task AddTrain(AddTrainDto dto); + Task AddTrain(AddTrainDto dto); + + /// + /// 年级排名 + /// + /// + /// + /// + Task GradeRankingGet(int studentId, int trainId); + + /// + /// 全部历史记录 + /// + /// + /// + Task HistoryGet(HistoryGetDto dto); + + /// + /// 历史记录详细 + /// + /// + /// + Task TrainAnalysisHistoryDetail(HistoryDetailRequestDto dto); + + /// + /// 个人历史记录-历史成绩 + /// + /// + /// + Task HistoryPersonGet(HistoryPersonGetDto dto); + + /// + /// 个人历史记录-记录列表 + /// + /// + /// + Task HistoryPersonListGet(HistoryGetDto dto); + + /// + /// 成绩榜-年级列表 + /// + /// + /// + Task> GetGradeListByOrg(int orgId); + + /// + /// 成绩榜-榜单列表 + /// + /// + /// + Task ScoreRanking(ScoreRankingDto dto); + } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/S_SchoolAssocGrade.cs b/Server/YD_XinWei/SmartSportsEntitys/S_SchoolAssocGrade.cs new file mode 100644 index 0000000..40172fd --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/S_SchoolAssocGrade.cs @@ -0,0 +1,65 @@ +using Microsoft.EntityFrameworkCore; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; + +namespace YD_XinWei.Api.SmartSportsEntitys +{ + [Table("S_SchoolAssocGrade")] + public class S_SchoolAssocGrade + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("Id")] + public int Id { get; set; } + + /// + ///学校编号 + /// + [Display(Name = "学校编号")] + [Comment("学校编号")] + [Column(TypeName = "nvarchar(100)")] + public string SchoolCode { get; set; } + + /// + ///年级Id + /// + [Display(Name = "年级Id")] + [Comment("年级Id")] + [Column(TypeName = "int")] + public int GradeId { get; set; } + + /// + ///创建人 + /// + [Display(Name = "创建人")] + [Comment("创建人")] + [Column(TypeName = "int)")] + public int Creator { get; set; } + + /// + ///创建时间 + /// + [Display(Name = "创建时间")] + [Comment("创建时间")] + [Column(TypeName = "datetime")] + [Editable(true)] + public DateTime? CreateDate { get; set; } + + /// + ///修改人 + /// + [Display(Name = "修改人")] + [Comment("修改人")] + [Column(TypeName = "int)")] + public int Modifier { get; set; } + + /// + ///修改时间 + /// + [Display(Name = "修改时间")] + [Comment("修改时间")] + [Column(TypeName = "datetime")] + public DateTime? ModifyDate { get; set; } + } +} diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs index f0e3728..8d3430f 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs @@ -17,7 +17,7 @@ namespace VOL.Entity.DomainModels.XinWei [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Display(Description = "主键Id")] [Comment("Id")] - public int? Id { get; set; } + public int Id { get; set; } /// /// 考试id 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 e53df6f..9677b9d 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 003340b..9c1d3c8 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 750cc0e..006d00e 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 a884901..fbb909c 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 @@ -70,6 +70,56 @@ + + + 年级排名 + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 个人历史记录-榜单列表 + + + + 数据库实体父类 @@ -280,6 +330,57 @@ + + + 年级排名 + + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 成绩榜-年级列表 + + + + 服务接口 @@ -341,6 +442,56 @@ + + + 年级排名 + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 成绩榜-榜单列表 + + + + 年级Id @@ -596,6 +747,36 @@ 班级名称 + + + 学校编号 + + + + + 年级Id + + + + + 创建人 + + + + + 创建时间 + + + + + 修改人 + + + + + 修改时间 + + 学校编号 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 e509f74..dd0f0b6 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 445a54e..c2adf6d 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/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll index 3c07295..ae11b3b 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb index f3abe7b..f9cef39 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll index e509f74..b78b11c 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb index 445a54e..82dca35 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json index bf97174..93269c6 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json @@ -71,6 +71,37 @@ } ] }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "GetGradeListByOrg", + "RelativePath": "basic/{apiVersion}/open/getGradeListByOrg", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "orgId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Open.GradeVo, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", "Method": "GetOrgSportsProjectList", @@ -245,6 +276,307 @@ "IsRequired": true } ], - "ReturnTypes": [] + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.TrainDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "GradeRankingGet", + "RelativePath": "sports/{apiVersion}/trainAnalysis/gradeRankingGet", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "studentId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "trainId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.GradeRankingVo", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "TrainAnalysisHistoryDetail", + "RelativePath": "sports/{apiVersion}/trainAnalysis/history/detail", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "TrainStudentId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "TouristFlag", + "Type": "System.Nullable\u00601[[System.Boolean, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + }, + { + "Name": "DoubleFlag", + "Type": "System.Nullable\u00601[[System.Boolean, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.TrainAnalusisVo", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "HistoryGet", + "RelativePath": "sports/{apiVersion}/trainAnalysis/history/get", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "OrgId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "ProjectKind", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "ModelType", + "Type": "System.Byte", + "IsRequired": false + }, + { + "Name": "PageNo", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "PageSize", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "OrderByColumn", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "IsAsc", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.TrainHistoryResponseDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "ScoreRanking", + "RelativePath": "sports/{apiVersion}/trainAnalysis/scoreRanking/list", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "OrgId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "GradeId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "Times", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "Sex", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "ProjectKind", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "ModelType", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.ScoreRankingVo", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "HistoryPersonGet", + "RelativePath": "sports/v1/trainAnalysis/history/person/get", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "OrgId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "ProjectKind", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "ModelType", + "Type": "System.Byte", + "IsRequired": false + }, + { + "Name": "StudentId", + "Type": "System.Int32", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.TrainHistoryPersonVo", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "HistoryPersonListGet", + "RelativePath": "sports/v1/trainAnalysis/history/person/list", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "OrgId", + "Type": "System.Int64", + "IsRequired": false + }, + { + "Name": "ProjectKind", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "ModelType", + "Type": "System.Byte", + "IsRequired": false + }, + { + "Name": "PageNo", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "PageSize", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "OrderByColumn", + "Type": "System.String", + "IsRequired": false + }, + { + "Name": "IsAsc", + "Type": "System.String", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_XinWei.Commons.Dto.Open.TableDataPersonAnalysisVo", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] } ] \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json index 7966570..b644048 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json @@ -446,7 +446,526 @@ }, "responses": { "200": { - "description": "Success" + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/TrainDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/TrainDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/TrainDto" + } + } + } + } + } + } + }, + "/sports/{apiVersion}/trainAnalysis/gradeRankingGet": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "年级排名", + "parameters": [ + { + "name": "studentId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "trainId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/GradeRankingVo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/GradeRankingVo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/GradeRankingVo" + } + } + } + } + } + } + }, + "/sports/{apiVersion}/trainAnalysis/history/get": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "全部历史记录", + "parameters": [ + { + "name": "OrgId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "ProjectKind", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "ModelType", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageNo", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageSize", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "OrderByColumn", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "IsAsc", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryResponseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryResponseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryResponseDto" + } + } + } + } + } + } + }, + "/sports/{apiVersion}/trainAnalysis/history/detail": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "历史记录详细", + "parameters": [ + { + "name": "TrainStudentId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "TouristFlag", + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "DoubleFlag", + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/TrainAnalusisVo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/TrainAnalusisVo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/TrainAnalusisVo" + } + } + } + } + } + } + }, + "/sports/v1/trainAnalysis/history/person/get": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "个人历史记录-历史成绩", + "parameters": [ + { + "name": "OrgId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "ProjectKind", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "ModelType", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "StudentId", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryPersonVo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryPersonVo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/TrainHistoryPersonVo" + } + } + } + } + } + } + }, + "/sports/v1/trainAnalysis/history/person/list": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "个人历史记录-记录列表", + "parameters": [ + { + "name": "OrgId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "ProjectKind", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "ModelType", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageNo", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageSize", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "OrderByColumn", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "IsAsc", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/TableDataPersonAnalysisVo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/TableDataPersonAnalysisVo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/TableDataPersonAnalysisVo" + } + } + } + } + } + } + }, + "/basic/{apiVersion}/open/getGradeListByOrg": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "成绩榜-年级列表", + "parameters": [ + { + "name": "orgId", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/GradeVo" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/GradeVo" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/GradeVo" + } + } + } + } + } + } + } + }, + "/sports/{apiVersion}/trainAnalysis/scoreRanking/list": { + "get": { + "tags": [ + "XinWei" + ], + "summary": "个人历史记录-榜单列表", + "parameters": [ + { + "name": "OrgId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "GradeId", + "in": "query", + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "Times", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "Sex", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "ProjectKind", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "ModelType", + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ScoreRankingVo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ScoreRankingVo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ScoreRankingVo" + } + } + } } } } @@ -582,13 +1101,13 @@ "nullable": true }, "maleMaxCount": { - "type": "integer", - "format": "int32", + "type": "number", + "format": "double", "nullable": true }, "maleMinCount": { - "type": "integer", - "format": "int32", + "type": "number", + "format": "double", "nullable": true }, "femaleCount": { @@ -597,13 +1116,13 @@ "nullable": true }, "femaleMaxCount": { - "type": "integer", - "format": "int32", + "type": "number", + "format": "double", "nullable": true }, "femaleMinCount": { - "type": "integer", - "format": "int32", + "type": "number", + "format": "double", "nullable": true }, "maleScore": { @@ -1076,6 +1595,83 @@ }, "additionalProperties": false }, + "GradeRankingVo": { + "type": "object", + "properties": { + "rating": { + "type": "string", + "nullable": true + }, + "monthRanking": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, + "GradeVo": { + "type": "object", + "properties": { + "gradeId": { + "type": "integer", + "format": "int64" + }, + "gradeName": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, + "PersonAnalysisVo": { + "type": "object", + "properties": { + "trainStudentId": { + "type": "integer", + "format": "int32" + }, + "achievement": { + "type": "string", + "nullable": true + }, + "score": { + "type": "string", + "nullable": true + }, + "rating": { + "type": "string", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "sex": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "doubleFlag": { + "type": "boolean" + }, + "secondStudentName": { + "type": "string", + "nullable": true + }, + "secondAchievementSort": { + "type": "integer", + "format": "int32" + }, + "createTime": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, "ProjectModeDto": { "type": "object", "properties": { @@ -1094,6 +1690,41 @@ }, "additionalProperties": false }, + "RankingVo": { + "type": "object", + "properties": { + "name": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "achievement": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, + "ScoreRankingVo": { + "type": "object", + "properties": { + "lists": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RankingVo" + }, + "nullable": true + }, + "times": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, "ScoreRuleDto": { "type": "object", "properties": { @@ -1478,6 +2109,23 @@ }, "additionalProperties": false }, + "TableDataPersonAnalysisVo": { + "type": "object", + "properties": { + "total": { + "type": "integer", + "format": "int32" + }, + "rows": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PersonAnalysisVo" + }, + "nullable": true + } + }, + "additionalProperties": false + }, "TestingProjectDto": { "type": "object", "properties": { @@ -1498,6 +2146,577 @@ }, "additionalProperties": false }, + "TrainAnalusisVo": { + "type": "object", + "properties": { + "headImgUrl": { + "type": "string", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "sex": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "achievement": { + "type": "string", + "nullable": true + }, + "score": { + "type": "string", + "nullable": true + }, + "projectName": { + "type": "string", + "nullable": true + }, + "rating": { + "type": "string", + "nullable": true + }, + "gradeRanking": { + "type": "string", + "nullable": true + }, + "times": { + "type": "string", + "nullable": true + }, + "violationsNumber": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "videoRecord": { + "type": "string", + "nullable": true + }, + "trainViolationsVo": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TrainViolationsVo" + }, + "nullable": true + } + }, + "additionalProperties": false + }, + "TrainDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "examinationId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "examinationName": { + "type": "string", + "nullable": true + }, + "projectType": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "projectId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "projectName": { + "type": "string", + "nullable": true + }, + "rosterType": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "orgId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "gradeId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "gradeName": { + "type": "string", + "nullable": true + }, + "classId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "groupId": { + "type": "string", + "nullable": true + }, + "teacherId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "teacherName": { + "type": "string", + "nullable": true + }, + "modelType": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "markType": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "projectKind": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "projectRuleId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "projectKindName": { + "type": "string", + "nullable": true + }, + "markTypeName": { + "type": "string", + "nullable": true + }, + "modelTypeName": { + "type": "string", + "nullable": true + }, + "trainCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "startTime": { + "type": "string", + "nullable": true + }, + "endTime": { + "type": "string", + "nullable": true + }, + "maleTotal": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleTotal": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMaxCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMinCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMaxCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMinCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMaxScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMinScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMaxScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMinScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleFine": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleGood": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "malePass": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleFail": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleFine": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleGood": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femalePass": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleFail": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "passingRate": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleAvgCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleAvgCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleAvgScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleAvgScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMedianCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMedianCount": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleAvgImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleMaxImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleMinImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleAvgImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleMaxImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "femaleMinImproveCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "maleAvgImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMaxImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "maleMinImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleAvgImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMaxImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "femaleMinImproveScore": { + "type": "number", + "format": "double", + "nullable": true + }, + "minErrorCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "minIntoStateTime": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "minAvgTime": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "totalErrorCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "lossesCount1": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "lossesCount2": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "lossesCount3": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "checkCode": { + "type": "string", + "nullable": true + }, + "createTime": { + "type": "string", + "nullable": true + }, + "createBy": { + "type": "string", + "nullable": true + }, + "updateTime": { + "type": "string", + "nullable": true + }, + "updateBy": { + "type": "string", + "nullable": true + }, + "doubleFlag": { + "type": "boolean", + "nullable": true + }, + "source": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "studentList": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TrainStudentsDto" + }, + "nullable": true + }, + "trainSetting": { + "$ref": "#/components/schemas/TrainSettingDto" + } + }, + "additionalProperties": false + }, + "TrainHistoryPersonVo": { + "type": "object", + "properties": { + "headImgUrl": { + "type": "string", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "sex": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "historyBestScore": { + "type": "string", + "nullable": true + }, + "historyRanking": { + "type": "string", + "nullable": true + }, + "monthBestScore": { + "type": "string", + "nullable": true + }, + "monthRanking": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false + }, + "TrainHistoryResponseDto": { + "type": "object", + "properties": { + "data": { + "nullable": true + }, + "total": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "rows": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TrainHistoryVo" + }, + "nullable": true + } + }, + "additionalProperties": false + }, + "TrainHistoryVo": { + "type": "object", + "properties": { + "trainStudentId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "studentName": { + "type": "string", + "nullable": true + }, + "sex": { + "type": "string", + "nullable": true + }, + "className": { + "type": "string", + "nullable": true + }, + "achievement": { + "type": "string", + "nullable": true + }, + "score": { + "type": "string", + "nullable": true + }, + "rating": { + "type": "string", + "nullable": true + }, + "createTime": { + "type": "string", + "nullable": true + }, + "touristFlag": { + "type": "boolean", + "nullable": true + }, + "doubleFlag": { + "type": "boolean", + "nullable": true + } + }, + "additionalProperties": false + }, "TrainSettingDto": { "type": "object", "properties": { @@ -1526,7 +2745,7 @@ "format": "int32", "nullable": true }, - "decimalPlace": { + "doublePlace": { "type": "number", "format": "double", "nullable": true @@ -1819,6 +3038,33 @@ } }, "additionalProperties": false + }, + "TrainViolationsVo": { + "type": "object", + "properties": { + "violationName": { + "type": "string", + "nullable": true + }, + "violationId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "picUrl": { + "type": "string", + "nullable": true + }, + "trainTime": { + "type": "string", + "nullable": true + }, + "createTime": { + "type": "string", + "nullable": true + } + }, + "additionalProperties": false } }, "securitySchemes": { 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 bb1b3e6..13c2358 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+d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+859d137e45238dcec6a041fc523615e1d43d4b09")] [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 6369026..055444a 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 @@ -086c2885779780b4a2feeb0a94cce26a9341f6bd7f4063b5c4c5b0f38da83175 +82d48ca2855d6ae9393f74a3534a66c98a76e9153d1c65fb93a24fd53e3c6446 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 615dc39..9f2db09 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 74d43a2..f1a8a84 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 @@ -404d3526d46d33ab4d8152eefcc18df2441bbd0cd5b18416bda00ef3b10af635 +bd91e07eab0ac44a22bca12a61ae213bf7971e94d074ee03f588126b6498f32e diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt index 450c42d..801e1d7 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt @@ -514,7 +514,6 @@ C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWe C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.AssemblyInfoInputs.cache C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.AssemblyInfo.cs C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.csproj.CoreCompileInputs.cache -C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cache C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.sourcelink.json C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\scopedcss\bundle\YD_XinWei.Api.styles.css @@ -535,3 +534,4 @@ C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWe C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.genruntimeconfig.cache C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\ref\YD_XinWei.Api.dll C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\staticwebassets.upToDateCheck.txt +C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs 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 e53df6f..9677b9d 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 750cc0e..006d00e 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 f90e642..89ee890 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\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=859d137e45238dcec6a041fc523615e1d43d4b09&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 a884901..fbb909c 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 @@ -70,6 +70,56 @@ + + + 年级排名 + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 个人历史记录-榜单列表 + + + + 数据库实体父类 @@ -280,6 +330,57 @@ + + + 年级排名 + + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 成绩榜-年级列表 + + + + 服务接口 @@ -341,6 +442,56 @@ + + + 年级排名 + + + + + + + + 全部历史记录 + + + + + + + 历史记录详细 + + + + + + + 个人历史记录-历史成绩 + + + + + + + 个人历史记录-记录列表 + + + + + + + 成绩榜-年级列表 + + + + + + + 成绩榜-榜单列表 + + + + 年级Id @@ -596,6 +747,36 @@ 班级名称 + + + 学校编号 + + + + + 年级Id + + + + + 创建人 + + + + + 创建时间 + + + + + 修改人 + + + + + 修改时间 + + 学校编号 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe index 003340b..9c1d3c8 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/linux-x64/PubTmp/Out/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll index 3c07295..ae11b3b 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb index f3abe7b..f9cef39 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll index e509f74..b78b11c 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb index 445a54e..82dca35 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs index bb1b3e6..13c2358 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/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+d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+859d137e45238dcec6a041fc523615e1d43d4b09")] [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/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache index 6369026..055444a 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -086c2885779780b4a2feeb0a94cce26a9341f6bd7f4063b5c4c5b0f38da83175 +82d48ca2855d6ae9393f74a3534a66c98a76e9153d1c65fb93a24fd53e3c6446 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache index 8ebcc76..a1eb17f 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll index 3c07295..ae11b3b 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb index f3abe7b..f9cef39 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json index f90e642..89ee890 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=859d137e45238dcec6a041fc523615e1d43d4b09&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll index 798fe02..2750c45 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll index 798fe02..2750c45 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll 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 0a8722a..fc911be 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 0a8722a..fc911be 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