From 2debdd979cb60b4b076f68b4c2e0a38716023845 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sun, 14 Apr 2024 21:27:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Request/BalanceSupplementRequest.cs | 1 - .../Order/Services/Implements/OrderService.cs | 2 - .../Basic/Entity/GainfoMealEntity.cs | 6 +-- .../Jobs/MealSupplementHandlerJob.cs | 2 - .../Services/Implements/AssignmentService.cs | 37 ++----------------- 5 files changed, 4 insertions(+), 44 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs index c55cd9e1..4550c3ef 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs @@ -19,7 +19,6 @@ public class BalanceSupplementRequest : IValidatableObject /// /// 补金额数 /// - public decimal Amount { get; set; } public IEnumerable Validate(ValidationContext validationContext) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index bb4302de..0e5ef3e5 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -256,7 +256,6 @@ public class OrderService : BaseOrderService, IOrderService BalanceOfRecharge = 0, BalanceOfSubsidies = 0, Version = 0, - TenantId = gainfo.Factory, UserNo = order.UserNo, UserCode = order.UserCode, @@ -703,7 +702,6 @@ public class OrderService : BaseOrderService, IOrderService BalanceOfRecharge = 0, BalanceOfSubsidies = 0, Version = 0, - TenantId = gainfo.Factory, UserNo = gainfo.No, UserCode = gainfo.Code, diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs index e7766a76..c0fcba3d 100644 --- a/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs @@ -8,7 +8,7 @@ namespace Dlhis.Entity.Basic.Entity; /// 就餐人员 /// [SugarTable(TableName = "GainfoMeal", TableDescription = "就餐人员")] -public class GainfoMealEntity : SugarBaseEntity, IVersion, ITenantId +public class GainfoMealEntity : SugarBaseEntity, IVersion { /// /// 档案号 @@ -45,8 +45,4 @@ public class GainfoMealEntity : SugarBaseEntity, IVersion, ITenantId /// [SugarColumn(ColumnDescription = "版本号")] public int Version { get; set; } - - - [SugarColumn(IndexGroupNameList = new[] { "idx_CanteenUser_TenantId" })] - public string TenantId { get; set; } } diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs index 55b3a905..4a3db499 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs @@ -106,13 +106,11 @@ public class MealSupplementHandlerJob : BaseJob UserNo = gainfo.No, UserCode = gainfo.Code, Version = 0, - TenantId = gainfo.Factory, }; await DbContext.InsertAsync(mealUser); } - if (item.Workplace == "5") { //todo 海宁餐补数据 diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 0f951d16..264b0d41 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -12,6 +12,7 @@ using Kurisu.SqlSugar.Extensions; using Newtonsoft.Json.Linq; using Kurisu.Core.CustomClass; using Kurisu.AspNetCore; +using Kurisu.AspNetCore.Utils; namespace Dlhis.ScheduledTask.TaskAssignment.Services.Implements; @@ -39,7 +40,7 @@ public class AssignmentService : IAssignmentService //var key = "heardbeat-devices"; //var heartbeatDeviceNos = (await _redisCache.ListRangeAsync(key))?.Select(x => x.ToString()).ToList(); - var data = await ContinueUpdateAsync(async () => + var data = await CommonHelper.RetryAsync(async () => { var page = await _dbContext.Queryable() .LeftJoin((deviceTask, deivce) => deviceTask.DeviceUniqueNo == deivce.UniqueNo) @@ -52,7 +53,7 @@ public class AssignmentService : IAssignmentService .WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type)) .WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait) .WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process - && SqlFunc.DateDiff(DateType.Minute, deviceTask.CreateTime, deviceTask.ModifiedTime) > 30) + && SqlFunc.DateDiff(DateType.Minute, deviceTask.CreateTime, DateTime.Now) > 30) //.Where(deviceTask => heartbeatDeviceNos.Contains(deviceTask.DeviceUniqueNo)) .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) .Select((deviceTask, deivce, deivceTamplate, ga, galeave, department) => new @@ -313,36 +314,4 @@ public class AssignmentService : IAssignmentService await _dbContext.UpdateAsync(deviceTasks); } - - - //*********************************************************** help methods ********************************************************************* - - /// - /// 并发处理 - /// - /// - /// - /// - /// - /// - private async Task ContinueUpdateAsync(Func> func, int retry) - { - for (int i = 0; i < retry; i++) - { - try - { - return await func(); - } - catch (Exception ex) when (ex is VersionExceptions) - { - _logger.LogWarning(ex, "并发更新失败:{message},", ex.Message); - } - catch (Exception) - { - throw; - } - } - - throw new UserFriendlyException("操作失败,请重试"); - } }