From 924a9d24222d86e39a5c44884743c4234b08c7c3 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期四, 03 十一月 2022 13:53:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs b/Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs
index d86bb33..f3e65e9 100644
--- a/Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs
+++ b/Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs
@@ -34,7 +34,7 @@
return default;
var monitorIds = monitorMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByIds(corpId,monitorIds);
- var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListMobileDto(x)).ToList();
+ var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListMobileDto(x)).ToList();
return vmCacheList;
}, CacheHelper.CacheLevel3);
@@ -57,7 +57,7 @@
return default;
var monitorIds = monitorMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByIds(corpId, monitorIds);
- var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListMobileDto(x)).ToList();
+ var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListMobileDto(x)).ToList();
return vmCacheList;
}, CacheHelper.CacheLevel3);
@@ -86,7 +86,7 @@
//鏈�鍚巏pi璁板綍鍒楄〃
var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
(CorpID, ObjectType.Station, StationID, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
- var monitor_kpi_list = monitor_list?.Where(x => x.Flags != null && x.Flags.Contains(LogicFlags.KPI))
+ var monitor_kpi_list = monitor_list?.Where(x => x.UseStatus== Model.eUseStatus.Enable&& x.Flags != null && x.Flags.Contains(LogicFlags.KPI))
.OrderBy(x => x.ImportanceIndex == null ? int.MaxValue : x.ImportanceIndex.Value).ToList();
var vmCacheList = new List<MonitorPointExSignalListMobileDto>();
@@ -120,6 +120,7 @@
var vm_list = MemoryCacheHelper.GetSet(cacheKey, () => {
var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId,ObjectType.Station,stationId);
+ monitorList = monitorList?.Where(x=>x.UseStatus== Model.eUseStatus.Enable).ToList();
if (monitorList == null || monitorList.Count < 1)
return default;
var vmCacheList = new List<MonitorPointGroupMobileDto>();
@@ -176,6 +177,7 @@
var vm_list = MemoryCacheHelper.GetSet(cacheKey, () => {
var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, ObjectType.Station, stationId,Model.eMonitorType.General);
+ monitorList = monitorList?.Where(x=>x.UseStatus== Model.eUseStatus.Enable).ToList();
if (monitorList == null || monitorList.Count < 1)
return default;
var vmCacheList = new List<MonitorPointGroupMobileDto>();
--
Gitblit v1.9.3