diff --git a/WeChatApplet/Controllers/FrameworkController.cs b/WeChatApplet/Controllers/FrameworkController.cs index 46a9d41..ccda551 100644 --- a/WeChatApplet/Controllers/FrameworkController.cs +++ b/WeChatApplet/Controllers/FrameworkController.cs @@ -24,11 +24,12 @@ namespace YD_WeChatApplet.Api.Controllers /// Ai一体机扫描登录 /// /// + /// /// [HttpPost("ScanCodeLogin")] - public async Task ScanCodeLogin(string code) + public async Task ScanCodeLogin(string code, string teacherNo) { - return await _frameworkService.ScanCodeLogin(code); + return await _frameworkService.ScanCodeLogin(code, teacherNo); } } } \ No newline at end of file diff --git a/WeChatApplet/Services/Impl/FrameworkService.cs b/WeChatApplet/Services/Impl/FrameworkService.cs index f99e480..d586e6b 100644 --- a/WeChatApplet/Services/Impl/FrameworkService.cs +++ b/WeChatApplet/Services/Impl/FrameworkService.cs @@ -25,14 +25,14 @@ namespace YD_WeChatApplet.Api.Services.Impl /// /// /// - public async Task ScanCodeLogin(string code, string teacherNo) + public async Task ScanCodeLogin(string code,string teacherNo) { - //var schoolCode = UserLoginContext.Current.SchoolCode; + var schoolCode = UserLoginContext.Current.SchoolCode; //var teacherId = UserLoginContext.Current.UserId; // 先检查是否已存在相同的记录 var exist = await _sportsContext.Ai_ScanCodeLogin - .AnyAsync(x => x.Code == code && x.TeacherPhoneNo == teacherNo); + .AnyAsync(x => x.Code == code && x.SchoolCode == schoolCode); if (exist) return true; // 已存在,认为成功 @@ -41,7 +41,7 @@ namespace YD_WeChatApplet.Api.Services.Impl var entity = new Ai_ScanCodeLogin { Code = code, - SchoolCode = teacherNo, + SchoolCode = schoolCode, TeacherId = 0, TeacherPhoneNo = UserLoginContext.Current.PhoneNo, CreateDate = DateTime.Now diff --git a/WeChatApplet/Services/Impl/JingShiTiJiaoService.cs b/WeChatApplet/Services/Impl/JingShiTiJiaoService.cs index 117392e..46adcb3 100644 --- a/WeChatApplet/Services/Impl/JingShiTiJiaoService.cs +++ b/WeChatApplet/Services/Impl/JingShiTiJiaoService.cs @@ -4,6 +4,7 @@ using System.Text; using System.Threading.Channels; using YD_WeChatApplet.Api.Services.Interface; using YD_WeChatApplet.Api.Utilities; +using YD_WeChatApplet.Commons; using YD_WeChatApplet.Commons.Dto.JingShiTiJiao; using YD_WeChatApplet.Commons.Utils; @@ -48,9 +49,24 @@ namespace YD_WeChatApplet.Api.Services.Impl var data = JsonConvert.DeserializeObject>(json); if (data != null && data.Code == 0) { + string token = JwtHelper.IssueJwt(new UserInfoDto() + { + User_Id = -1, + UserName = data.Data.TeacherName, + Role_Id = 2, + PhoneNo = data.Data.TeacherNo, + SchoolCode = AppSettings.JingShiTiJiao.Channel, + UserNo = data.Data.TeacherNo + }); + + data.Data.Token = token; + return data.Data; } + + + return res; } @@ -131,7 +147,17 @@ namespace YD_WeChatApplet.Api.Services.Impl var data = JsonConvert.DeserializeObject>(json); if (data != null && data.Code == 0) { - return data.Data; + string token = JwtHelper.IssueJwt(new UserInfoDto() + { + User_Id = -1, + UserName = data.Data.StudentName, + Role_Id = 2, + PhoneNo = data.Data.TeacherNo, + SchoolCode = AppSettings.JingShiTiJiao.Channel, + UserNo = data.Data.StudentNo + }); + + data.Data.Token = token; } return res; diff --git a/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/JingShiResponse.cs b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/JingShiResponse.cs index 94e3af8..4584866 100644 --- a/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/JingShiResponse.cs +++ b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/JingShiResponse.cs @@ -41,6 +41,8 @@ namespace YD_WeChatApplet.Commons.Dto.JingShiTiJiao [JsonProperty("classList")] public List GradeList { get; set; } + + public string Token { get; set; } } public class GradeDto diff --git a/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/StudentDetailDto.cs b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/StudentDetailDto.cs index 7be0c73..5fd58fe 100644 --- a/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/StudentDetailDto.cs +++ b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/StudentDetailDto.cs @@ -44,5 +44,7 @@ namespace YD_WeChatApplet.Commons.Dto.JingShiTiJiao [JsonProperty("age")] public int Age { get; set; } + + public string Token { get; set; } } }