From 8ece9a79d7b3772cadfb06c76272853b70de6af1 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 03 十一月 2022 13:45:25 +0800
Subject: [PATCH] 修改监测点相关接口，过滤无效测点
---
Application/IStation.Application.Monitor/monitor_point/logic/MonitorPoint_LogicController.cs | 80 ++++++++++++++++++++--------------------
Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs | 2
Application/IStation.Application.Monitor/monitor_point/mobile/MonitorPoint_MobileController.cs | 8 ++-
Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
4 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs b/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
index 2c069a1..9023cb2 100644
--- a/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
+++ b/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
@@ -1240,7 +1240,7 @@
#endregion
- #region 鏍囧噯鐓�
+ #region 鏍囧噯鐓�
var vm_item_coal = new EtaKpiItem();
vm_item_coal.Name = "鏍囧噯鐓�";
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);
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>();
diff --git a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
index b37a5f2..5d6c6b3 100644
--- a/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\IStation\IStationV4.1\Core\Service.V4.1\Entry\IStation.WebApi.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2022-10-31T06:36:59.4971398Z;True|2022-10-28T13:58:42.2473049+08:00;True|2022-10-28T13:42:58.7180735+08:00;True|2022-10-28T12:56:06.9517417+08:00;True|2022-10-28T09:37:04.8336241+08:00;True|2022-10-27T16:13:52.0290129+08:00;True|2022-10-27T14:51:12.0416021+08:00;True|2022-10-27T14:46:01.8195700+08:00;True|2022-10-27T14:38:00.5077582+08:00;True|2022-10-27T14:28:16.2348825+08:00;False|2022-10-27T14:27:49.2720060+08:00;False|2022-10-27T14:27:25.1445739+08:00;True|2022-10-26T11:27:54.4483138+08:00;True|2022-10-26T11:19:37.6322046+08:00;True|2022-10-26T11:10:05.4129456+08:00;True|2022-10-25T16:33:32.7872520+08:00;True|2022-10-24T16:12:49.4291001+08:00;True|2022-10-24T16:10:25.3757944+08:00;True|2022-10-24T14:04:51.7783988+08:00;True|2022-10-21T18:51:32.0221235+08:00;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;True|2022-06-15T18:01:54.0267150+08:00;</History>
+ <History>True|2022-11-03T03:48:24.5399936Z;True|2022-10-31T14:36:59.4971398+08:00;True|2022-10-28T13:58:42.2473049+08:00;True|2022-10-28T13:42:58.7180735+08:00;True|2022-10-28T12:56:06.9517417+08:00;True|2022-10-28T09:37:04.8336241+08:00;True|2022-10-27T16:13:52.0290129+08:00;True|2022-10-27T14:51:12.0416021+08:00;True|2022-10-27T14:46:01.8195700+08:00;True|2022-10-27T14:38:00.5077582+08:00;True|2022-10-27T14:28:16.2348825+08:00;False|2022-10-27T14:27:49.2720060+08:00;False|2022-10-27T14:27:25.1445739+08:00;True|2022-10-26T11:27:54.4483138+08:00;True|2022-10-26T11:19:37.6322046+08:00;True|2022-10-26T11:10:05.4129456+08:00;True|2022-10-25T16:33:32.7872520+08:00;True|2022-10-24T16:12:49.4291001+08:00;True|2022-10-24T16:10:25.3757944+08:00;True|2022-10-24T14:04:51.7783988+08:00;True|2022-10-21T18:51:32.0221235+08:00;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;True|2022-07-19T10:26:17.1257582+08:00;True|2022-07-14T10:30:13.1942620+08:00;True|2022-07-13T14:35:30.0524912+08:00;True|2022-07-08T14:32:42.4327635+08:00;True|2022-07-05T11:08:07.0982998+08:00;True|2022-07-04T10:33:11.4756479+08:00;True|2022-07-01T22:05:04.4907981+08:00;True|2022-07-01T15:57:41.6399584+08:00;True|2022-06-29T10:33:01.2518877+08:00;True|2022-06-29T09:35:04.8176716+08:00;True|2022-06-22T10:29:08.8189250+08:00;True|2022-06-21T20:20:26.7306581+08:00;True|2022-06-21T09:54:59.2174617+08:00;True|2022-06-20T16:05:34.5414017+08:00;True|2022-06-16T13:17:09.9717924+08:00;True|2022-06-16T09:40:45.1175998+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3