lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-18 13:26:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 调整为sqlsugar模式

Browse Source
This commit is contained in:
yubaolee 2025-05-14 17:02:35 +08:00
parent 0d098a9a29
commit cfe60345d2
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenAuth.App/Jobs/OpenJobApp.cs
View File

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

2
OpenAuth.WebApi/Controllers/OpenJobsController.cs
View File

@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
/// <param name="obj"></param> /// <param name="obj"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Response Update(AddOrUpdateOpenJobReq obj) public Response Update([FromBody]AddOrUpdateOpenJobReq obj)
{ {
var result = new Response(); var result = new Response();
try try