This commit is contained in:
tanglong 2026-08-18 16:03:24 +08:00
parent 40a2c993a9
commit 3049d37ca4
12 changed files with 346 additions and 17 deletions

View File

@ -11,7 +11,7 @@ namespace YD_XinWei.Commons.Dto.Open
/// <summary>
/// 学校id
/// </summary>
public string? OrgId { get; set; }
public string OrgId { get; set; }
/// <summary>
/// 年级名称
@ -21,7 +21,7 @@ namespace YD_XinWei.Commons.Dto.Open
/// <summary>
/// 年级ID
/// </summary>
public string? GradeId { get; set; }
public string GradeId { get; set; }
/// <summary>
/// 班级名称
@ -31,12 +31,12 @@ namespace YD_XinWei.Commons.Dto.Open
/// <summary>
/// 班级Id
/// </summary>
public string? ClassId { get; set; }
public string ClassId { get; set; }
/// <summary>
/// 学生ID
/// </summary>
public string? StudentId { get; set; }
public string StudentId { get; set; }
/// <summary>
/// 学生名称

View File

@ -20,13 +20,13 @@ namespace YD_XinWei.Commons.Dto
public WebResponseContent()
{
ErrorMsg = "";
ErrorMsg = "成功";
}
public WebResponseContent(bool success)
{
Success = success;
ErrorMsg = "";
ErrorMsg = "成功";
}
public static WebResponseContent Instance => new WebResponseContent();
@ -35,7 +35,7 @@ namespace YD_XinWei.Commons.Dto
{
Success = true;
Data = data;
ErrorMsg = msg ?? "";
ErrorMsg = msg ?? "成功";
return this;
}
@ -47,7 +47,7 @@ namespace YD_XinWei.Commons.Dto
public WebResponseContent Error(string msg = "")
{
Success = false;
ErrorMsg = msg ?? "";
ErrorMsg = msg ?? "失败";
return this;
}

View File

@ -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+18483ff997528a5ac9fa662bfd7db965d34506d3")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+40a2c993a9e31da240abf6caaf4f9e33ef8f5887")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
ae1ff5bf479e58682c744059699eede66c6748be092dd05315c8b312a753debf
c73d275186224391167808d274dfa7dcc239443ac7d9678fb26d0df51649c68a

View File

@ -28,6 +28,7 @@ namespace YD_XinWei.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("/basic/{apiVersion}/device/open/getDeviceInfo")]
[Route("/getDeviceInfo")]
public async Task<DeviceInfoDto> GetDeviceInfo(string deviceSerial)
{
var res = await _xinWeiService.DeviceInfo(deviceSerial);
@ -64,6 +65,7 @@ namespace YD_XinWei.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("/sports/{apiVersion}/roster/getMinimumOfStudentInfoList")]
[Route("/getMinimumOfStudentInfoList")]
public async Task<List<StudentInfoDto>> GetMinimumOfStudentInfoList(int orgId)
{
var res = await _xinWeiService.MinimumOfStudentInfoList(orgId);
@ -89,6 +91,7 @@ namespace YD_XinWei.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("/basic/{apiVersion}/open/getFaceListOfDevicePage")]
[Route("/getFaceListOfDevicePage")]
public async Task<FaceListOfDevicePageDto> GetFaceListOfDevicePage([FromQuery] FaceListOfDeviceDto dto)
{
var res = await _xinWeiService.FaceListOfDevicePage(dto);
@ -122,6 +125,19 @@ namespace YD_XinWei.Api.Controllers
return res;
}
/// <summary>
/// 中长跑
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("/addTrain")]
public async Task<bool> AddTrain1([FromBody] AddTrainDto dto)
{
Console.WriteLine("开始上传");
var res = await _xinWeiService.AddTrain(dto);
return res != null;
}
/// <summary>
/// 年级排名
@ -185,7 +201,7 @@ namespace YD_XinWei.Api.Controllers
[Route("/sports/{apiVersion}/trainAnalysis/history/person/list")]
public async Task<TableDataPersonAnalysisVo> HistoryPersonListGet(HistoryPersonListDto dto)
{
if (dto.ModelType==7)
if (dto.ModelType == 7)
{
dto.IsAsc = "asc";
dto.OrderByColumn = "Achievement";

View File

@ -24,7 +24,7 @@ namespace VOL.Entity.DomainModels.XinWei
/// </summary>
[Display(Name = "OrgId")]
[Comment("学校id")]
public string? OrgId { get; set; }
public string OrgId { get; set; }
/// <summary>
/// 年级名称
@ -38,7 +38,7 @@ namespace VOL.Entity.DomainModels.XinWei
/// </summary>
[Display(Name = "GradeId")]
[Comment("年级ID")]
public string? GradeId { get; set; }
public string GradeId { get; set; }
/// <summary>
/// 班级名称
@ -52,14 +52,14 @@ namespace VOL.Entity.DomainModels.XinWei
/// </summary>
[Display(Name = "ClassId")]
[Comment("班级Id")]
public string? ClassId { get; set; }
public string ClassId { get; set; }
/// <summary>
/// 学生ID
/// </summary>
[Display(Name = "StudentId")]
[Comment("学生ID")]
public string? StudentId { get; set; }
public string StudentId { get; set; }
/// <summary>
/// 学生名称

View File

@ -25,6 +25,32 @@
}
]
},
{
"ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
"Method": "AddTrain1",
"RelativePath": "addTrain",
"HttpMethod": "POST",
"IsController": true,
"Order": 0,
"Parameters": [
{
"Name": "dto",
"Type": "YD_XinWei.Commons.Dto.Open.AddTrainDto",
"IsRequired": true
}
],
"ReturnTypes": [
{
"Type": "System.Boolean",
"MediaTypes": [
"text/plain",
"application/json",
"text/json"
],
"StatusCode": 200
}
]
},
{
"ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
"Method": "GetDeviceInfo",
@ -189,6 +215,94 @@
}
]
},
{
"ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
"Method": "GetDeviceInfo",
"RelativePath": "getDeviceInfo",
"HttpMethod": "GET",
"IsController": true,
"Order": 0,
"Parameters": [
{
"Name": "deviceSerial",
"Type": "System.String",
"IsRequired": false
}
],
"ReturnTypes": [
{
"Type": "YD_XinWei.Commons.Dto.Open.DeviceInfoDto",
"MediaTypes": [
"text/plain",
"application/json",
"text/json"
],
"StatusCode": 200
}
]
},
{
"ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
"Method": "GetFaceListOfDevicePage",
"RelativePath": "getFaceListOfDevicePage",
"HttpMethod": "GET",
"IsController": true,
"Order": 0,
"Parameters": [
{
"Name": "OrgId",
"Type": "System.Int32",
"IsRequired": false
},
{
"Name": "PageNo",
"Type": "System.Int32",
"IsRequired": false
},
{
"Name": "PageSize",
"Type": "System.Int32",
"IsRequired": false
}
],
"ReturnTypes": [
{
"Type": "YD_XinWei.Commons.Dto.Open.FaceListOfDevicePageDto",
"MediaTypes": [
"text/plain",
"application/json",
"text/json"
],
"StatusCode": 200
}
]
},
{
"ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
"Method": "GetMinimumOfStudentInfoList",
"RelativePath": "getMinimumOfStudentInfoList",
"HttpMethod": "GET",
"IsController": true,
"Order": 0,
"Parameters": [
{
"Name": "orgId",
"Type": "System.Int32",
"IsRequired": false
}
],
"ReturnTypes": [
{
"Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Open.StudentInfoDto, 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.LargeScreenController",
"Method": "ItemRealTimeResult",

View File

@ -225,6 +225,45 @@
}
}
},
"/getDeviceInfo": {
"get": {
"tags": [
"XinWei"
],
"summary": "获取设备信息",
"parameters": [
{
"name": "deviceSerial",
"in": "query",
"schema": {
"type": "string"
}
}
],
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/DeviceInfoDto"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/DeviceInfoDto"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/DeviceInfoDto"
}
}
}
}
}
}
},
"/sports/{apiVersion}/common/getSportsModelTypeList": {
"get": {
"tags": [
@ -388,6 +427,55 @@
}
}
},
"/getMinimumOfStudentInfoList": {
"get": {
"tags": [
"XinWei"
],
"summary": "获取学生信息",
"parameters": [
{
"name": "orgId",
"in": "query",
"schema": {
"type": "integer",
"format": "int32"
}
}
],
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/StudentInfoDto"
}
}
},
"application/json": {
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/StudentInfoDto"
}
}
},
"text/json": {
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/StudentInfoDto"
}
}
}
}
}
}
}
},
"/sports/{apiVersion}/roster/getSportsRosterList": {
"get": {
"tags": [
@ -517,6 +605,62 @@
}
}
},
"/getFaceListOfDevicePage": {
"get": {
"tags": [
"XinWei"
],
"summary": "获取人脸信息",
"parameters": [
{
"name": "OrgId",
"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"
}
}
],
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"$ref": "#/components/schemas/FaceListOfDevicePageDto"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/FaceListOfDevicePageDto"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/FaceListOfDevicePageDto"
}
}
}
}
}
}
},
"/sports/{apiVersion}/project/getScoreRules": {
"get": {
"tags": [
@ -640,6 +784,61 @@
}
}
},
"/addTrain": {
"post": {
"tags": [
"XinWei"
],
"summary": "中长跑",
"requestBody": {
"description": "",
"content": {
"application/json-patch+json": {
"schema": {
"$ref": "#/components/schemas/AddTrainDto"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/AddTrainDto"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/AddTrainDto"
}
},
"application/*+json": {
"schema": {
"$ref": "#/components/schemas/AddTrainDto"
}
}
}
},
"responses": {
"200": {
"description": "Success",
"content": {
"text/plain": {
"schema": {
"type": "boolean"
}
},
"application/json": {
"schema": {
"type": "boolean"
}
},
"text/json": {
"schema": {
"type": "boolean"
}
}
}
}
}
}
},
"/sports/{apiVersion}/trainAnalysis/gradeRankingGet": {
"get": {
"tags": [

View File

@ -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+1a0b32aeb4353b79e063377649e7fe606da5c01e")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+40a2c993a9e31da240abf6caaf4f9e33ef8f5887")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
59d802cfb892aad643538888e68d4c1f038e6f25a780b1f79f3e9f814f703a5d
c52edc68274bad23c164060ad90ff6207562f6ed8e0c37596086c6d7bfc0d06a