diff --git a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DATA.cs b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DATA.cs index 0745290..4c42e63 100644 --- a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DATA.cs +++ b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DATA.cs @@ -85,45 +85,5 @@ namespace Aitex.Core.RT.DataCenter { return (InnerDataManager == null) ? null : InnerDataManager.GetDBRecorderList(); } - - #region Maintain - - /// - /// Maintain配置项被修改时 清空注册内容重新注册 - /// - public static void MaintainClearSubscribe() - { - if (InnerDataManager != null) - { - InnerDataManager.MaintainClearSubscribe(); - } - } - - /// - /// Maintain专用 - /// - /// - /// - /// - /// - public static void MaintainSubscribe(string moduleKey, DataItem dataItem) - { - if (InnerDataManager != null) - { - InnerDataManager.MaintainSubscribe(moduleKey, dataItem); - } - } - - /// - /// Maintain专用 - /// - /// - /// - public static Dictionary MaintainPollData(IEnumerable keys) - { - return (InnerDataManager == null) ? null : InnerDataManager.MaintainPollData(keys); - } - - #endregion } } diff --git a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DataManager.cs b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DataManager.cs index 2094977..75803fd 100644 --- a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DataManager.cs +++ b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/DataManager.cs @@ -268,61 +268,5 @@ namespace Aitex.Core.RT.DataCenter } return dictionary; } - - #region Maintain - - /// - /// Maintain涓撶敤 - /// - /// - /// - /// - /// - public void MaintainSubscribe(string key, DataItem dataItem) - { - if (string.IsNullOrWhiteSpace(key)) - { - throw new ArgumentNullException("key"); - } - if (_maintainkeyValueMap.ContainsKey(key)) - { - throw new Exception($"Duplicated Key:{key}"); - } - if (dataItem == null) - { - throw new ArgumentNullException("dataItem"); - } - _maintainkeyValueMap.TryAdd(key, dataItem); - - } - - /// - /// Maintain閰嶇疆椤硅淇敼鏃 娓呯┖娉ㄥ唽鍐呭閲嶆柊娉ㄥ唽 - /// - public void MaintainClearSubscribe() - { - _maintainkeyValueMap.Clear(); - } - - /// - /// Maintain 鎺ㄩ佸凡璁㈤槄鐨勬暟鎹 - /// - /// - /// - public Dictionary MaintainPollData(IEnumerable keys) - { - Dictionary dictionary = new Dictionary(); - foreach (string key in keys) - { - if (_maintainkeyValueMap.ContainsKey(key)) - { - dictionary[key] = _maintainkeyValueMap[key].Value; - } - } - return dictionary; - } - - #endregion - } } diff --git a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/ICommonData.cs b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/ICommonData.cs index 049db55..1d3d2a8 100644 --- a/MECF.Framework.Common/Aitex/Core/RT/DataCenter/ICommonData.cs +++ b/MECF.Framework.Common/Aitex/Core/RT/DataCenter/ICommonData.cs @@ -19,28 +19,5 @@ namespace Aitex.Core.RT.DataCenter void Traverse(object instance, string keyPrefix); SortedDictionary> GetDBRecorderList(); - - #region Maintain - - /// - /// Maintain配置项被修改时 清空注册内容重新注册 - /// - void MaintainClearSubscribe(); - - /// - /// Maintain专用,订阅数据 - /// - /// - /// - void MaintainSubscribe(string key, DataItem dataItem); - - /// - /// Maintain专用,推送数据 - /// - /// - /// - Dictionary MaintainPollData(IEnumerable keys); - - #endregion } } diff --git a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/IQueryDataService.cs b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/IQueryDataService.cs index ac957c3..bb6abde 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/IQueryDataService.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/IQueryDataService.cs @@ -145,20 +145,6 @@ namespace MECF.Framework.Common.DataCenter [ServiceKnownType(typeof(ConfigChangedInfo))] [ServiceKnownType(typeof(List))] [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(MaintainerItem))] - [ServiceKnownType(typeof(TimeObserver))] - [ServiceKnownType(typeof(PlanMaintainer))] - [ServiceKnownType(typeof(PMMaintainer))] - [ServiceKnownType(typeof(PMThicknessMaintainer))] - [ServiceKnownType(typeof(IObserver))] - [ServiceKnownType(typeof(MaintainerItemCollection))] - [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(List))] - [ServiceKnownType(typeof(TimeUnit))] - public interface IQueryDataService { @@ -276,17 +262,5 @@ namespace MECF.Framework.Common.DataCenter [OperationContract] void SetTypedConfigContent(string type, string contentPath, string content); - #region Maintain - - [OperationContract] - List GetAllMaintainerList(); - - [OperationContract] - List GetMaintainanceConfigList(); - - [OperationContract] - Dictionary MaintainPollData(IEnumerable keys); - - #endregion } } diff --git a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataService.cs b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataService.cs index 5c631c9..2345535 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataService.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataService.cs @@ -284,32 +284,5 @@ namespace MECF.Framework.Common.DataCenter { Singleton.Instance.SetTypedConfigContent(type, contentPath, content); } - - #region Maintain - - public List GetAllMaintainerList() - { - return MAINTAIN.GetAllMaintainerList(); - } - - public List GetMaintainanceConfigList() - { - return MAINTAIN.GetMaintainanceConfigList(); - } - - public Dictionary MaintainPollData(IEnumerable keys) - { - try - { - return DATA.MaintainPollData(keys); - } - catch (Exception ex) - { - LOG.Write(ex); - } - return null; - } - - #endregion } } diff --git a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataServiceClient.cs b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataServiceClient.cs index 1a06b98..911d4ba 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataServiceClient.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/DataCenter/QueryDataServiceClient.cs @@ -396,38 +396,5 @@ namespace MECF.Framework.Common.DataCenter return result; } - #region Maintain - - public List GetAllMaintainerList() - { - List result = null; - Invoke(delegate (IQueryDataService svc) - { - result = svc.GetAllMaintainerList(); - }); - return result; - } - - public List GetMaintainanceConfigList() - { - List result = null; - Invoke(delegate (IQueryDataService svc) - { - result = svc.GetMaintainanceConfigList(); - }); - return result; - } - - public Dictionary MaintainPollData(IEnumerable keys) - { - Dictionary result = null; - Invoke(delegate (IQueryDataService svc) - { - result = svc.MaintainPollData(keys); - }); - return result; - } - - #endregion } }