diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs b/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs index 00de5d1..9a149ed 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs +++ b/WcsMain/Business/CirculationTask/CommonCirculation/DataClear.cs @@ -39,10 +39,17 @@ public class DataClear(ClearData clearData) // 清理WMS任务表 -- 保留多少天 int apiWmsTaskCount = _clearData.ClearWmsTaskData(30); ConsoleLog.Tip(apiWmsTaskCount > 0, $"[数据清理]WMS任务记录:{apiWmsTaskCount}"); + + // 清理电子标签任务 + int clearElTagCount = _clearData.ClearElTagTaskData(30); + ConsoleLog.Tip(clearElTagCount > 0, $"[数据清理]电子标签任务记录:{apiWmsTaskCount}"); + + + } catch (Exception ex) { - ConsoleLog.Error($"[数据清理]线程发生异常,异常信息:{ex}"); + ConsoleLog.Exception($"【数据清理】线程发生异常,异常信息:{ex}"); } diff --git a/WcsMain/Business/CommonAction/ClearData.cs b/WcsMain/Business/CommonAction/ClearData.cs index 3728b9e..bc6bad5 100644 --- a/WcsMain/Business/CommonAction/ClearData.cs +++ b/WcsMain/Business/CommonAction/ClearData.cs @@ -8,14 +8,16 @@ namespace WcsMain.Business.CommonAction; /// 清理数据类 /// [Component] -public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppApiRequestDao apiRequestDao, AppApiAcceptDao apiAcceptDao) +public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppApiRequestDao apiRequestDao, + AppApiAcceptDao apiAcceptDao, AppElTagTaskDao elTagTaskDao, AppConveyTaskDao conveyTaskDao) { private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao; private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao; private readonly AppApiRequestDao _apiRequestDao = apiRequestDao; private readonly AppApiAcceptDao _apiAcceptDao = apiAcceptDao; - + private readonly AppElTagTaskDao _elTagTaskDao = elTagTaskDao; + private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao; /* 定时清除 WMS 任务表 */ @@ -23,22 +25,43 @@ public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppAp /// 清理超过一定时间的 WMS 任务表数据 /// /// - public int ClearWmsTaskData(int days) - { - return _wmsTaskDao.ClearData(days); - - } - + public int ClearWmsTaskData(int days) => _wmsTaskDao.ClearData(days); /* 定时清除 WCS 任务备份表 */ /// /// 清理超过一定天数的 WCS 任务备份表数据 /// /// - public int ClearWcsTaskData(int days) - { - return _wcsTaskDao.ClearData(days); - } + public int ClearWcsTaskData(int days) => _wcsTaskDao.ClearData(days); + + /* 定时清除接口请求表 */ + /// + /// 清理接口发送信息表 + /// + /// + public int ClearApiRequestData(int days) => _apiRequestDao.ClearData(days); + + /* 定时清除接口接收表 */ + /// + /// 清理接口接收信息表 + /// + /// + public int ClearApiAcceptData(int days) => _apiAcceptDao.ClearData(days); + + /// + /// 清理多少天之前的电子标签任务 + /// + /// + /// + public int ClearElTagTaskData(int days) => _elTagTaskDao.ClearData(days); + + /// + /// 清理输送线任务 + /// + /// + /// + public int ClearConveyTask(int days) => _conveyTaskDao.ClearData(days); + /* 定时清除 日志文件 */ /// @@ -77,28 +100,6 @@ public class ClearData(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao, AppAp return clearCount; } - /* 定时清除接口请求表 */ - /// - /// 清理接口发送信息表 - /// - /// - public int ClearApiRequestData(int days) - { - return _apiRequestDao.ClearData(days); - } - - - - /* 定时清除接口接收表 */ - /// - /// 清理接口接收信息表 - /// - /// - public int ClearApiAcceptData(int days) - { - return _apiAcceptDao.ClearData(days); - } - } \ No newline at end of file diff --git a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs index 4e4a7f4..1a882e0 100644 --- a/WcsMain/DataBase/Dao/AppConveyTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppConveyTaskDao.cs @@ -32,6 +32,43 @@ public class AppConveyTaskDao return 0; } } + + + + + + + + + + + + + + + /*************************************** 业务 **************************************************/ + + + + /// + /// 清理数据 + /// + /// + /// + public int ClearData(int days) + { + try + { + var sqlFuc = CommonTool.DbServe.Deleteable() + .Where(w => w.CreateTime < DateTime.Now.AddDays(-days)); + return sqlFuc.ExecuteCommand(); + } + catch(Exception ex) + { + _ = ex; + return 0; + } + } } diff --git a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs index 53451ee..737c615 100644 --- a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs @@ -157,4 +157,25 @@ public class AppElTagTaskDao } + /// + /// 清理多少天之前的数据 + /// + /// + /// + public int ClearData(int days) + { + try + { + var sqlFuc = CommonTool.DbServe.Deleteable() + .Where(w => w.CreateTime < DateTime.Now.AddDays(-days)); + return sqlFuc.ExecuteCommand(); + } + catch (Exception ex) + { + _ = ex; + return default; + } + } + + }