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

修改system

Browse Source
This commit is contained in:
dell
2024-07-10 16:08:09 +08:00
parent 5dde2ad7bf
commit aee89ebeb1
27 changed files with 3946 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
View File

@ -22,7 +22,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -93,10 +93,9 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
//string limit = Request.Query["limit"].ToString();
//var page = Gettime(asyncparam.page.ToString());
//var limit = Gettime(asyncparam.limit.ToString());
var systemName = "制粉系统";
var startTime = Gettime(StartTime);
var endTime = Gettime(EndTime);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemName);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemDescription);
//var con = JsonConvert.SerializeObject(data);
return Content(data);
}
@ -105,8 +104,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var systemName = "制粉系统";
var data = await _historyReportService.GetReportFirstHead(systemName);
var data = await _historyReportService.GetReportFirstHead(systemDescription);
return Content(data);
}
[HttpGet]
@ -114,20 +112,19 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var systemName = "制粉系统";
var data = await _historyReportService.GetReportSecondHead(systemName);
var data = await _historyReportService.GetReportSecondHead(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetReportDownLoad(DownLoadparam downLoadparam)
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
DateTime start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
DateTime StartTime = start.AddMilliseconds(downLoadparam.StartTime).ToLocalTime();
DateTime EndTime = start.AddMilliseconds(downLoadparam.EndTime).ToLocalTime();
int Interval = int.Parse(downLoadparam.Interval.ToString());
var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval);
var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval, systemDescription);
return Content(data);
}
public string Gettime(string longtime)

10
HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs
View File

@ -16,33 +16,33 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetMainPageInit()
{
var data = await _mainPageService.GetMainPageInit(groupDescription);
var data = await _mainPageService.GetMainPageInit(systemDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetMainPageChartInit()
{
var data = await _mainPageService.GetMainPageChartInit(groupDescription);
var data = await _mainPageService.GetMainPageChartInit(systemDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetRtData()
{
var data = await _mainPageService.GetRtData(groupDescription);
var data = await _mainPageService.GetRtData(systemDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetRtChartData()
{
var data = await _mainPageService.GetRtChartData(groupDescription);
var data = await _mainPageService.GetRtChartData(systemDescription);
return Content(data);
}

2
HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs
View File

@ -25,7 +25,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{

2
HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs
View File

@ -14,7 +14,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetRtData()
{