From 424d2d20a24b76850b73fae8ecc9bc98505be4f5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 12 八月 2022 11:31:14 +0800
Subject: [PATCH] 新增重新分析 实时、时、日、月、年等常规分析测点接口
---
DAL/IStation.DAL4Run/monitor_record/hour/MonitorHourRecord.cs | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/DAL/IStation.DAL4Run/monitor_record/hour/MonitorHourRecord.cs b/DAL/IStation.DAL4Run/monitor_record/hour/MonitorHourRecord.cs
index bd1c2ac..879d967 100644
--- a/DAL/IStation.DAL4Run/monitor_record/hour/MonitorHourRecord.cs
+++ b/DAL/IStation.DAL4Run/monitor_record/hour/MonitorHourRecord.cs
@@ -9,18 +9,18 @@
namespace IStation.DAL
{
- /// <summary>
- /// 鏃剁洃娴嬭褰�
- /// </summary>
- public partial class MonitorHourRecord : CorpDAL<Entity.MonitorHourRecord>
- {
- /// <summary>
- ///
- /// </summary>
- public override ConnectionConfig ConnectionConfig
- {
- get { return ConfigHelper.MonitorRecordConnectionConfig; }
- }
+ /// <summary>
+ /// 鏃剁洃娴嬭褰�
+ /// </summary>
+ public partial class MonitorHourRecord : CorpDAL<Entity.MonitorHourRecord>
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public override ConnectionConfig ConnectionConfig
+ {
+ get { return ConfigHelper.MonitorRecordConnectionConfig; }
+ }
#region 閫氳繃 MonitorPointID 鑾峰彇
@@ -97,7 +97,7 @@
using (var db = new SqlSugarClient(ConnectionConfig))
{
return db.Queryable<Entity.MonitorHourRecord>()
- .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID&&x.SignalID==SignalID)
+ .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID && x.SignalID == SignalID)
.OrderBy(x => x.DataTime, OrderByType.Asc).ToList();
}
}
@@ -110,8 +110,22 @@
using (var db = new SqlSugarClient(ConnectionConfig))
{
return db.Queryable<Entity.MonitorHourRecord>()
- .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID&&x.SignalID==SignalID && x.DataDay == Day.Date)
+ .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID && x.SignalID == SignalID && x.DataDay == Day.Date)
.OrderBy(x => x.DataTime, OrderByType.Asc).ToList();
+ }
+ }
+
+ /// <summary>
+ /// 閫氳繃 SignalID 鑾峰彇鏌愭椂鐨勬暟鎹�
+ /// </summary>
+ public Entity.MonitorHourRecord GetBySignalIDOfHour(long CorpID, long MonitorPointID, long SignalID, DateTime DataDay, int DataHour)
+ {
+ using (var db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Queryable<Entity.MonitorHourRecord>()
+ .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID && x.SignalID == SignalID)
+ .Where(x => x.DataDay == DataDay.Date && x.DataHour == DataHour)
+ .First();
}
}
@@ -125,7 +139,7 @@
using (var db = new SqlSugarClient(ConnectionConfig))
{
return db.Queryable<Entity.MonitorHourRecord>()
- .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID&&x.SignalID==SignalID && x.DataDay >= StartDay.Date && x.DataDay <= EndDay.Date)
+ .Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID && x.SignalID == SignalID && x.DataDay >= StartDay.Date && x.DataDay <= EndDay.Date)
.OrderBy(x => x.DataTime, OrderByType.Asc).ToList();
}
}
@@ -164,7 +178,7 @@
{
return db.Deleteable<Entity.MonitorHourRecord>()
.Where(x => x.CorpID == CorpID && x.MonitorPointID == MonitorPointID && x.SignalID == SignalID)
- .Where(x => x.DataDay==DataDay.Date&&x.DataHour==DataHour)
+ .Where(x => x.DataDay == DataDay.Date && x.DataHour == DataHour)
.ExecuteCommand() > 0;
}
}
@@ -185,7 +199,7 @@
|| (x.DataDay == StartDay.Date && x.DataDay < EndDay.Date && x.DataHour >= StartHour)
|| (x.DataDay == EndDay.Date && x.DataDay > StartDay.Date && x.DataHour <= EndHour)
|| (x.DataDay == StartDay.Date && x.DataDay == EndDay.Date && x.DataHour >= StartHour && x.DataHour <= EndHour))
- .ExecuteCommand()>0;
+ .ExecuteCommand() > 0;
}
}
--
Gitblit v1.9.3