大版本更新推送

This commit is contained in:
dell
2023-11-06 21:26:55 +08:00
parent b94dc66092
commit 17b4e899ff
36 changed files with 3491 additions and 377 deletions

View File

@ -103,21 +103,66 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
return (dt.ToString("yyyy/MM/dd HH:mm:ss"));
}
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
// public short TagID { get; set; }
// public string Description { get; set; }
// public string Units { get; set; }
//}
public string Gettime_(string longtime)
{
long jsTimeStamp = long.Parse(longtime);
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
DateTime dt = startTime.AddMilliseconds(jsTimeStamp);
return (dt.ToString("yyyy-MM-dd HH:mm:ss"));
}
//public class SubsysytemNameList
//{
// public string Lable { get; set; }
// public string Value { get; set; }
//}
public class ChartSubsysytemName
[HttpPost]
public async Task<ActionResult> GetAlarmACC(Alarm_ACC_Params alarm_ACC_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_ACC_Params.StartTime);
var EndTime = Gettime(alarm_ACC_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmHistogram(Alarm_Histogram_Params alarm_Histogram_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime_(alarm_Histogram_Params.StartTime);
var EndTime = Gettime_(alarm_Histogram_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmPie(Alarm_Pie_Params alarm_Pie_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_Pie_Params.StartTime);
var EndTime = Gettime(alarm_Pie_Params.EndTime);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemName);
return Content(data);
}
//public class SubAllTagReturn
//{
// //x.TagID, x.Description, x.Units
// public short TagID { get; set; }
// public string Description { get; set; }
// public string Units { get; set; }
//}
//public class SubsysytemNameList
//{
// public string Lable { get; set; }
// public string Value { get; set; }
//}
public class ChartSubsysytemName
{
public string SubsysytemName { get; set; }
}
@ -153,5 +198,22 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public string Hhour { get; set; }
}
public class Alarm_ACC_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Histogram_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
public class Alarm_Pie_Params
{
public string StartTime { get; set; }
public string EndTime { get; set; }
}
}
}