diff --git a/taskschedule/Tnb.TaskScheduler.Interfaces/ITimeTaskService.cs b/taskschedule/Tnb.TaskScheduler.Interfaces/ITimeTaskService.cs
index 765ae574..88626728 100644
--- a/taskschedule/Tnb.TaskScheduler.Interfaces/ITimeTaskService.cs
+++ b/taskschedule/Tnb.TaskScheduler.Interfaces/ITimeTaskService.cs
@@ -1,4 +1,6 @@
-namespace JNPF.TaskScheduler.Interfaces.TaskScheduler;
+using JNPF.TaskScheduler.Entitys;
+
+namespace JNPF.TaskScheduler.Interfaces.TaskScheduler;
///
/// 定时任务
@@ -13,4 +15,6 @@ public interface ITimeTaskService
/// 启动自启动任务.
///
void StartTimerJob();
+
+ List GetTasks();
}
diff --git a/taskschedule/Tnb.TaskScheduler/Listener/MoldMaintainTask.cs b/taskschedule/Tnb.TaskScheduler/Listener/MoldMaintainTask.cs
index ea0da118..64648af6 100644
--- a/taskschedule/Tnb.TaskScheduler/Listener/MoldMaintainTask.cs
+++ b/taskschedule/Tnb.TaskScheduler/Listener/MoldMaintainTask.cs
@@ -8,6 +8,7 @@ using JNPF.Common.Security;
using JNPF.Systems.Entitys.System;
using JNPF.TaskScheduler;
using JNPF.TaskScheduler.Entitys.Model;
+using JNPF.TaskScheduler.Interfaces.TaskScheduler;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities;
@@ -19,12 +20,14 @@ namespace Tnb.TaskScheduler.Listener
public class MoldMaintainTask : ISpareTimeWorker
{
private ISqlSugarRepository repository => App.GetService>();
+ private ITimeTaskService timeTaskService => App.GetService();
[SpareTime("0 0 0 * * ?", "生成模具保养任务", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)]
public async void CreateTask(SpareTimer timer, long count)
{
try
{
- var timeTaskEntity = await repository.AsSugarClient().Queryable().Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).FirstAsync();
+ var TimeTasks = timeTaskService.GetTasks();
+ var timeTaskEntity = TimeTasks.Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).First();
if (timeTaskEntity == null)
return;
ContentModel? comtentModel = timeTaskEntity.ExecuteContent.ToObject();
diff --git a/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs b/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs
index 00b15904..84aab7fe 100644
--- a/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs
+++ b/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs
@@ -9,6 +9,7 @@ using JNPF.Systems.Entitys.System;
using JNPF.TaskScheduler;
using JNPF.TaskScheduler.Entitys;
using JNPF.TaskScheduler.Entitys.Model;
+using JNPF.TaskScheduler.Interfaces.TaskScheduler;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.EquipMgr.Entities;
@@ -25,13 +26,14 @@ namespace Tnb.TaskScheduler.Listener
public class QcTaskTimeWorker : ISpareTimeWorker
{
private ISqlSugarRepository repository => App.GetService>();
-
+ private ITimeTaskService timeTaskService => App.GetService();
[SpareTime("0 0 0 * * ?", "生成质检任务", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)]
public async void CreateTask(SpareTimer timer, long count)
{
try
{
- var timeTaskEntity = await repository.AsSugarClient().Queryable().Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).FirstAsync();
+ var TimeTasks = timeTaskService.GetTasks();
+ var timeTaskEntity = TimeTasks.Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).First();
if (timeTaskEntity == null)
return;
ContentModel? comtentModel = timeTaskEntity.ExecuteContent.ToObject();
diff --git a/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs b/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
index 9b62e4c1..3390256d 100644
--- a/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
+++ b/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
@@ -136,6 +136,12 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
#endregion
#region Post
+ public List GetTasks()
+ {
+ var list= _repository.AsQueryable().ToList();
+ return list;
+ }
+
///
/// 新建.
diff --git a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
index 2f1f71d9..de030730 100644
--- a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
+++ b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
@@ -4,7 +4,6 @@
/////////////////////////////////////////////////////////////////////////////////
using JNPF.Common.Configuration;
-using JNPF.Systems.Entitys.Dto.Database;
using JNPF;
using Mapster;
using Microsoft.AspNetCore.Mvc;