diff --git a/asg_form/Controllers/AssignmentController.cs b/asg_form/Controllers/AssignmentController.cs index 5142f13..d871b50 100644 --- a/asg_form/Controllers/AssignmentController.cs +++ b/asg_form/Controllers/AssignmentController.cs @@ -23,6 +23,7 @@ using Flandre.Core.Common; using System.Text.RegularExpressions; using System.Threading.Tasks; using static asg_form.Controllers.InviteReferee; +using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext; namespace asg_form.Controllers { @@ -145,11 +146,18 @@ namespace asg_form.Controllers { using (TestDbContext sub = new TestDbContext()) { + string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; + var user = await userManager.FindByIdAsync(userId); var task = sub.T_Task.Find(taskid); var dateString = DateTime.Now; task.status = "1"; task.lastOperateTime = dateString.ToString(); await sub.SaveChangesAsync(); + string mesg = $"[ASG管理系统]{user.chinaname}同学的任务:{task.taskName}已完成,请及时上后台系统审批。"; + string qqgroup = "925510646"; + var atuserqq = "3124961425"; + var message = new MessageBuilder().Add(new AtSegment(atuserqq)).Text(mesg).Build(); + await runbot.runbotr.SendMessageAsync(MessageEnvironment.Channel, qqgroup, null, message, qqgroup); return Ok(new error_mb { code = 200, message = "成功提交修改" }); } } diff --git a/asg_form/Controllers/Teamregistration/RegisterController.cs b/asg_form/Controllers/Teamregistration/RegisterController.cs index 8041416..5842ec2 100644 --- a/asg_form/Controllers/Teamregistration/RegisterController.cs +++ b/asg_form/Controllers/Teamregistration/RegisterController.cs @@ -6,6 +6,9 @@ using System.Security.Claims; using Microsoft.EntityFrameworkCore; using RestSharp.Extensions; using System.Threading.Tasks; +using Flandre.Core.Common; +using Flandre.Core.Messaging.Segments; +using Flandre.Core.Messaging; namespace asg_form.Controllers.Teamregistration { @@ -86,6 +89,11 @@ namespace asg_form.Controllers.Teamregistration }; sub.T_Comform.Add(rgst); await sub.SaveChangesAsync(); + string mesg = $"[ASG管理系统]有新解说申请,请及时上后台系统审批。"; + string qqgroup = "925510646"; + var atuserqq = "235593230"; + var message = new MessageBuilder().Add(new AtSegment(atuserqq)).Text(mesg).Build(); + await runbot.runbotr.SendMessageAsync(MessageEnvironment.Channel, qqgroup, null, message, qqgroup); return Ok(new error_mb { code = 200, message = "提交成功" }); } @@ -185,7 +193,7 @@ namespace asg_form.Controllers.Teamregistration var TotalRecords = await query.CountAsync(); var Tasks = await query - .OrderByDescending(a => a.status) + .OrderBy(a => a.status) .Skip((page - 1) * limit) .Take(limit) .ToListAsync(); diff --git a/asg_form/Controllers/schedule.cs b/asg_form/Controllers/schedule.cs index a8c2141..20f2c87 100644 --- a/asg_form/Controllers/schedule.cs +++ b/asg_form/Controllers/schedule.cs @@ -226,7 +226,10 @@ namespace asg_form.Controllers [HttpPut] public async Task> gamepush(int gameid,int teamid) { - + int wp = -1; + try + { + wp = 0; string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; TestDbContext test =new TestDbContext(); var team = test.team_Games.Include(a=>a.logs).Single(a=>a.id==gameid); @@ -237,7 +240,7 @@ namespace asg_form.Controllers } else - { + { if (teamid == 1) { team.team1_piaoshu++; @@ -254,9 +257,19 @@ namespace asg_form.Controllers return BadRequest(new error_mb { code = 400, message = "队伍id不合法" }); } + wp = 1; await test.SaveChangesAsync(); + wp = 2; + return Ok(new { code = 200, message = "投票成功" }); + } } - return "ok"; + catch (Exception ex) + { + var innerException = ex.InnerException ?? ex; // 如果没有 InnerException,使用 ex 本身 + // 记录错误信息 + return Ok(new { code = 500, message = "服务器错误", details = innerException.Message, wp }); + } + } ///