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

1、陕西建龙打包版本

Browse Source 
2、drawio导入SFC
3、多系统并存修改
This commit is contained in:
dell
2025-02-19 16:06:08 +08:00
parent 4071d8f337
commit fbc097d131
73 changed files with 3874 additions and 13074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
View File

@ -24,7 +24,12 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
@ -88,7 +93,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
return Content(con);
}
[IgnoreAntiforgeryToken]
public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval)
public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval,string SystemName)
{
//string page = Request.Query["page"].ToString();
//string limit = Request.Query["limit"].ToString();
@ -96,24 +101,24 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
//var limit = Gettime(asyncparam.limit.ToString());
var startTime = Gettime(StartTime);
var endTime = Gettime(EndTime);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, systemDescription);
var data = await _historyReportService.GetReportNewAsync(page, limit, startTime, endTime, Interval, SystemName);
//var con = JsonConvert.SerializeObject(data);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetReportFirstHead()
public async Task<ActionResult> GetReportFirstHead(string[] systemName)
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var data = await _historyReportService.GetReportFirstHead(systemDescription);
var data = await _historyReportService.GetReportFirstHead(systemName[0]);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetReportSecondHead()
public async Task<ActionResult> GetReportSecondHead(string[] systemName)
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
//var EndTime = reportparam.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
var data = await _historyReportService.GetReportSecondHead(systemDescription);
var data = await _historyReportService.GetReportSecondHead(systemName[0]);
return Content(data);
}
[HttpPost]
@ -125,7 +130,8 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
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, systemDescription);
string SystemName = downLoadparam.SystemName;
var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval, SystemName);
return Content(data);
}
public string Gettime(string longtime)
@ -141,12 +147,14 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
public class DownLoadparam
{
public long StartTime { get; set; }
public long EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
public class Asyncparam
{