From 56e210d9c0d6b6c6a4698b74766bbb743c4dbe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Thu, 10 Apr 2025 18:46:01 +0800 Subject: [PATCH] 1 --- asg_form/Controllers/admin.cs | 9 ++--- asg_form/Controllers/user_form.cs | 60 ++++++++++--------------------- asg_form/User.cs | 1 - 3 files changed, 22 insertions(+), 48 deletions(-) diff --git a/asg_form/Controllers/admin.cs b/asg_form/Controllers/admin.cs index 8a9d381..7b0768a 100644 --- a/asg_form/Controllers/admin.cs +++ b/asg_form/Controllers/admin.cs @@ -467,16 +467,13 @@ public async Task> GetAdminUsersV2(string? keyword = nu { if (this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) { - - var ouser = await userManager.FindByIdAsync(userid); + var ouser = await userManager.FindByIdAsync(userid); + ouser.officium = opname; - - if(ouser.joinTime == null) ouser.joinTime = DateTime.Now.ToString(); - await userManager.UpdateAsync(ouser); - return Ok(new { code = 200, message = "成功" }); + return "成功!"; } else { diff --git a/asg_form/Controllers/user_form.cs b/asg_form/Controllers/user_form.cs index 5525c79..fc2de9d 100644 --- a/asg_form/Controllers/user_form.cs +++ b/asg_form/Controllers/user_form.cs @@ -1,15 +1,14 @@ using Manganese.Text; -using Masuit.Tools; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using SharpCompress.Archives; +<<<<<<< HEAD +======= using System.Data; +>>>>>>> parent of 5dc3041 (排行榜) using System.Security.Claims; using static asg_form.blog; -using static asg_form.Controllers.user_form; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace asg_form.Controllers { @@ -188,52 +187,31 @@ namespace asg_form.Controllers } - public class timeSet - { - public string joinTime { get; set; } - } - public class userRanking - { - public long userId { get; set; } - public string username { get; set; } - public string joinTime { get; set; } - } +<<<<<<< HEAD +======= /// - /// 解说排行榜 + /// 职位时间设置接口 /// /// - [Route("api/v1/user/ranking")] - [HttpGet] - public async Task> rankingList(short page = 1, short limit = 10) + [Authorize] + [Route("api/v1/user/settime")] + [HttpPost] + public async Task> settime([FromBody] timeSet msg) { - try + + string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; + var user = await userManager.FindByIdAsync(userId); + if(user.officium != "Commentator") { - DateTime currentTime = DateTime.Now; - - var rankings = userManager.Users - .Where(u => u.joinTime != null && u.officium == "Commentator") - .OrderByDescending(u => (currentTime - u.joinTime.ToDateTime()).TotalSeconds) - .Skip((page - 1) * limit) - .Take(limit) - .Select(u => new userRanking - { - userId = u.Id, - username = u.chinaname, - joinTime = u.joinTime, - }) - .ToList(); - - return Ok(new { code = 200, message = "", rankings }); + return Ok(new { code = 200, message = "你不是解说,不参与排名!" }); } - catch (Exception ex) - { - return StatusCode(500, new { code = 500, message = "获取排行榜失败", error = ex.Message }); - } - + user.joinTime = msg.joinTime; + await userManager.UpdateAsync(user); + return Ok(new { code = 200, message = "你成功修改了自己加入ASG的时间!" }); +>>>>>>> parent of 5dc3041 (排行榜) } - } } diff --git a/asg_form/User.cs b/asg_form/User.cs index 27d09da..00dcfe1 100644 --- a/asg_form/User.cs +++ b/asg_form/User.cs @@ -29,7 +29,6 @@ namespace asg_form //public List? Roles { get; set; } public string? roleListName { get; set; } public string? roleListCode { get; set; } - public string? joinTime { get; set; } } public class Role : IdentityRole