From cfe60345d27e3bb4a55c4987016761ccddaadadc Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Wed, 14 May 2025 17:02:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E4=B8=BAsqlsugar?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/Jobs/OpenJobApp.cs               | 25 ++++++++-----------
 .../Controllers/OpenJobsController.cs         |  2 +-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/OpenAuth.App/Jobs/OpenJobApp.cs b/OpenAuth.App/Jobs/OpenJobApp.cs
index 9487ecd5..8b0155cd 100644
--- a/OpenAuth.App/Jobs/OpenJobApp.cs
+++ b/OpenAuth.App/Jobs/OpenJobApp.cs
@@ -8,21 +8,18 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using OpenAuth.App.Extensions;
 using OpenAuth.App.Interface;
-using OpenAuth.App.Jobs;
 using OpenAuth.App.Request;
 using OpenAuth.App.Response;
-using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
-using OpenAuth.Repository.Interface;
 using Quartz;
-
+using SqlSugar;
 
 namespace OpenAuth.App
 {
     /// <summary>
     /// 系统定时任务管理
     /// </summary>
-    public class OpenJobApp : BaseStringApp<OpenJob, OpenAuthDBContext>
+    public class OpenJobApp : SqlSugarBaseApp<OpenJob>
     {
         private SysLogApp _sysLogApp;
         private IScheduler _scheduler;
@@ -34,7 +31,7 @@ namespace OpenAuth.App
         public async Task<TableData> Load(QueryOpenJobListReq request)
         {
             var result = new TableData();
-            var objs = Repository.Find(null);
+            var objs = SugarClient.Queryable<OpenJob>();
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Id.Contains(request.key));
@@ -54,7 +51,7 @@ namespace OpenAuth.App
         /// <returns></returns>
         public async Task StartAll()
         {
-            var jobs = await Repository.Find(u => u.Status == (int) JobStatus.Running).ToListAsync();
+            var jobs = await SugarClient.Queryable<OpenJob>().Where(u => u.Status == (int) JobStatus.Running).ToListAsync();
             foreach (var job in jobs)
             {
                 job.Start(_scheduler);
@@ -69,13 +66,13 @@ namespace OpenAuth.App
             var user = _auth.GetCurrentUser().User;
             obj.CreateUserId = user.Id;
             obj.CreateUserName = user.Name;
-            Repository.Add(obj);
+            SugarClient.Insertable(obj).ExecuteCommand();
         }
 
         public void Update(AddOrUpdateOpenJobReq obj)
         {
             var user = _auth.GetCurrentUser().User;
-            UnitWork.Update<OpenJob>(u => u.Id == obj.Id, u => new OpenJob
+            Repository.Update(u => new OpenJob
             {
                 JobName = obj.JobName,
                 JobType = obj.JobType,
@@ -87,7 +84,7 @@ namespace OpenAuth.App
                 UpdateTime = DateTime.Now,
                 UpdateUserId = user.Id,
                 UpdateUserName = user.Name
-            });
+            },u => u.Id == obj.Id);
         }
 
         #region 定时任务运行相关操作
@@ -109,7 +106,7 @@ namespace OpenAuth.App
 
         public void ChangeJobStatus(ChangeJobStatusReq req)
         {
-            var job = Repository.FirstOrDefault(u => u.Id == req.Id);
+            var job = Repository.GetFirst(u => u.Id == req.Id);
             if (job == null)
             {
                 throw new Exception("任务不存在");
@@ -140,7 +137,7 @@ namespace OpenAuth.App
         /// <param name="jobId"></param>
         public void RecordRun(string jobId)
         {
-            var job = Repository.FirstOrDefault(u => u.Id == jobId);
+            var job = Repository.GetFirst(u => u.Id == jobId);
             if (job == null)
             {
                 _sysLogApp.Add(new SysLog
@@ -170,9 +167,7 @@ namespace OpenAuth.App
         #endregion
 
 
-        public OpenJobApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<OpenJob, OpenAuthDBContext> repository,
-            IAuth auth, SysLogApp sysLogApp, IScheduler scheduler, ILogger<OpenJobApp> logger) : base(unitWork,
-            repository, auth)
+        public OpenJobApp(ISqlSugarClient client, IAuth auth, SysLogApp sysLogApp, IScheduler scheduler, ILogger<OpenJobApp> logger) : base(client, auth)
         {
             _sysLogApp = sysLogApp;
             _scheduler = scheduler;
diff --git a/OpenAuth.WebApi/Controllers/OpenJobsController.cs b/OpenAuth.WebApi/Controllers/OpenJobsController.cs
index 21deb431..911ad47d 100644
--- a/OpenAuth.WebApi/Controllers/OpenJobsController.cs
+++ b/OpenAuth.WebApi/Controllers/OpenJobsController.cs
@@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
         /// <param name="obj"></param>
         /// <returns></returns>
        [HttpPost]
-        public Response Update(AddOrUpdateOpenJobReq obj)
+        public Response Update([FromBody]AddOrUpdateOpenJobReq obj)
         {
             var result = new Response();
             try