This commit is contained in:
tanglong 2026-10-13 14:07:26 +08:00
parent a826a3542c
commit 8454944401
42 changed files with 443 additions and 51 deletions

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ba7ff9d46e66d1ef7128cd700b28a6d522c307e")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a826a3542ca0baafd972e3f53ede92c10db95f36")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
bd1ba78b9486de34fb47107440dc3d5312c8176bdff7c7b7a08057b652ea031e deaaf3da4e2f4b7aacd2cce394b84bf3f18294125fe88211a4bbb45ce1656ff9

View File

@ -92,6 +92,11 @@
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json"
} }
},
"runtimes": {
"linux-x64": {
"#import": []
}
} }
} }
} }

View File

@ -347,6 +347,353 @@
} }
} }
} }
},
"net6.0/linux-x64": {
"Aliyun.OSS.SDK.NetCore/2.14.1": {
"type": "package",
"compile": {
"lib/netstandard2.0/Aliyun.OSS.Core.dll": {
"related": ".pdb;.xml"
}
},
"runtime": {
"lib/netstandard2.0/Aliyun.OSS.Core.dll": {
"related": ".pdb;.xml"
}
}
},
"Microsoft.AspNetCore.Http.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Http.Features": "2.2.0",
"System.Text.Encodings.Web": "4.5.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Http.Features/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.JsonPatch/6.0.0": {
"type": "package",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1"
},
"compile": {
"lib/net6.0/Microsoft.AspNetCore.JsonPatch.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.AspNetCore.JsonPatch.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Mvc.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Routing.Abstractions": "2.2.0",
"Microsoft.Net.Http.Headers": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Mvc.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Mvc.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Mvc.NewtonsoftJson/6.0.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "6.0.0",
"Newtonsoft.Json": "13.0.1",
"Newtonsoft.Json.Bson": "1.0.2"
},
"compile": {
"lib/net6.0/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {
"related": ".xml"
}
},
"frameworkReferences": [
"Microsoft.AspNetCore.App"
]
},
"Microsoft.AspNetCore.Routing.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Http.Abstractions": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.Bcl.AsyncInterfaces/8.0.0": {
"type": "package",
"compile": {
"lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": {
"related": ".xml"
}
}
},
"Microsoft.Bcl.TimeProvider/8.0.1": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "8.0.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.Bcl.TimeProvider.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Bcl.TimeProvider.dll": {
"related": ".xml"
}
},
"build": {
"buildTransitive/net6.0/_._": {}
}
},
"Microsoft.CSharp/4.7.0": {
"type": "package",
"compile": {
"ref/netcoreapp2.0/_._": {}
},
"runtime": {
"lib/netcoreapp2.0/_._": {}
}
},
"Microsoft.Extensions.Primitives/2.2.0": {
"type": "package",
"dependencies": {
"System.Memory": "4.5.1",
"System.Runtime.CompilerServices.Unsafe": "4.5.1"
},
"compile": {
"lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Abstractions/8.3.0": {
"type": "package",
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.JsonWebTokens/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.TimeProvider": "8.0.1",
"Microsoft.IdentityModel.Tokens": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Logging/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Logging.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Logging.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Tokens/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.TimeProvider": "8.0.1",
"Microsoft.IdentityModel.Logging": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Tokens.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Tokens.dll": {
"related": ".xml"
}
}
},
"Microsoft.Net.Http.Headers/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0",
"System.Buffers": "4.5.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": {
"related": ".xml"
}
}
},
"Newtonsoft.Json/13.0.3": {
"type": "package",
"compile": {
"lib/net6.0/Newtonsoft.Json.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Newtonsoft.Json.dll": {
"related": ".xml"
}
}
},
"Newtonsoft.Json.Bson/1.0.2": {
"type": "package",
"dependencies": {
"Newtonsoft.Json": "12.0.1"
},
"compile": {
"lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {
"related": ".pdb;.xml"
}
},
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {
"related": ".pdb;.xml"
}
}
},
"System.Buffers/4.5.0": {
"type": "package",
"compile": {
"ref/netcoreapp2.0/_._": {}
},
"runtime": {
"lib/netcoreapp2.0/_._": {}
}
},
"System.IdentityModel.Tokens.Jwt/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "8.3.0",
"Microsoft.IdentityModel.Tokens": "8.3.0"
},
"compile": {
"lib/net6.0/System.IdentityModel.Tokens.Jwt.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/System.IdentityModel.Tokens.Jwt.dll": {
"related": ".xml"
}
}
},
"System.Memory/4.5.1": {
"type": "package",
"compile": {
"ref/netcoreapp2.1/_._": {}
},
"runtime": {
"lib/netcoreapp2.1/_._": {}
}
},
"System.Runtime.CompilerServices.Unsafe/4.5.1": {
"type": "package",
"compile": {
"ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {
"related": ".xml"
}
}
},
"System.Text.Encodings.Web/4.5.0": {
"type": "package",
"compile": {
"lib/netstandard2.0/System.Text.Encodings.Web.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/System.Text.Encodings.Web.dll": {
"related": ".xml"
}
}
}
} }
}, },
"libraries": { "libraries": {
@ -966,6 +1313,11 @@
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json"
} }
},
"runtimes": {
"linux-x64": {
"#import": []
}
} }
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "LaqeB//Jw3s=", "dgSpecHash": "3ako2ejS1i8=",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [

View File

@ -22,10 +22,19 @@ namespace YD_XinWei.Api.AutoMappers
CreateMap<TrainViolationsBODto, XW_TrainViolationsBO>(); CreateMap<TrainViolationsBODto, XW_TrainViolationsBO>();
CreateMap<XW_SportsTestData, TrainDto>(); CreateMap<XW_SportsTestData, TrainDto>();
CreateMap<XW_SunshineRunTrain, TrainDto>(MemberList.None)
.ForMember(destination => destination.OrgId, options => options.MapFrom(source => ParseNullableInt(source.OrgId)))
.ForMember(destination => destination.GradeId, options => options.MapFrom(source => ParseNullableInt(source.GradeId)))
.ForMember(destination => destination.ClassId, options => options.MapFrom(source => ParseNullableInt(source.ClassId)));
CreateMap<XW_TrainStudents, TrainStudentsDto>(); CreateMap<XW_TrainStudents, TrainStudentsDto>();
CreateMap<XW_TrainSetting, TrainSettingDto>(); CreateMap<XW_TrainSetting, TrainSettingDto>();
CreateMap<XW_TrainViolationsBO, TrainViolationsBODto>(); CreateMap<XW_TrainViolationsBO, TrainViolationsBODto>();
} }
private static int? ParseNullableInt(string? value)
{
return int.TryParse(value, out var result) ? result : null;
}
} }
} }

View File

@ -126,17 +126,17 @@ namespace YD_XinWei.Api.Controllers
} }
/// <summary> /// <summary>
/// 中长跑 /// 阳光跑-兼容接口
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("/addTrain")] [Route("/addTrain")]
public async Task<bool> AddTrain1([FromBody] AddTrainDto dto) public async Task<TrainDto> AddTrain1([FromBody] List<AddSunshineRunTrainDto> dto)
{ {
Console.WriteLine("开始上传"); Console.WriteLine("开始上传");
var res = await _xinWeiService.AddTrain(dto); var res = await _xinWeiService.AddSunshineRunTrain(dto);
return res != null; return res;
} }
/// <summary> /// <summary>
@ -283,7 +283,7 @@ namespace YD_XinWei.Api.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("/addSunshineRunTrain")] [Route("/addSunshineRunTrain")]
public async Task<bool> AddSunshineRunTrain([FromBody] List<AddSunshineRunTrainDto> dto) public async Task<TrainDto> AddSunshineRunTrain([FromBody] List<AddSunshineRunTrainDto> dto)
{ {
var res = await _xinWeiService.AddSunshineRunTrain(dto); var res = await _xinWeiService.AddSunshineRunTrain(dto);
return res; return res;

View File

@ -19,7 +19,7 @@ namespace YD_XinWei.Api
{ {
serverOptions.Limits.MaxRequestBodySize = 10485760; serverOptions.Limits.MaxRequestBodySize = 10485760;
}); });
webBuilder.UseKestrel().UseUrls("http://*:9995"); webBuilder.UseKestrel().UseUrls("http://*:9994");
webBuilder.UseIIS(); webBuilder.UseIIS();
webBuilder.UseStartup<Startup>(); webBuilder.UseStartup<Startup>();
}).UseServiceProviderFactory(new AutofacServiceProviderFactory()); }).UseServiceProviderFactory(new AutofacServiceProviderFactory());

View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Users\tangl\Desktop\web</_PublishTargetUrl> <_PublishTargetUrl>C:\Users\tangl\Desktop\web</_PublishTargetUrl>
<History>True|2026-08-26T07:28:01.0167026Z||;True|2026-08-21T09:25:02.7445663+08:00||;True|2026-08-21T09:23:09.4914463+08:00||;True|2026-04-29T15:30:29.9803729+08:00||;True|2026-04-29T15:30:25.0446614+08:00||;True|2026-04-29T15:24:59.1010013+08:00||;True|2026-04-29T15:21:11.3489900+08:00||;True|2026-04-23T17:06:00.3148252+08:00||;True|2026-04-23T16:54:15.8516208+08:00||;True|2026-04-23T15:54:16.0702517+08:00||;True|2026-04-23T14:00:21.4491439+08:00||;True|2026-04-23T13:18:25.4888118+08:00||;True|2026-04-22T17:35:01.3476820+08:00||;True|2026-04-22T14:07:52.2979195+08:00||;True|2026-04-22T13:44:11.8055673+08:00||;True|2026-03-26T09:36:12.2726866+08:00||;True|2026-03-26T09:35:27.8192013+08:00||;True|2026-03-26T09:33:38.0526039+08:00||;True|2026-03-26T09:33:28.9924413+08:00||;True|2026-02-28T14:59:17.0819929+08:00||;True|2026-01-08T07:24:14.4026431+08:00||;True|2026-01-07T18:25:08.0906165+08:00||;True|2026-01-07T18:24:54.3973422+08:00||;True|2026-01-07T17:31:39.5873521+08:00||;True|2026-01-07T17:26:57.1353433+08:00||;True|2026-01-07T17:17:01.3820547+08:00||;True|2026-01-07T16:55:51.1046754+08:00||;True|2026-01-07T16:48:30.7855668+08:00||;True|2026-01-07T16:37:17.5809765+08:00||;False|2026-01-07T16:35:45.5939040+08:00||;False|2026-01-07T16:30:28.3549091+08:00||;True|2025-04-03T15:07:55.2812036+08:00||;True|2025-03-18T10:41:46.9539024+08:00||;True|2025-03-18T09:03:55.5838708+08:00||;True|2025-03-17T12:30:21.5399192+08:00||;True|2025-03-17T11:54:27.3261861+08:00||;True|2025-03-17T11:20:23.7942104+08:00||;True|2025-03-11T17:48:55.2957005+08:00||;False|2025-03-11T17:48:38.1452073+08:00||;True|2025-03-07T16:31:26.6256757+08:00||;True|2025-03-07T15:14:30.2549136+08:00||;True|2025-03-07T14:57:41.5400532+08:00||;True|2025-03-07T14:53:16.1364435+08:00||;False|2025-03-07T14:52:47.3342548+08:00||;False|2025-03-07T14:52:10.7452463+08:00||;False|2025-03-07T14:51:33.5424415+08:00||;True|2025-03-07T14:46:55.5807563+08:00||;True|2025-03-07T14:33:04.1266862+08:00||;True|2025-03-07T14:13:22.6999976+08:00||;True|2025-03-07T14:05:09.5133651+08:00||;False|2025-03-07T14:02:23.5093029+08:00||;False|2025-03-07T13:58:37.4496383+08:00||;True|2025-03-07T11:52:20.4578386+08:00||;True|2025-03-07T11:31:43.1972462+08:00||;True|2025-03-07T10:11:26.1562979+08:00||;True|2025-03-07T10:10:59.9440630+08:00||;True|2025-03-07T09:24:15.8595227+08:00||;True|2025-03-06T17:52:31.4924325+08:00||;True|2025-03-06T17:52:19.1631772+08:00||;True|2025-03-06T17:32:57.7195879+08:00||;True|2025-03-06T17:09:15.6877706+08:00||;True|2025-03-06T16:59:48.0866771+08:00||;True|2025-03-06T16:49:15.3348344+08:00||;True|2025-03-06T15:51:10.7923322+08:00||;True|2025-03-06T15:46:02.5442595+08:00||;True|2025-03-06T14:32:36.1899505+08:00||;True|2025-03-06T14:04:43.6692503+08:00||;True|2025-03-06T10:00:58.4898730+08:00||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;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||;</History> <History>True|2026-10-13T05:28:24.2039567Z||;True|2026-10-13T10:27:53.1689144+08:00||;True|2026-10-13T09:49:23.1327109+08:00||;True|2026-10-13T09:36:15.2131074+08:00||;True|2026-10-13T09:11:32.2425612+08:00||;True|2026-10-12T17:52:58.7045141+08:00||;True|2026-10-12T17:51:43.3921137+08:00||;True|2026-10-12T17:51:34.7716041+08:00||;True|2026-10-12T17:11:24.5251928+08:00||;True|2026-09-10T10:07:46.8685188+08:00||;True|2026-09-10T10:02:32.1054931+08:00||;True|2026-09-10T09:58:03.6597323+08:00||;True|2026-08-26T15:28:01.0167026+08:00||;True|2026-08-21T09:25:02.7445663+08:00||;True|2026-08-21T09:23:09.4914463+08:00||;True|2026-04-29T15:30:29.9803729+08:00||;True|2026-04-29T15:30:25.0446614+08:00||;True|2026-04-29T15:24:59.1010013+08:00||;True|2026-04-29T15:21:11.3489900+08:00||;True|2026-04-23T17:06:00.3148252+08:00||;True|2026-04-23T16:54:15.8516208+08:00||;True|2026-04-23T15:54:16.0702517+08:00||;True|2026-04-23T14:00:21.4491439+08:00||;True|2026-04-23T13:18:25.4888118+08:00||;True|2026-04-22T17:35:01.3476820+08:00||;True|2026-04-22T14:07:52.2979195+08:00||;True|2026-04-22T13:44:11.8055673+08:00||;True|2026-03-26T09:36:12.2726866+08:00||;True|2026-03-26T09:35:27.8192013+08:00||;True|2026-03-26T09:33:38.0526039+08:00||;True|2026-03-26T09:33:28.9924413+08:00||;True|2026-02-28T14:59:17.0819929+08:00||;True|2026-01-08T07:24:14.4026431+08:00||;True|2026-01-07T18:25:08.0906165+08:00||;True|2026-01-07T18:24:54.3973422+08:00||;True|2026-01-07T17:31:39.5873521+08:00||;True|2026-01-07T17:26:57.1353433+08:00||;True|2026-01-07T17:17:01.3820547+08:00||;True|2026-01-07T16:55:51.1046754+08:00||;True|2026-01-07T16:48:30.7855668+08:00||;True|2026-01-07T16:37:17.5809765+08:00||;False|2026-01-07T16:35:45.5939040+08:00||;False|2026-01-07T16:30:28.3549091+08:00||;True|2025-04-03T15:07:55.2812036+08:00||;True|2025-03-18T10:41:46.9539024+08:00||;True|2025-03-18T09:03:55.5838708+08:00||;True|2025-03-17T12:30:21.5399192+08:00||;True|2025-03-17T11:54:27.3261861+08:00||;True|2025-03-17T11:20:23.7942104+08:00||;True|2025-03-11T17:48:55.2957005+08:00||;False|2025-03-11T17:48:38.1452073+08:00||;True|2025-03-07T16:31:26.6256757+08:00||;True|2025-03-07T15:14:30.2549136+08:00||;True|2025-03-07T14:57:41.5400532+08:00||;True|2025-03-07T14:53:16.1364435+08:00||;False|2025-03-07T14:52:47.3342548+08:00||;False|2025-03-07T14:52:10.7452463+08:00||;False|2025-03-07T14:51:33.5424415+08:00||;True|2025-03-07T14:46:55.5807563+08:00||;True|2025-03-07T14:33:04.1266862+08:00||;True|2025-03-07T14:13:22.6999976+08:00||;True|2025-03-07T14:05:09.5133651+08:00||;False|2025-03-07T14:02:23.5093029+08:00||;False|2025-03-07T13:58:37.4496383+08:00||;True|2025-03-07T11:52:20.4578386+08:00||;True|2025-03-07T11:31:43.1972462+08:00||;True|2025-03-07T10:11:26.1562979+08:00||;True|2025-03-07T10:10:59.9440630+08:00||;True|2025-03-07T09:24:15.8595227+08:00||;True|2025-03-06T17:52:31.4924325+08:00||;True|2025-03-06T17:52:19.1631772+08:00||;True|2025-03-06T17:32:57.7195879+08:00||;True|2025-03-06T17:09:15.6877706+08:00||;True|2025-03-06T16:59:48.0866771+08:00||;True|2025-03-06T16:49:15.3348344+08:00||;True|2025-03-06T15:51:10.7923322+08:00||;True|2025-03-06T15:46:02.5442595+08:00||;True|2025-03-06T14:32:36.1899505+08:00||;True|2025-03-06T14:04:43.6692503+08:00||;True|2025-03-06T10:00:58.4898730+08:00||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@ -112,8 +112,8 @@ namespace YD_XinWei.Api.Services.Impl
ClassId = c.Id, ClassId = c.Id,
GradeId = g.Id, GradeId = g.Id,
RuleGradeId = g.Id, RuleGradeId = g.Id,
ClassName = c.ClassName,
GradeName = g.GradeName, GradeName = g.GradeName,
ClassName = $"{g.GradeName}-{c.ClassName}",
CardNo = new List<string>() CardNo = new List<string>()
}).ToListAsync(); }).ToListAsync();
@ -542,7 +542,7 @@ namespace YD_XinWei.Api.Services.Impl
} }
sportsTestValueEntity.Score = (float)(data.Score ?? 0); //sportsTestValueEntity.Score = (float)(data.Score ?? 0);
sportsTestValueEntity.SchoolCode = schoolCode; sportsTestValueEntity.SchoolCode = schoolCode;
sportsTestValueEntity.Sex = (int)data.Sex; sportsTestValueEntity.Sex = (int)data.Sex;
sportsTestValueEntity.DataSource = DataSource.XW; sportsTestValueEntity.DataSource = DataSource.XW;
@ -1249,10 +1249,10 @@ namespace YD_XinWei.Api.Services.Impl
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> AddSunshineRunTrain(List<AddSunshineRunTrainDto> dto) public async Task<TrainDto> AddSunshineRunTrain(List<AddSunshineRunTrainDto> dto)
{ {
if (dto == null || !dto.Any()) if (dto == null || !dto.Any())
return false; return null;
var entities = dto.Select(x => new XW_SunshineRunTrain var entities = dto.Select(x => new XW_SunshineRunTrain
{ {
@ -1268,7 +1268,11 @@ namespace YD_XinWei.Api.Services.Impl
InvalidDistance = x.InvalidDistance, InvalidDistance = x.InvalidDistance,
Times = x.Times, Times = x.Times,
InvalidTimes = x.InvalidTimes, InvalidTimes = x.InvalidTimes,
CreateTime = string.IsNullOrWhiteSpace(x.CreateTime) ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : x.CreateTime,
CreateTime = string.IsNullOrWhiteSpace(x.CreateTime)
? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
: x.CreateTime,
DetailInfo = x.DetailInfo?.Select(d => new XW_SunshineRunTrainDetail DetailInfo = x.DetailInfo?.Select(d => new XW_SunshineRunTrainDetail
{ {
Point = d.Point, Point = d.Point,
@ -1284,7 +1288,14 @@ namespace YD_XinWei.Api.Services.Impl
await _sportsContext.XW_SunshineRunTrain.AddRangeAsync(entities); await _sportsContext.XW_SunshineRunTrain.AddRangeAsync(entities);
return await _sportsContext.SaveChangesAsync() > 0; await _sportsContext.SaveChangesAsync();
var entity = entities[0];
var res = _mapper.Map<TrainDto>(entity);
Console.WriteLine("新增成功");
return res;
} }
/// <summary> /// <summary>

View File

@ -147,7 +147,7 @@ namespace YD_XinWei.Api.Services.Interface
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
Task<bool> AddSunshineRunTrain(List<AddSunshineRunTrainDto> dto); Task<TrainDto> AddSunshineRunTrain(List<AddSunshineRunTrainDto> dto);
/// <summary> /// <summary>
/// 上传阳光跑经过点位信息 /// 上传阳光跑经过点位信息

View File

@ -101,7 +101,7 @@ namespace VOL.Entity.DomainModels.XinWei
/// </summary> /// </summary>
[Display(Name = "GroupId")] [Display(Name = "GroupId")]
[Comment("组别")] [Comment("组别")]
public string GroupId { get; set; } public string? GroupId { get; set; }
/// <summary> /// <summary>
/// 老师ID /// 老师ID

View File

@ -31,8 +31,9 @@
"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6", "RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6",
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994", "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994",
"WeChat": { "WeChat": {

View File

@ -101,9 +101,9 @@
<param name="dto"></param> <param name="dto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:YD_XinWei.Api.Controllers.XinWeiController.AddTrain1(YD_XinWei.Commons.Dto.Open.AddTrainDto)"> <member name="M:YD_XinWei.Api.Controllers.XinWeiController.AddTrain1(System.Collections.Generic.List{YD_XinWei.Commons.Dto.Open.AddSunshineRunTrainDto})">
<summary> <summary>
中长跑 阳光跑-兼容接口
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<returns></returns> <returns></returns>

View File

@ -31,8 +31,9 @@
"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6", "RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6",
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994", "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994",
"WeChat": { "WeChat": {

View File

@ -15,7 +15,7 @@
], ],
"ReturnTypes": [ "ReturnTypes": [
{ {
"Type": "System.Boolean", "Type": "YD_XinWei.Commons.Dto.Open.TrainDto",
"MediaTypes": [ "MediaTypes": [
"text/plain", "text/plain",
"application/json", "application/json",
@ -35,13 +35,13 @@
"Parameters": [ "Parameters": [
{ {
"Name": "dto", "Name": "dto",
"Type": "YD_XinWei.Commons.Dto.Open.AddTrainDto", "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Open.AddSunshineRunTrainDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]",
"IsRequired": true "IsRequired": true
} }
], ],
"ReturnTypes": [ "ReturnTypes": [
{ {
"Type": "System.Boolean", "Type": "YD_XinWei.Commons.Dto.Open.TrainDto",
"MediaTypes": [ "MediaTypes": [
"text/plain", "text/plain",
"application/json", "application/json",

View File

@ -789,28 +789,40 @@
"tags": [ "tags": [
"XinWei" "XinWei"
], ],
"summary": "中长跑", "summary": "阳光跑-兼容接口",
"requestBody": { "requestBody": {
"description": "", "description": "",
"content": { "content": {
"application/json-patch+json": { "application/json-patch+json": {
"schema": { "schema": {
"$ref": "#/components/schemas/AddTrainDto" "type": "array",
"items": {
"$ref": "#/components/schemas/AddSunshineRunTrainDto"
}
} }
}, },
"application/json": { "application/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/AddTrainDto" "type": "array",
"items": {
"$ref": "#/components/schemas/AddSunshineRunTrainDto"
}
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/AddTrainDto" "type": "array",
"items": {
"$ref": "#/components/schemas/AddSunshineRunTrainDto"
}
} }
}, },
"application/*+json": { "application/*+json": {
"schema": { "schema": {
"$ref": "#/components/schemas/AddTrainDto" "type": "array",
"items": {
"$ref": "#/components/schemas/AddSunshineRunTrainDto"
}
} }
} }
} }
@ -821,17 +833,17 @@
"content": { "content": {
"text/plain": { "text/plain": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
}, },
"application/json": { "application/json": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
} }
} }
@ -1644,17 +1656,17 @@
"content": { "content": {
"text/plain": { "text/plain": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
}, },
"application/json": { "application/json": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"type": "boolean" "$ref": "#/components/schemas/TrainDto"
} }
} }
} }

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ba7ff9d46e66d1ef7128cd700b28a6d522c307e")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a826a3542ca0baafd972e3f53ede92c10db95f36")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
fa3f24f6284997e61497fb62d3017a5cc352863cdecabd45383cb110baea13cd 08a8d6a0646c1ec75bcbc8b09be323b46726af4313593146ea75d03ae8e71e3a

View File

@ -101,9 +101,9 @@
<param name="dto"></param> <param name="dto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:YD_XinWei.Api.Controllers.XinWeiController.AddTrain1(YD_XinWei.Commons.Dto.Open.AddTrainDto)"> <member name="M:YD_XinWei.Api.Controllers.XinWeiController.AddTrain1(System.Collections.Generic.List{YD_XinWei.Commons.Dto.Open.AddSunshineRunTrainDto})">
<summary> <summary>
中长跑 阳光跑-兼容接口
</summary> </summary>
<param name="dto"></param> <param name="dto"></param>
<returns></returns> <returns></returns>

View File

@ -31,8 +31,9 @@
"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6", "RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6",
"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
"CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994", "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994",
"WeChat": { "WeChat": {

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7e1b074fe2d1350d3b52ab93548df4fbe34eb3d3")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a826a3542ca0baafd972e3f53ede92c10db95f36")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
a3fa2d2674c7cd6bc9d117259aa4cff39aac6f97e603ddb2c9a1a3eea3b70286 08a8d6a0646c1ec75bcbc8b09be323b46726af4313593146ea75d03ae8e71e3a

View File

@ -1 +1 @@
382322b5b5d95a9238f1a7dbf5cff96c65e7787417c083c8f6cf1c2c985f4a76 743b07b41009206593c116afbd2ab53ccbdff3d9203fc7c667c7b8405adf957a

View File

@ -90,7 +90,7 @@
"privateAssets": "all" "privateAssets": "all"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json"
} }
}, },
"runtimes": { "runtimes": {
@ -230,7 +230,7 @@
"privateAssets": "all" "privateAssets": "all"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json"
} }
}, },
"runtimes": { "runtimes": {

View File

@ -4509,7 +4509,7 @@
"privateAssets": "all" "privateAssets": "all"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json"
} }
}, },
"runtimes": { "runtimes": {

View File

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "6VyhG/e2l7E=", "dgSpecHash": "7/AROm7gfsI=",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei\\YD_XinWei.Api.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [