YD/YD_SmartSports.Api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

恢复被合并覆盖的上外贸代码

Browse Source
This commit is contained in:
tanglong 2026-06-01 10:20:29 +08:00
parent c6e7a018b0
commit b6e47c92b6
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs
View File

@ -8,11 +8,14 @@ using System.Drawing;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using VOL.Business.IServices.ShangWaiMao; using VOL.Business.IServices.ShangWaiMao;
using VOL.Business.IRepositories.ShangWaiMao;
using VOL.Core.Extensions.AutofacManager; using VOL.Core.Extensions.AutofacManager;
using VOL.Core.ManageUser; using VOL.Core.ManageUser;
using VOL.Entity.DomainModels; using VOL.Entity.DomainModels;
using VOL.Entity.Enum; using VOL.Entity.Enum;
using VOL.Model; using VOL.Model;
using VOL.Model.ShangWaiMao.Request;
using VOL.Model.ShangWaiMao.Response;
using VOL.System.IRepositories; using VOL.System.IRepositories;
namespace VOL.Business.Services.ShangWaiMao namespace VOL.Business.Services.ShangWaiMao
@ -25,11 +28,28 @@ namespace VOL.Business.Services.ShangWaiMao
private const int TrendStartColumn = 8; private const int TrendStartColumn = 8;
private readonly IS_StudentRepository _studentRepository; private readonly IS_StudentRepository _studentRepository;
private readonly ITempTccjRepository _tempTccjRepository;
[ActivatorUtilitiesConstructor] [ActivatorUtilitiesConstructor]
public ShangWaiMaoService(IS_StudentRepository studentRepository) public ShangWaiMaoService(IS_StudentRepository studentRepository, ITempTccjRepository tempTccjRepository)
{ {
_studentRepository = studentRepository; _studentRepository = studentRepository;
_tempTccjRepository = tempTccjRepository;
}
public Task<ShangWaiMaoTempTccjFilterOptions> GetTempTccjFilterOptionsAsync()
{
return _tempTccjRepository.GetFilterOptionsAsync();
}
public Task<PageDataDto<ShangWaiMaoTempTccjListItem>> GetTempTccjPageListAsync(ShangWaiMaoTempTccjPageParam paramDto)
{
return _tempTccjRepository.GetPageListAsync(paramDto);
}
public Task<ShangWaiMaoTempTccjDetailDto> GetTempTccjDetailAsync(ShangWaiMaoTempTccjDetailParam paramDto)
{
return _tempTccjRepository.GetDetailAsync(paramDto);
} }
public async Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto) public async Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto)
@ -142,12 +162,12 @@ namespace VOL.Business.Services.ShangWaiMao
var minuteData = BuildMinuteData(group, baseTime); var minuteData = BuildMinuteData(group, baseTime);
var duration = minuteData.Count == 0 ? 0 : minuteData.Keys.Max(); var duration = minuteData.Count == 0 ? 0 : minuteData.Keys.Max();
var avgHeartRate = (int)group.Average(x => x.Value); var avgHeartRate = Math.Round(group.Average(x => x.Value), 2);
var avgStrength = (int)group.Average(x => x.Strength); var avgStrength = Math.Round(group.Average(x => x.Strength), 2);
var density = group.Any() var density = group.Any()
? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 0) ? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 2)
: 0D; : 0D;
var totalConsumption = Math.Abs((int)group.Average(x => x.Consumption ?? 0)); var totalConsumption = Math.Round(group.Sum(x => (double)(x.Consumption ?? 0)), 2);
summarySheet.Cells[summaryRowIndex, 1].Value = group.Key.StudentName; summarySheet.Cells[summaryRowIndex, 1].Value = group.Key.StudentName;
summarySheet.Cells[summaryRowIndex, 2].Value = group.Key.StudentNo; summarySheet.Cells[summaryRowIndex, 2].Value = group.Key.StudentNo;

3
VOL.WebApi/appsettings.json
View File

@ -125,6 +125,9 @@
"SchoolCode": "202512240056", "SchoolCode": "202512240056",
"SportsItem": "JS010000" "SportsItem": "JS010000"
}, },
"SwmMySql": {
"ConnectionString": "Server=localhost;Port=3306;Database=swm_db;Uid=root;Pwd=yd708090;CharSet=utf8;AllowPublicKeyRetrieval=true;SslMode=None;"
},
"QuartzAccessKey": "65EC9387355E4717899C552963CE59FF", //定时任务的值,请自行修改 "QuartzAccessKey": "65EC9387355E4717899C552963CE59FF", //定时任务的值,请自行修改
"OriginalPwd": "000000" //初始密码 "OriginalPwd": "000000" //初始密码