From d133e02cda958c3d0e86bffdbdebcb8c990939a4 Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Tue, 30 Apr 2024 22:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BE=A7=E4=BD=8D?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Impl/PLCPointRepository.cs | 2 +- .../GuideScreen.Common/Services/Impl/PLCPointService.cs | 7 +++++++ .../GuideScreen.UI/ControlUI/ControlParamSetting.cs | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCPointRepository.cs b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCPointRepository.cs index 794e5d7..bb4c4b6 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCPointRepository.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Repositories/Impl/PLCPointRepository.cs @@ -72,7 +72,7 @@ namespace GuideScreen.Common.Repositories.Impl { using (var context = GSDBContext.GetDbContext()) { - var list = context.PLCPointEntites.Select(f => f.DeviceName).ToList(); + var list = context.PLCPointEntites.Select(f => f.DeviceName).Distinct().ToList(); return list; } } diff --git a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCPointService.cs b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCPointService.cs index 5f45315..647f86a 100644 --- a/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCPointService.cs +++ b/guidescreen/GuideScreen/GuideScreen.Common/Services/Impl/PLCPointService.cs @@ -37,6 +37,13 @@ namespace GuideScreen.Common.Services.Impl public PageModel> GetPLCPointList(string deviceName, string note, int pageSize, int pageIndex) { var pageModel = plcPointRepository.GetPLCPointList(deviceName, note, pageSize, pageIndex); + if (pageModel.Content != null && pLCMonitorService.IsRun) + { + foreach (var model in pageModel.Content) + { + model.PointValue = pLCMonitorService.ReadValue(model.PointAddress, Type.GetType(model.PointDataType))?.ToString(); + } + } return pageModel; } diff --git a/guidescreen/GuideScreen/GuideScreen.UI/ControlUI/ControlParamSetting.cs b/guidescreen/GuideScreen/GuideScreen.UI/ControlUI/ControlParamSetting.cs index 609f285..78e8ac3 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/ControlUI/ControlParamSetting.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/ControlUI/ControlParamSetting.cs @@ -62,10 +62,10 @@ namespace GuideScreen.UI.ControlUI models = list.Where(f => f.PointNote.StartsWith(cmbToilet.Text)).ToList(); if (models.Count == 4) { - txtT2.Text = plcMonitorService.ReadValue(models[0].PointAddress).ToString(); - txtT3.Text = plcMonitorService.ReadValue(models[1].PointAddress).ToString(); - txtT4.Text = plcMonitorService.ReadValue(models[2].PointAddress).ToString(); - txtT5.Text = plcMonitorService.ReadValue(models[3].PointAddress).ToString(); + txtT2.Text = plcMonitorService.ReadValue(models[0].PointAddress).ToString(); + txtT3.Text = plcMonitorService.ReadValue(models[1].PointAddress).ToString(); + txtT4.Text = plcMonitorService.ReadValue(models[2].PointAddress).ToString(); + txtT5.Text = plcMonitorService.ReadValue(models[3].PointAddress).ToString(); } }