From 62b565f090c8532c8669e48fb07da942fbaab880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Tue, 20 Sep 2022 22:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrudTemplete/Repositories/IRepository.tpl | 5 -- .../CrudTemplete/Repositories/Repository.tpl | 46 +++---------------- .../CrudTemplete/Services/IServices.tpl | 5 -- .../CrudTemplete/Services/Services.tpl | 8 ---- 4 files changed, 6 insertions(+), 58 deletions(-) diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl index 0c967437..2899178e 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl @@ -76,11 +76,6 @@ namespace CoreCms.Net.IRepository /// Task> GetCaChe(); - /// - /// 更新cache - /// - Task> UpdateCaChe(); - #endregion diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl index f9bc77b5..7c67548a 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl @@ -45,13 +45,9 @@ namespace CoreCms.Net.Repository { var jm = new AdminUiCallBack(); - var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0; + var bl = await DbClient.Insertable(entity).RemoveDataCache().ExecuteReturnIdentityAsync() > 0; jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; - if (bl) - { - await UpdateCaChe(); - } return jm; } @@ -75,13 +71,9 @@ namespace CoreCms.Net.Repository {% for field in ModelFields %}oldModel.{{field.DbColumnName}} = entity.{{field.DbColumnName}}; {% endfor %} //事物处理过程结束 - var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync(); + var bl = await DbClient.Updateable(oldModel).RemoveDataCache().ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - if (bl) - { - await UpdateCaChe(); - } return jm; } @@ -95,13 +87,9 @@ namespace CoreCms.Net.Repository { var jm = new AdminUiCallBack(); - var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync(); + var bl = await DbClient.Updateable(entity).RemoveDataCache().ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - if (bl) - { - await UpdateCaChe(); - } return jm; } @@ -115,13 +103,9 @@ namespace CoreCms.Net.Repository { var jm = new AdminUiCallBack(); - var bl = await DbClient.Deleteable<{{ModelClassName}}>(id).ExecuteCommandHasChangeAsync(); + var bl = await DbClient.Deleteable<{{ModelClassName}}>(id).RemoveDataCache().ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - if (bl) - { - await UpdateCaChe(); - } return jm; } @@ -135,13 +119,9 @@ namespace CoreCms.Net.Repository { var jm = new AdminUiCallBack(); - var bl = await DbClient.Deleteable<{{ModelClassName}}>().In(ids).ExecuteCommandHasChangeAsync(); + var bl = await DbClient.Deleteable<{{ModelClassName}}>().In(ids).RemoveDataCache().ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; - if (bl) - { - await UpdateCaChe(); - } return jm; } @@ -156,21 +136,7 @@ namespace CoreCms.Net.Repository /// public async Task> GetCaChe() { - var cache = ManualDataCache.Instance.Get>(GlobalConstVars.Cache{{ModelClassName}}); - if (cache != null) - { - return cache; - } - return await UpdateCaChe(); - } - - /// - /// 更新cache - /// - public async Task> UpdateCaChe() - { - var list = await DbClient.Queryable<{{ModelClassName}}>().With(SqlWith.NoLock).ToListAsync(); - ManualDataCache.Instance.Set(GlobalConstVars.Cache{{ModelClassName}}, list); + var list = await DbClient.Queryable<{{ModelClassName}}>().With(SqlWith.NoLock).WithCache().ToListAsync(); return list; } diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl index a1a84515..81d69b7e 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl @@ -72,11 +72,6 @@ namespace CoreCms.Net.IServices /// Task> GetCaChe(); - /// - /// 更新cache - /// - Task> UpdateCaChe(); - #endregion #region 重写根据条件查询分页数据 diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl index 6ad24cc1..c268c935 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl @@ -104,14 +104,6 @@ namespace CoreCms.Net.Services return await _dal.GetCaChe(); } - /// - /// 更新cache - /// - public async Task> UpdateCaChe() - { - return await _dal.UpdateCaChe(); - } - #endregion #region 重写根据条件查询分页数据