diff --git a/Server/YD_XinWei.Commons/Dto/Open/AddSunshineRunTrainDto.cs b/Server/YD_XinWei.Commons/Dto/Open/AddSunshineRunTrainDto.cs
index af313a8..a3e6b86 100644
--- a/Server/YD_XinWei.Commons/Dto/Open/AddSunshineRunTrainDto.cs
+++ b/Server/YD_XinWei.Commons/Dto/Open/AddSunshineRunTrainDto.cs
@@ -11,7 +11,7 @@ namespace YD_XinWei.Commons.Dto.Open
///
/// 学校id
///
- public string? OrgId { get; set; }
+ public string OrgId { get; set; }
///
/// 年级名称
@@ -21,7 +21,7 @@ namespace YD_XinWei.Commons.Dto.Open
///
/// 年级ID
///
- public string? GradeId { get; set; }
+ public string GradeId { get; set; }
///
/// 班级名称
@@ -31,12 +31,12 @@ namespace YD_XinWei.Commons.Dto.Open
///
/// 班级Id
///
- public string? ClassId { get; set; }
+ public string ClassId { get; set; }
///
/// 学生ID
///
- public string? StudentId { get; set; }
+ public string StudentId { get; set; }
///
/// 学生名称
diff --git a/Server/YD_XinWei.Commons/Dto/WebResponseContent.cs b/Server/YD_XinWei.Commons/Dto/WebResponseContent.cs
index 83aa797..c505860 100644
--- a/Server/YD_XinWei.Commons/Dto/WebResponseContent.cs
+++ b/Server/YD_XinWei.Commons/Dto/WebResponseContent.cs
@@ -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;
}
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 cdc5872..739dadd 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+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")]
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 d48f6a5..3b5e0e0 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 @@
-ae1ff5bf479e58682c744059699eede66c6748be092dd05315c8b312a753debf
+c73d275186224391167808d274dfa7dcc239443ac7d9678fb26d0df51649c68a
diff --git a/Server/YD_XinWei/Controllers/XinWeiController.cs b/Server/YD_XinWei/Controllers/XinWeiController.cs
index 397f5a0..f093116 100644
--- a/Server/YD_XinWei/Controllers/XinWeiController.cs
+++ b/Server/YD_XinWei/Controllers/XinWeiController.cs
@@ -28,6 +28,7 @@ namespace YD_XinWei.Api.Controllers
///
[HttpGet]
[Route("/basic/{apiVersion}/device/open/getDeviceInfo")]
+ [Route("/getDeviceInfo")]
public async Task GetDeviceInfo(string deviceSerial)
{
var res = await _xinWeiService.DeviceInfo(deviceSerial);
@@ -64,6 +65,7 @@ namespace YD_XinWei.Api.Controllers
///
[HttpGet]
[Route("/sports/{apiVersion}/roster/getMinimumOfStudentInfoList")]
+ [Route("/getMinimumOfStudentInfoList")]
public async Task> GetMinimumOfStudentInfoList(int orgId)
{
var res = await _xinWeiService.MinimumOfStudentInfoList(orgId);
@@ -89,6 +91,7 @@ namespace YD_XinWei.Api.Controllers
///
[HttpGet]
[Route("/basic/{apiVersion}/open/getFaceListOfDevicePage")]
+ [Route("/getFaceListOfDevicePage")]
public async Task GetFaceListOfDevicePage([FromQuery] FaceListOfDeviceDto dto)
{
var res = await _xinWeiService.FaceListOfDevicePage(dto);
@@ -122,6 +125,19 @@ namespace YD_XinWei.Api.Controllers
return res;
}
+ ///
+ /// 中长跑
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("/addTrain")]
+ public async Task AddTrain1([FromBody] AddTrainDto dto)
+ {
+ Console.WriteLine("开始上传");
+ var res = await _xinWeiService.AddTrain(dto);
+ return res != null;
+ }
///
/// 年级排名
@@ -185,7 +201,7 @@ namespace YD_XinWei.Api.Controllers
[Route("/sports/{apiVersion}/trainAnalysis/history/person/list")]
public async Task HistoryPersonListGet(HistoryPersonListDto dto)
{
- if (dto.ModelType==7)
+ if (dto.ModelType == 7)
{
dto.IsAsc = "asc";
dto.OrderByColumn = "Achievement";
diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_SunshineRunTrain.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_SunshineRunTrain.cs
index bf41f55..40e889c 100644
--- a/Server/YD_XinWei/SmartSportsEntitys/XW_SunshineRunTrain.cs
+++ b/Server/YD_XinWei/SmartSportsEntitys/XW_SunshineRunTrain.cs
@@ -24,7 +24,7 @@ namespace VOL.Entity.DomainModels.XinWei
///
[Display(Name = "OrgId")]
[Comment("学校id")]
- public string? OrgId { get; set; }
+ public string OrgId { get; set; }
///
/// 年级名称
@@ -38,7 +38,7 @@ namespace VOL.Entity.DomainModels.XinWei
///
[Display(Name = "GradeId")]
[Comment("年级ID")]
- public string? GradeId { get; set; }
+ public string GradeId { get; set; }
///
/// 班级名称
@@ -52,14 +52,14 @@ namespace VOL.Entity.DomainModels.XinWei
///
[Display(Name = "ClassId")]
[Comment("班级Id")]
- public string? ClassId { get; set; }
+ public string ClassId { get; set; }
///
/// 学生ID
///
[Display(Name = "StudentId")]
[Comment("学生ID")]
- public string? StudentId { get; set; }
+ public string StudentId { get; set; }
///
/// 学生名称
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json
index e4f4407..372ff82 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json
+++ b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json
@@ -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",
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 5719732..f1b0efc 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
@@ -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": [
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 f621980..827f00c 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+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")]
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 541eaf7..a2af375 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 @@
-59d802cfb892aad643538888e68d4c1f038e6f25a780b1f79f3e9f814f703a5d
+c52edc68274bad23c164060ad90ff6207562f6ed8e0c37596086c6d7bfc0d06a
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 6c9c560..9574d89 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/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
index 724536d..5c8e2ca 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