diff --git a/WeChatApplet/Context/SmartSportsContext.cs b/WeChatApplet/Context/SmartSportsContext.cs index b5d6460..6a4acb5 100644 --- a/WeChatApplet/Context/SmartSportsContext.cs +++ b/WeChatApplet/Context/SmartSportsContext.cs @@ -46,6 +46,10 @@ namespace YD_WeChatApplet.Context public DbSet StadiumVisiting { get; set; } public DbSet SchoolAccountApplication { get; set; } public DbSet CurricularPurchaseRecord { get; set; } + + public DbSet JS_Special { get; set; } + public DbSet JS_SpecialAction { get; set; } + public DbSet JS_SpecialLevel { get; set; } } } diff --git a/WeChatApplet/Controllers/FrameworkController.cs b/WeChatApplet/Controllers/FrameworkController.cs index 46a9d41..571292d 100644 --- a/WeChatApplet/Controllers/FrameworkController.cs +++ b/WeChatApplet/Controllers/FrameworkController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using YD_WeChatApplet.Api.Services.Interface; using YD_WeChatApplet.Commons.Dto.HomeWork; using YD_WeChatApplet.Commons.Dto.Patriarch; @@ -12,6 +13,7 @@ namespace YD_WeChatApplet.Api.Controllers [ApiController] [ApiExplorerSettings(GroupName = "v1")] [Route("[controller]")] + [AllowAnonymous] public class FrameworkController : ControllerBase { private readonly IFrameworkService _frameworkService; @@ -24,11 +26,13 @@ namespace YD_WeChatApplet.Api.Controllers /// Ai一体机扫描登录 /// /// + /// + /// /// [HttpPost("ScanCodeLogin")] - public async Task ScanCodeLogin(string code) + public async Task ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null) { - return await _frameworkService.ScanCodeLogin(code); + return await _frameworkService.ScanCodeLogin(code, schoolCode, teacherNo); } } } \ No newline at end of file diff --git a/WeChatApplet/Services/Impl/FrameworkService.cs b/WeChatApplet/Services/Impl/FrameworkService.cs index 8a839e5..e5eeeda 100644 --- a/WeChatApplet/Services/Impl/FrameworkService.cs +++ b/WeChatApplet/Services/Impl/FrameworkService.cs @@ -18,16 +18,26 @@ namespace YD_WeChatApplet.Api.Services.Impl _sportsContext = sportsContext; } - /// /// Ai一体机扫描登录 /// /// + /// + /// /// - public async Task ScanCodeLogin(string code) + public async Task ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null) { - var schoolCode = UserLoginContext.Current.SchoolCode; - //var teacherId = UserLoginContext.Current.UserId; + // 如果 schoolCode 为空,则取当前登录用户的 SchoolCode + if (string.IsNullOrWhiteSpace(schoolCode)) + { + schoolCode = UserLoginContext.Current.SchoolCode; + } + + // 如果 teacherNo 为空,则取当前登录用户的 UserNo + if (string.IsNullOrWhiteSpace(teacherNo)) + { + teacherNo = UserLoginContext.Current.UserNo; + } // 先检查是否已存在相同的记录 var exist = await _sportsContext.Ai_ScanCodeLogin @@ -42,13 +52,12 @@ namespace YD_WeChatApplet.Api.Services.Impl Code = code, SchoolCode = schoolCode, TeacherId = 0, - TeacherPhoneNo = UserLoginContext.Current.UserNo, + TeacherPhoneNo = teacherNo, CreateDate = DateTime.Now }; await _sportsContext.AddAsync(entity); return await _sportsContext.SaveChangesAsync() > 0; } - } } diff --git a/WeChatApplet/Services/Impl/ResourceService.cs b/WeChatApplet/Services/Impl/ResourceService.cs index 8dbcb6d..8fb2aa9 100644 --- a/WeChatApplet/Services/Impl/ResourceService.cs +++ b/WeChatApplet/Services/Impl/ResourceService.cs @@ -124,8 +124,8 @@ namespace YD_WeChatApplet.Api.Services.Impl /// public async Task> SpecialLevelList() { - var specials = await _sportsContext.Ai_Special.ToListAsync(); - var levels = await _sportsContext.Ai_SpecialLevel + var specials = await _sportsContext.JS_Special.ToListAsync(); + var levels = await _sportsContext.JS_SpecialLevel .Where(s => specials.Select(x => x.Id).Contains(s.SpecialId)) .Include(s => s.SpecialActionList) .ToListAsync(); diff --git a/WeChatApplet/Services/Interface/IFrameworkService.cs b/WeChatApplet/Services/Interface/IFrameworkService.cs index 42a772b..c323ad5 100644 --- a/WeChatApplet/Services/Interface/IFrameworkService.cs +++ b/WeChatApplet/Services/Interface/IFrameworkService.cs @@ -9,7 +9,9 @@ /// Ai一体机扫描登录 /// /// + /// + /// /// - Task ScanCodeLogin(string code); + Task ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null); } } diff --git a/WeChatApplet/SmartSportsEntitys/JS_SpecialAction.cs b/WeChatApplet/SmartSportsEntitys/JS_SpecialAction.cs index 807f6f4..c4cf94b 100644 --- a/WeChatApplet/SmartSportsEntitys/JS_SpecialAction.cs +++ b/WeChatApplet/SmartSportsEntitys/JS_SpecialAction.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using YD_WeChatApplet.Commons.Enum; namespace YD_WeChatApplet.Api.SmartSportsEntitys { [Table("JS_SpecialAction")]