YD/YD_Event.Admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏接口对接

Browse Source
This commit is contained in:
马梓彭 2026-09-10 16:28:51 +08:00
parent bf2f6cfda7
commit 0b608b65c8
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
YD_Event.Application/Workbench/WorkbenchController.cs
View File

@ -679,7 +679,7 @@ public class WorkbenchController : IDynamicApiController
?? throw Oops.Bah("所选组别不属于当前赛事项目"); ?? throw Oops.Bah("所选组别不属于当前赛事项目");
var groupName = eventProjectGroup.GroupName; var groupName = eventProjectGroup.GroupName;
var results = await _resultRepository.AsQueryable() var rankingQuery = _resultRepository.AsQueryable()
.InnerJoin<EventSessionEntry>((r, e) => r.SessionEntryId == e.Id) .InnerJoin<EventSessionEntry>((r, e) => r.SessionEntryId == e.Id)
.InnerJoin<EventSession>((r, e, s) => e.SessionId == s.Id) .InnerJoin<EventSession>((r, e, s) => e.SessionId == s.Id)
.Where((r, e, s) => !r.DeleteMark && !e.DeleteMark && !s.DeleteMark && .Where((r, e, s) => !r.DeleteMark && !e.DeleteMark && !s.DeleteMark &&
@ -689,7 +689,17 @@ public class WorkbenchController : IDynamicApiController
e.GroupName == groupName) && e.GroupName == groupName) &&
// 只投屏有效成绩（已确认20/已投屏30/已更正40），排除DQ成绩 // 只投屏有效成绩（已确认20/已投屏30/已更正40），排除DQ成绩
(r.ResultStatus == 20 || r.ResultStatus == 30 || r.ResultStatus == 40) && (r.ResultStatus == 20 || r.ResultStatus == 30 || r.ResultStatus == 40) &&
!r.IsDisqualified) !r.IsDisqualified);
// 排名按大屏对应场地隔离，避免同项目同组别在多个场地比赛时串榜。
// 使用显式分支和值类型局部变量，避免 nullable 条件被 SqlSugar 翻译成非法 SQL。
if (input.VenueId.HasValue)
{
var venueId = input.VenueId.Value;
rankingQuery = rankingQuery.Where((r, e, s) => s.VenueId == venueId);
}
var results = await rankingQuery
.OrderBy((r, e, s) => r.Rank) .OrderBy((r, e, s) => r.Rank)
.Select((r, e, s) => new .Select((r, e, s) => new
{ {

1
YD_Event.Application/applicationsettings.json
View File

@ -54,7 +54,6 @@
"dbconfig": { "dbconfig": {
"ConnectionStrings": [ "ConnectionStrings": [
"8.153.108.90,Password=yd708090,SyncTimeout=15000,ConnectTimeout=15000,ResponseTimeout=15000,defaultDatabase=7,poolsize=100,ssl=false,writeBuffer=10240,idleTimeout=30000,connectRetry=3,asyncPipeline=false" "8.153.108.90,Password=yd708090,SyncTimeout=15000,ConnectTimeout=15000,ResponseTimeout=15000,defaultDatabase=7,poolsize=100,ssl=false,writeBuffer=10240,idleTimeout=30000,connectRetry=3,asyncPipeline=false"
//"8.153.108.90,Password=yd708090,SyncTimeout=15000,ConnectTimeout=15000,ResponseTimeout=15000,defaultDatabase=8,poolsize=100,ssl=false,writeBuffer=10240,idleTimeout=30000,connectRetry=3,asyncPipeline=false"
], ],
//"Sentinels": [ //"Sentinels": [
// "192.169.1.10:26379", // "192.169.1.10:26379",

4
YD_Event.Core/InitData/sysmenu.txt
View File

@ -2128,7 +2128,7 @@
"ParentId": 1086, "ParentId": 1086,
"RouteName": "scoringCast", "RouteName": "scoringCast",
"Path": "/scoring/cast", "Path": "/scoring/cast",
"Component": "scoring/workbench/index", "Component": "scoring/screen/index",
"Redirect": "", "Redirect": "",
"Icon": "ele-DataLine", "Icon": "ele-DataLine",
"IsIframe": "0", "IsIframe": "0",
@ -2138,7 +2138,7 @@
"IsFixed": "0", "IsFixed": "0",
"Status": 0, "Status": 0,
"Sort": 4, "Sort": 4,
"Remark": "成绩投屏操作台", "Remark": "成绩投屏大屏",
"DeleteMark": false, "DeleteMark": false,
"CreatedUserId": 1000, "CreatedUserId": 1000,
"CreatedTime": "2023-06-01T00:00:00" "CreatedTime": "2023-06-01T00:00:00"