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/logic/MonitorPoint_LogicController.cs |   80 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Application/IStation.Application.Monitor/monitor_point/logic/MonitorPoint_LogicController.cs b/Application/IStation.Application.Monitor/monitor_point/logic/MonitorPoint_LogicController.cs
index 156b6e0..c9d207b 100644
--- a/Application/IStation.Application.Monitor/monitor_point/logic/MonitorPoint_LogicController.cs
+++ b/Application/IStation.Application.Monitor/monitor_point/logic/MonitorPoint_LogicController.cs
@@ -59,7 +59,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x=>x.UseStatus== Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -159,7 +159,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -263,7 +263,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.eMonitorType.General);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -364,7 +364,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.eMonitorType.General);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -468,7 +468,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.eMonitorType.Vibration);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -569,7 +569,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.eMonitorType.Vibration);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -673,7 +673,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -774,7 +774,7 @@
                 #region 鐩戞祴鐐�
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -879,7 +879,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                                             (corpId, belongType, belongId, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -981,7 +981,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                                             (corpId, belongType, belongId, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1086,7 +1086,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                                 (corpId, belongType, belongId, Model.eMonitorType.Vibration, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1188,7 +1188,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                                 (corpId, belongType, belongId, Model.eMonitorType.Vibration, Model.Monitor.eCronType.Real);
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1293,7 +1293,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
                 monitor_list = monitor_list?.Where(x => x.SourceType == Model.Monitor.eSourceType.Input).ToList();
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1395,7 +1395,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
                 monitor_list = monitor_list?.Where(x => x.SourceType == Model.Monitor.eSourceType.Input).ToList();
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1500,7 +1500,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
                 monitor_list = monitor_list?.Where(x => x.MonitorType == Model.eMonitorType.General && x.SourceType == Model.Monitor.eSourceType.Input).ToList();
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1602,7 +1602,7 @@
 
                 var monitor_list = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
                 monitor_list = monitor_list?.Where(x => x.MonitorType == Model.eMonitorType.General && x.SourceType == Model.Monitor.eSourceType.Input).ToList();
-                var vm_monitor_list = monitor_list?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vm_monitor_list = monitor_list?.Where(x => x.UseStatus == Model.eUseStatus.Enable)?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 var vm_cache_monitor_list = vm_monitor_list?.Select(x =>
                 {
                     var vm_cache_monitor = new LogicalTreeItemDto();
@@ -1697,7 +1697,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<MonitorPointExSignalListLogicDto>();
@@ -1742,7 +1742,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<MonitorPointExSignalListLogicDto>();
@@ -1799,7 +1799,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();
 
                     if (monitor_kpi_list != null)
@@ -1853,7 +1853,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();
 
                     if (monitor_kpi_list != null)
@@ -1898,7 +1898,7 @@
             {
 
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x=>x.UseStatus== Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -1922,7 +1922,7 @@
             {
 
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -1950,7 +1950,7 @@
 
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                             (corpId, belongType, belongId, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -1974,7 +1974,7 @@
 
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID
                                             (corpId, belongType, belongId, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -2002,7 +2002,7 @@
                 if (allGroupList == null || allGroupList.Count < 1)
                 {
                     var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                    var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                    var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                     return vmCacheList;
                 }
                 else
@@ -2011,13 +2011,13 @@
                     if (groupList == null || groupList.Count < 1)
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                     else
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByGroupIds(corpId, groupList.Select(x => x.ID));
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                 }
@@ -2046,7 +2046,7 @@
                 if (allGroupList == null || allGroupList.Count < 1)
                 {
                     var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                    var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                    var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                     return vmCacheList;
                 }
                 else
@@ -2055,13 +2055,13 @@
                     if (groupList == null || groupList.Count < 1)
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                     else
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByGroupIds(corpId, groupList.Select(x => x.ID));
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                 }
@@ -2093,7 +2093,7 @@
                 if (allGroupList == null || allGroupList.Count < 1)
                 {
                     var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                    var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                    var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                     return vmCacheList;
                 }
                 else
@@ -2102,13 +2102,13 @@
                     if (groupList == null || groupList.Count < 1)
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                     else
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByGroupIds(corpId, groupList.Select(x => x.ID), Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                 }
@@ -2137,7 +2137,7 @@
                 if (allGroupList == null || allGroupList.Count < 1)
                 {
                     var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                    var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                    var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                     return vmCacheList;
                 }
                 else
@@ -2146,13 +2146,13 @@
                     if (groupList == null || groupList.Count < 1)
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByBelongTypeAndBelongID(corpId, belongType, belongId);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                     else
                     {
                         var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByGroupIds(corpId, groupList.Select(x => x.ID), Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                        var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                        var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                         return vmCacheList;
                     }
                 }
@@ -2188,7 +2188,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 MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x=>x.UseStatus== Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -2213,7 +2213,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 MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -2241,7 +2241,7 @@
                     return default;
                 var monitorIds = monitorMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByIds(corpId, monitorIds, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);
@@ -2266,7 +2266,7 @@
                     return default;
                 var monitorIds = monitorMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
                 var monitorList = new Service.MonitorPoint().GetExSignalWithSignalTypeByIds(corpId, monitorIds, Model.eMonitorType.General, Model.Monitor.eCronType.Real);
-                var vmCacheList = monitorList?.Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
+                var vmCacheList = monitorList?.Where(x => x.UseStatus == Model.eUseStatus.Enable).Select(x => new MonitorPointExSignalListLogicDto(x)).ToList();
                 return vmCacheList;
 
             }, CacheHelper.CacheLevel3);

--
Gitblit v1.9.3