diff --git a/Correlator/Service/IPipeMaterialDataService.cs b/Correlator/Service/IPipeMaterialDataService.cs index 349f22d..d9920d5 100644 --- a/Correlator/Service/IPipeMaterialDataService.cs +++ b/Correlator/Service/IPipeMaterialDataService.cs @@ -1,9 +1,12 @@ -using Correlator.Model; +using System.Collections.ObjectModel; +using Correlator.Model; namespace Correlator.Service { public interface IPipeMaterialDataService { void ResetDefaultValue(PipeMaterialModel materialData); + + ObservableCollection GetPipeMaterial(); } } \ No newline at end of file diff --git a/Correlator/Service/IPipeMaterialDataService.cs b/Correlator/Service/IPipeMaterialDataService.cs index 349f22d..d9920d5 100644 --- a/Correlator/Service/IPipeMaterialDataService.cs +++ b/Correlator/Service/IPipeMaterialDataService.cs @@ -1,9 +1,12 @@ -using Correlator.Model; +using System.Collections.ObjectModel; +using Correlator.Model; namespace Correlator.Service { public interface IPipeMaterialDataService { void ResetDefaultValue(PipeMaterialModel materialData); + + ObservableCollection GetPipeMaterial(); } } \ No newline at end of file diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 15f2598..3a8fc73 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -1,4 +1,5 @@ -using Correlator.Model; +using System.Collections.ObjectModel; +using Correlator.Model; using Correlator.Service; using Correlator.Util; using Newtonsoft.Json; @@ -19,5 +20,20 @@ manager.Update(materialData); } } + + public ObservableCollection GetPipeMaterial() + { + var materialModels = new ObservableCollection(); + using (var manager = new DataBaseManager()) + { + var configModels = manager.Table().ToList(); + foreach (var model in configModels) + { + materialModels.Add(model); + } + + return materialModels; + } + } } } \ No newline at end of file diff --git a/Correlator/Service/IPipeMaterialDataService.cs b/Correlator/Service/IPipeMaterialDataService.cs index 349f22d..d9920d5 100644 --- a/Correlator/Service/IPipeMaterialDataService.cs +++ b/Correlator/Service/IPipeMaterialDataService.cs @@ -1,9 +1,12 @@ -using Correlator.Model; +using System.Collections.ObjectModel; +using Correlator.Model; namespace Correlator.Service { public interface IPipeMaterialDataService { void ResetDefaultValue(PipeMaterialModel materialData); + + ObservableCollection GetPipeMaterial(); } } \ No newline at end of file diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 15f2598..3a8fc73 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -1,4 +1,5 @@ -using Correlator.Model; +using System.Collections.ObjectModel; +using Correlator.Model; using Correlator.Service; using Correlator.Util; using Newtonsoft.Json; @@ -19,5 +20,20 @@ manager.Update(materialData); } } + + public ObservableCollection GetPipeMaterial() + { + var materialModels = new ObservableCollection(); + using (var manager = new DataBaseManager()) + { + var configModels = manager.Table().ToList(); + foreach (var model in configModels) + { + materialModels.Add(model); + } + + return materialModels; + } + } } } \ No newline at end of file diff --git a/Correlator/ViewModel/PipeMaterialViewModel.cs b/Correlator/ViewModel/PipeMaterialViewModel.cs index a3898e5..0d36f49 100644 --- a/Correlator/ViewModel/PipeMaterialViewModel.cs +++ b/Correlator/ViewModel/PipeMaterialViewModel.cs @@ -38,7 +38,7 @@ public PipeMaterialViewModel(IPipeMaterialDataService dataService) { _dataService = dataService; - PipeMaterials = MaterialManager.InitPipeMaterial(); + PipeMaterials = _dataService.GetPipeMaterial(); ResetDefaultValueCommand = new RelayCommand(ResetDefaultValue); @@ -94,12 +94,12 @@ //修改声速消息接收 Messenger.Default.Register(this, MessengerToken.UpdateMaterialSoundSpeed, - it => { PipeMaterials = MaterialManager.InitPipeMaterial(); } + it => { PipeMaterials = _dataService.GetPipeMaterial(); } ); //修改名字消息接收 Messenger.Default.Register(this, MessengerToken.UpdateMaterialName, - it => { PipeMaterials = MaterialManager.InitPipeMaterial(); } + it => { PipeMaterials = _dataService.GetPipeMaterial(); } ); } @@ -121,7 +121,7 @@ _dataService.ResetDefaultValue(_materialData); - PipeMaterials = MaterialManager.InitPipeMaterial(); + PipeMaterials = _dataService.GetPipeMaterial(); } private void ItemSelected(object sender)