From a3c318eb487d2e7e385b0500b11b08987800f24d Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 19 Jul 2024 10:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EosAgentModule.cs | 2 +- .../Incoming/EosIncomingBackgroundWorker.cs | 5 +++++ .../Outgoing/EosOutgoingBackgroundWorker.cs | 5 +++++ .../InjectionMoldingTaskIncomingBackgroundWorker.cs | 5 +++++ .../Incoming/MesIncomingBackgroundWorker.cs | 5 +++++ .../MesAgentModule.cs | 2 +- .../Outgoing/MesOutgoingBackgroundWorker.cs | 7 ++++++- .../Incoming/TyrpIncomingBackgroundWorker.cs | 5 +++++ .../Outgoing/TyrpOutgoingBackgroundWorker.cs | 5 +++++ .../Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs | 2 +- .../IncomingToWmsWorker.cs | 5 +++++ .../OutgoingFromWmsWorker.cs | 5 +++++ .../InterfaceConfig/IInterfaceConfigManager.cs | 1 + .../InterfaceConfig/IInterfaceConfigRepository.cs | 1 + .../InterfaceConfig/InterfaceConfig.cs | 4 ++++ .../InterfaceConfig/InterfaceConfigManager.cs | 5 +++++ .../InterfaceConfig/InterfaceConfigEfCoreRepository.cs | 10 +++++++++- 17 files changed, 69 insertions(+), 5 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs index d1ed0e792..43fc043db 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs @@ -166,7 +166,7 @@ public class EosAgentModule : AbpModule { context.AddBackgroundWorkerAsync(); - //context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs index cfcb955d4..68037e892 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs @@ -45,6 +45,11 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("EOS-IN").ConfigureAwait(false); + Logger.LogInformation($"{Incoming} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs index b9de3d016..44bc67128 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs @@ -46,6 +46,11 @@ public class EosOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("EOS-OUT").ConfigureAwait(false); + Logger.LogInformation($"{Outgoing} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs index 264266b09..c2d20338f 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs @@ -55,6 +55,11 @@ public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgro if (!confitem.Active) { Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("SJ-IN").ConfigureAwait(false); + Logger.LogInformation($"{Incoming} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs index e2b0a43e9..184503bef 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs @@ -49,6 +49,11 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("MES-IN").ConfigureAwait(false); + Logger.LogInformation($"{Incoming} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs index a503aee64..62c920660 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs @@ -161,7 +161,7 @@ public class MesAgentModule : AbpModule { context.AddBackgroundWorkerAsync(); - context.AddBackgroundWorkerAsync(); + //context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs index 115e3c408..744b42232 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs @@ -47,7 +47,12 @@ public class MesOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); - return; + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("MES-OUT").ConfigureAwait(false); + Logger.LogInformation($"{Outgoing} 运行已结束，更新接口运行状态!"); + return; + } } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs index d2660f40e..fd75c28e4 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs @@ -51,6 +51,11 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("TYRP-IN").ConfigureAwait(false); + Logger.LogInformation($"{Incoming} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs index e44fd2cd1..f5c6929a5 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs @@ -49,6 +49,11 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("TYRP-OUT").ConfigureAwait(false); + Logger.LogInformation($"{Outgoing} 运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 59cf323ef..28aa02cc5 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -150,6 +150,6 @@ public class AgentModule : AbpModule ApplicationInitializationContext context) { context.AddBackgroundWorkerAsync(); - // context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs index 9248aa46a..3b0c2f576 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs @@ -65,6 +65,11 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation("Wms接收接口已关闭!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("WMS-IN").ConfigureAwait(false); + Logger.LogInformation($"Wms接收接口运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs index b59cbd929..d89727579 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs @@ -45,6 +45,11 @@ public class OutgoingFromWmsWorker : AsyncPeriodicBackgroundWorkerBase if (!confitem.Active) { Logger.LogInformation("Wms传出接口已关闭!"); + if (confitem.Status == 0) + { + await configManager.UpsertStatusAsync("WMS-OUT").ConfigureAwait(false); + Logger.LogInformation($"Wms传出接口运行已结束，更新接口运行状态!"); + } return; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigManager.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigManager.cs index d72aabe2d..7ee00ba76 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigManager.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigManager.cs @@ -4,4 +4,5 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain; public interface IInterfaceConfigManager { Task GetInterfaceConfig(string code); + Task UpsertStatusAsync(string itemcode); } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigRepository.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigRepository.cs index 4bfcc80cb..219bde9e3 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigRepository.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/IInterfaceConfigRepository.cs @@ -5,4 +5,5 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain; public interface IInterfaceConfigRepository { Task GetInterfaceConfig(string code); + Task UpsertStatusAsync(string code); } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfig.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfig.cs index 9051cbac2..5d60d7d9e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfig.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfig.cs @@ -20,4 +20,8 @@ public class InterfaceConfig : SfsAggregateRootBase /// 等级 /// public int Level { get; set; } + /// + /// 接口运行状态 + /// + public int Status { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfigManager.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfigManager.cs index 6c6a2430c..e3576ceee 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfigManager.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/InterfaceConfig/InterfaceConfigManager.cs @@ -22,4 +22,9 @@ public class InterfaceConfigManager : DomainService, IInterfaceConfigManager { return await _repository.GetInterfaceConfig(code).ConfigureAwait(false); } + + public virtual async Task UpsertStatusAsync(string itemcode) + { + await _repository.UpsertStatusAsync(itemcode).ConfigureAwait(false); + } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/InterfaceConfig/InterfaceConfigEfCoreRepository.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/InterfaceConfig/InterfaceConfigEfCoreRepository.cs index 608f22595..e2de56ded 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/InterfaceConfig/InterfaceConfigEfCoreRepository.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/InterfaceConfig/InterfaceConfigEfCoreRepository.cs @@ -21,5 +21,13 @@ public class InterfaceConfigEfCoreRepository : SfsEfCoreRepositoryBase p.Code == code).ConfigureAwait(false); return entitie; } - + public virtual async Task UpsertStatusAsync(string code) + { + var dbSet = await GetDbSetAsync().ConfigureAwait(false); + var item = await dbSet.FirstOrDefaultAsync(p => p.Code == code).ConfigureAwait(false); + if (item != null) + { + item.Status = 1; + } + } }