From 2d5dcdcf8328cb71e4276720c2e4596cbba3ec49 Mon Sep 17 00:00:00 2001
From: tanglong <842690096@qq.com>
Date: Tue, 3 Feb 2026 16:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FrameworkController.cs        | 26 ++++++++++++++----
 .../Services/Impl/FrameworkService.cs         | 27 +++++--------------
 .../Services/Interface/IFrameworkService.cs   | 10 +++----
 .../Dto/JingShiTiJiao/ScanCodeLoginRequest.cs | 15 +++++++++++
 4 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 YD_WeChatApplet.Commons/Dto/JingShiTiJiao/ScanCodeLoginRequest.cs

diff --git a/WeChatApplet/Controllers/FrameworkController.cs b/WeChatApplet/Controllers/FrameworkController.cs
index 571292d..aa5cb28 100644
--- a/WeChatApplet/Controllers/FrameworkController.cs
+++ b/WeChatApplet/Controllers/FrameworkController.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using YD_WeChatApplet.Api.Services.Interface;
 using YD_WeChatApplet.Commons.Dto.HomeWork;
+using YD_WeChatApplet.Commons.Dto.JingShiTiJiao;
 using YD_WeChatApplet.Commons.Dto.Patriarch;
 using YD_WeChatApplet.Services;
 
@@ -25,14 +26,29 @@ namespace YD_WeChatApplet.Api.Controllers
         /// <summary>
         /// Ai一体机扫描登录
         /// </summary>
-        /// <param name="code"></param>
-        /// <param name="schoolCode"></param>
-        /// <param name="teacherNo"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("ScanCodeLogin")]
-        public async Task<bool> ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null)
+        public async Task<bool> ScanCodeLogin(ScanCodeLoginRequest request)
         {
-            return await _frameworkService.ScanCodeLogin(code, schoolCode, teacherNo);
+            if (request==null)
+            {
+                throw new Exception("参数为空!");
+            }
+            if (string.IsNullOrWhiteSpace(request.Code))
+            {
+                throw new Exception("设备编号为空!");
+            }
+            if (string.IsNullOrWhiteSpace(request.SchoolCode))
+            {
+                throw new Exception("学校编号为空!");
+            }
+            if (string.IsNullOrWhiteSpace(request.TeacherNo))
+            {
+                throw new Exception("老师编号为空!");
+            }
+
+            return await _frameworkService.ScanCodeLogin(request);
         }
     }
 }
\ No newline at end of file
diff --git a/WeChatApplet/Services/Impl/FrameworkService.cs b/WeChatApplet/Services/Impl/FrameworkService.cs
index e5eeeda..12f7fea 100644
--- a/WeChatApplet/Services/Impl/FrameworkService.cs
+++ b/WeChatApplet/Services/Impl/FrameworkService.cs
@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using YD_WeChatApplet.Api.Services.Interface;
 using YD_WeChatApplet.Api.SmartSportsEntitys;
 using YD_WeChatApplet.Api.Utilities;
+using YD_WeChatApplet.Commons.Dto.JingShiTiJiao;
 using YD_WeChatApplet.Context;
 
 namespace YD_WeChatApplet.Api.Services.Impl
@@ -21,27 +22,13 @@ namespace YD_WeChatApplet.Api.Services.Impl
         /// <summary>
         /// Ai一体机扫描登录
         /// </summary>
-        /// <param name="code"></param>
-        /// <param name="schoolCode"></param>
-        /// <param name="teacherNo"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<bool> ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null)
+        public async Task<bool> ScanCodeLogin(ScanCodeLoginRequest request)
         {
-            // 如果 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
-                .AnyAsync(x => x.Code == code && x.SchoolCode == schoolCode);
+                .AnyAsync(x => x.Code == request.Code && x.SchoolCode == request.SchoolCode);
 
             if (exist)
                 return true; // 已存在，认为成功
@@ -49,10 +36,10 @@ namespace YD_WeChatApplet.Api.Services.Impl
             // 不存在则添加
             var entity = new Ai_ScanCodeLogin
             {
-                Code = code,
-                SchoolCode = schoolCode,
+                Code = request.Code,
+                SchoolCode = request.SchoolCode,
                 TeacherId = 0,
-                TeacherPhoneNo = teacherNo,
+                TeacherPhoneNo = request.TeacherNo,
                 CreateDate = DateTime.Now
             };
 
diff --git a/WeChatApplet/Services/Interface/IFrameworkService.cs b/WeChatApplet/Services/Interface/IFrameworkService.cs
index c323ad5..6c9d9bb 100644
--- a/WeChatApplet/Services/Interface/IFrameworkService.cs
+++ b/WeChatApplet/Services/Interface/IFrameworkService.cs
@@ -1,4 +1,6 @@
-namespace YD_WeChatApplet.Api.Services.Interface
+using YD_WeChatApplet.Commons.Dto.JingShiTiJiao;
+
+namespace YD_WeChatApplet.Api.Services.Interface
 {
     /// <summary>
     /// 公共接口
@@ -8,10 +10,8 @@
         /// <summary>
         /// Ai一体机扫描登录
         /// </summary>
-        /// <param name="code"></param>
-        /// <param name="schoolCode"></param>
-        /// <param name="teacherNo"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
-        Task<bool> ScanCodeLogin(string code, string? schoolCode = null, string? teacherNo = null);
+        Task<bool> ScanCodeLogin(ScanCodeLoginRequest request);
     }
 }
diff --git a/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/ScanCodeLoginRequest.cs b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/ScanCodeLoginRequest.cs
new file mode 100644
index 0000000..4824641
--- /dev/null
+++ b/YD_WeChatApplet.Commons/Dto/JingShiTiJiao/ScanCodeLoginRequest.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YD_WeChatApplet.Commons.Dto.JingShiTiJiao
+{
+    public class ScanCodeLoginRequest
+    {
+        public string Code { get; set; } = null!;
+        public string SchoolCode { get; set; } = null!;
+        public string TeacherNo { get; set; } = null!;
+    }
+}