cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大更新，添加喷煤历史报表历史趋势实时趋势等界面实体控制器服务类等等

Browse Source
This commit is contained in:
dell
2023-08-11 16:04:39 +08:00
parent 361c3db5f3
commit 2587fe7fa3
22 changed files with 6699 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
HT.Cloud.Service/ReportManage/HistoryReportService.cs
View File

@ -19,6 +19,8 @@ using System.Security.Cryptography;
using System.Threading;
using System.Data;
using iTextSharp.text;
using Serenity.Data;
using Quartz;
namespace HT.Cloud.Service.ReportManage
{
@ -129,8 +131,9 @@ namespace HT.Cloud.Service.ReportManage
var counts = ((endS - startS) / timeinterval) + 1;
return counts;
}
public async Task<string> GetReportNewAsync(string page, string limit, string Startdt, string Enddt, string Timeinterval, string GroupName)
public async Task<string> GetReportNewAsync(string page, string limit, string Startdt, string Enddt, string Timeinterval, string systemName)
{
var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//SugarParameter[] sqlParameters ={
// new SugarParameter("@startdt",Startdt),
// new SugarParameter("@enddt",Enddt),
@ -143,12 +146,12 @@ namespace HT.Cloud.Service.ReportManage
SugarParameter[] sqlReportParameters ={
new SugarParameter("@startdt",Startdt),
new SugarParameter("@enddt",Enddt),
new SugarParameter("@groupname",GroupName),
new SugarParameter("@groupname",groupName),
new SugarParameter("@timeinterval",Timeinterval),
new SugarParameter("@hpage",page.ToInt()),
new SugarParameter("@hlimit",limit.ToInt())
};
var Report = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_YL_PAGE", sqlReportParameters);
var Report = _context.Ado.UseStoredProcedure().GetDataTable("Query_Report_PAGE", sqlReportParameters);
var jsonResult = JsonConvert.SerializeObject(Report);
@ -180,16 +183,23 @@ namespace HT.Cloud.Service.ReportManage
return Report;
}
public async Task<string> GetReportFirstHead()
public async Task<string> GetReportFirstHead(string systemName)
{
var list = _context.Queryable<Ht_History_ReportEntity>().ToList();
var groupName = _context.Queryable<MetaGroupEntity>().Where(x=>x.GroupDescription == systemName).First().GroupName;
var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{driverName}_{groupName}_REPORT");
//var list = _context.Queryable<Ht_History_ReportEntity>().ToList();
List<string> list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList();
return list_name_two.ToJson();
}
public async Task<string> GetReportSecondHead()
public async Task<string> GetReportSecondHead(string systemName)
{
var list = _context.Queryable<Ht_History_ReportEntity>().ToList();
var groupName = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.Queryable<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.Queryable<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{driverName}_{groupName}_REPORT");
List<string> list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList();
var relist = new List<SecondHead>();
foreach(var t in list_name_two)