From 2504afb19a16c9015e70b636083596b00a9403a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=AF=85?= <2667210109@qq.com> Date: Sat, 7 Dec 2024 23:57:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asg_form/Controllers/news.cs | 11 +++++--- asg_form/Controllers/schedule.cs | 47 ++++++++++++++++++++++++------- asg_form/Controllers/user_form.cs | 3 +- asg_form/return.cs | 12 ++++++-- 4 files changed, 56 insertions(+), 17 deletions(-) diff --git a/asg_form/Controllers/news.cs b/asg_form/Controllers/news.cs index 0ef6236..0a92754 100644 --- a/asg_form/Controllers/news.cs +++ b/asg_form/Controllers/news.cs @@ -120,10 +120,13 @@ namespace asg_form.Controllers { try { - TestDbContext ctx = new TestDbContext(); - ctx.news.Add(new T_news { Title = req_News.Title, msg = req_News.msg,Type=req_News.Type, FormName = user.UserName ,time=DateTime.Now.ToString()}); - ctx.SaveChanges(); - return "ok!"; + using (TestDbContext ctx = new TestDbContext()) + { + ctx.news.Add(new T_news { Title = req_News.Title, msg = req_News.msg, Type = req_News.Type, FormName = user.chinaname, time = DateTime.Now.ToString() }); + await ctx.SaveChangesAsync(); + return Ok(new TReturn() { code=200,msg="添加成功！"}); + } + } catch (Exception ex) { diff --git a/asg_form/Controllers/schedule.cs b/asg_form/Controllers/schedule.cs index 411767f..67a3c27 100644 --- a/asg_form/Controllers/schedule.cs +++ b/asg_form/Controllers/schedule.cs @@ -373,26 +373,53 @@ namespace asg_form.Controllers /// /// 获取我的竞猜 /// + /// 当前页数，默认为1 + /// 每页显示的记录数，默认为5 /// [Authorize] [Route("api/v1/game/mylog")] [HttpGet] - public async Task>> mylog() + public async Task>> MyLog(int page = 1, int pageSize = 5) { string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; - - TestDbContext test = new TestDbContext(); - var team = test.schlogs.Include(a=>a.team).Where(a=>a.userid==id).Take(5).ToList(); - foreach(var team_game in team) + using (var _context = new TestDbContext()) { - team_game.team.logs = null; + + // 查询数据并按时间倒序排列 + var query = _context.schlogs + .Include(a => a.team) + .Where(a => a.userid == id) + .OrderByDescending(a => a.Id); + + // 计算总记录数 + int totalItems = await query.CountAsync(); + + // 分页查询数据 + var data = await query + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToListAsync(); + + // 清除不必要的导航属性 + foreach (var log in data) + { + log.team.logs = null; + } + + // 返回分页结果 + return new PagedResult + { + Data = data, + Page = page, + PageSize = pageSize, + TotalItems = totalItems, + TotalPages = (int)Math.Ceiling(totalItems / (double)pageSize) + }; } - - return team ; - - + } + [Authorize] [Route("api/v1/game/final")] [HttpPost] diff --git a/asg_form/Controllers/user_form.cs b/asg_form/Controllers/user_form.cs index e0358dc..bb25023 100644 --- a/asg_form/Controllers/user_form.cs +++ b/asg_form/Controllers/user_form.cs @@ -112,11 +112,12 @@ namespace asg_form.Controllers { try { string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; - var ouser = userManager.Users.Include(a => a.haveform.role).FirstOrDefault(a => a.Id == id.ToInt64()); + var ouser = userManager.Users.Include(a=>a.haveform.events).Include(a => a.haveform.role).FirstOrDefault(a => a.Id == id.ToInt64()); foreach (var role in ouser.haveform.role) { role.form = null; } + ouser.haveform.events.forms=null; return Ok(ouser.haveform); } diff --git a/asg_form/return.cs b/asg_form/return.cs index 6ae4619..b183487 100644 --- a/asg_form/return.cs +++ b/asg_form/return.cs @@ -2,8 +2,8 @@ { public class TReturn { - public int Code { get; set; } - public object Msg { get; set; } + public int code { get; set; } + public object msg { get; set; } } public class TReturn_total @@ -11,4 +11,12 @@ public int Total { get; set; } public object Msg { get; set; } } + public class PagedResult + { + public List Data { get; set; } + public int Page { get; set; } + public int PageSize { get; set; } + public int TotalItems { get; set; } + public int TotalPages { get; set; } + } } From f70a88d3239a71367b75a6c7e754af48899c0af4 Mon Sep 17 00:00:00 2001 From: Wyxm <2849173390@qq.com> Date: Sun, 8 Dec 2024 01:21:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#=E4=BF=AE=E6=94=B9#?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asg_form/deleteMe.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 asg_form/deleteMe.cs diff --git a/asg_form/deleteMe.cs b/asg_form/deleteMe.cs new file mode 100644 index 0000000..fa6e781 --- /dev/null +++ b/asg_form/deleteMe.cs @@ -0,0 +1,7 @@ +namespace asg_form +{ + public class deleteMe + { + + } +} From ec424e75127a4a44a32475e4fd3abb2623e32c64 Mon Sep 17 00:00:00 2001 From: Wyxm <2849173390@qq.com> Date: Sun, 8 Dec 2024 01:26:54 +0800 Subject: [PATCH 3/3] 11 --- asg_form/deleteMe.cs | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 asg_form/deleteMe.cs diff --git a/asg_form/deleteMe.cs b/asg_form/deleteMe.cs deleted file mode 100644 index fa6e781..0000000 --- a/asg_form/deleteMe.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace asg_form -{ - public class deleteMe - { - - } -}