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

2
HT.Cloud.Code/Model/SystemConfig.cs
View File

@ -12,7 +12,7 @@ namespace HT.Cloud.Code.Model
/// <summary>
/// 系统备注
/// </summary>
public string GroupDescription { get; set; }
public string SystemDescription { get; set; }
/// <summary>
/// 是否是调试模式

5
HT.Cloud.Domain/Entity/SystemSecurity/RealTimeIOGroupEntity.cs
View File

@ -42,5 +42,10 @@ namespace HT.Cloud.Domain.SystemSecurity
/// </summary>
[SugarColumn(ColumnName="IOBit", ColumnDescription = "IO位数",ColumnDataType = "varchar(255)", IsNullable = true)]
public string IOBit { get; set; }
/// <summary>
/// IO位数
/// </summary>
[SugarColumn(ColumnName = "IOType", ColumnDescription = "数字量或模拟量", ColumnDataType = "varchar(128)", IsNullable = true)]
public string IOType { get; set; }
}
}

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

@ -224,9 +224,9 @@ namespace HT.Cloud.Service.ReportManage
//return Report.ToJson();
}
public async Task<string> GetReportDownLoad(DateTime startTime, DateTime endTime ,int interval)
public async Task<string> GetReportDownLoad(DateTime startTime, DateTime endTime ,int interval, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var listSub = TimeInOneDay(startTime, endTime);
@ -244,17 +244,28 @@ namespace HT.Cloud.Service.ReportManage
var item = listSub[i];
var fstartTime = item.starttime;
var fendTime = item.endtime;
string conn = _context.CurrentConnectionConfig.ConnectionString; //"Data Source=192.168.110.32;Initial Catalog=SCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;";
SqlConnection sqlConnection = new SqlConnection(conn);
SqlCommand command = new SqlCommand("dbo.Query_Report_YL_CHN", sqlConnection);
command.CommandType = CommandType.StoredProcedure;
command.Parameters.Add(new SqlParameter("@startdt", fstartTime.ToString("yyyy/MM/dd HH:mm:ss")));
command.Parameters.Add(new SqlParameter("@enddt", fendTime.ToString("yyyy/MM/dd HH:mm:ss")));
command.Parameters.Add(new SqlParameter("@timeinterval", interval));
command.CommandTimeout = 999999;
sqlConnection.Open();
var reader = command.ExecuteReader();
SugarParameter[] sqlParameters ={
new SugarParameter("@enddt", fendTime.ToString("yyyy-MM-dd HH:mm:ss")),
new SugarParameter("@groupname", groupName),
new SugarParameter("@startdt", fstartTime.ToString("yyyy-MM-dd HH:mm:ss")),
new SugarParameter("@timeinterval",interval)
};
var reader = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataReader("Query_Report_YL_CHN", sqlParameters);
//string conn = _context.CurrentConnectionConfig.ConnectionString; //"Data Source=192.168.110.32;Initial Catalog=SCADA;User Id= sa;Password= Sa1qaz;Integrated Security=False;Encrypt=True;TrustServerCertificate=True;";
// SqlConnection sqlConnection = new SqlConnection(conn);
// SqlCommand command = new SqlCommand("dbo.Query_Report_YL_CHN", sqlConnection);
// command.CommandType = CommandType.StoredProcedure;
//command.Parameters.Add(new SqlParameter("@enddt", fendTime.ToString("yyyy-MM-dd HH:mm:ss")));
//command.Parameters.Add(new SqlParameter("@groupname", groupName));
//command.Parameters.Add(new SqlParameter("@startdt", fstartTime.ToString("yyyy-MM-dd HH:mm:ss")));
//command.Parameters.Add(new SqlParameter("@timeinterval", interval));
// command.CommandTimeout = 999999;
// sqlConnection.Open();
// var reader = command.ExecuteReader();

8
HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
View File

@ -26,7 +26,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
@ -45,18 +45,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "制粉系统";
var data = await _historyChartsService.GetAllSubsystemTag(systemName);
var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
{
string systemName = "制粉系统";
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
return Content(data);
}

10
HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs
View File

@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -34,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
return Content(data);
}

8
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
View File

@ -28,7 +28,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
@ -47,16 +47,14 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "喷煤系统";
var data = await _historyChartsService.GetAllSubsystemTag(systemName);
var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
{
string systemName = "喷煤系统";
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemName);
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
return Content(data);
}

5
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
View File

@ -28,13 +28,12 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var systemName = "喷煤系统";
var data = await _historyTechChartsService.GetAllTagList(systemName, chartTagType.ChartTagTypeName);
var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
return Content(data);
}

11
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
View File

@ -28,13 +28,12 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var systemName = "喷煤系统";
var data = await _rtTechChartsService.GetAllTagList(systemName, chartTagType.ChartTagTypeName);
var data = await _rtTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
return Content(data);
}
@ -69,16 +68,14 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables)
{
var systemName = "喷煤系统";
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemName);
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames)
{
var systemName = "喷煤系统";
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemName);
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemDescription);
return Content(data);
}

10
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
View File

@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -34,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
return Content(data);
}

29
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.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()
{
@ -36,62 +36,56 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecord(Alarm_Params charts_Params)
{
string systemName = "喷煤系统";
short TagID = short.Parse(charts_Params.TagID);
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuick(Alarm_Quick_Params alarm_Quick_Params)
{
string systemName = "喷煤系统";
var Alarmtype = alarm_Quick_Params.Alarmtype;
var StartTime = Gettime(alarm_Quick_Params.StartTime);
var EndTime = Gettime(alarm_Quick_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuickDesc(Alarm_Quick_Desc_Params alarm_Quick_Desc_Params)
{
string systemName = "喷煤系统";
var hhour = alarm_Quick_Desc_Params.Hhour;
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmSubSystem(SubSystem_Params subSystem_Params)
{
string systemName = "喷煤系统";
var AlarmName = subSystem_Params.AlarmName;
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemName);
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
return Content(data);
}
@ -115,36 +109,33 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[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);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
return Content(data);
}

35
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.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()
{
@ -36,73 +36,65 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecord(Alarm_Params charts_Params)
{
string systemName = "喷煤系统";
short TagID = short.Parse(charts_Params.TagID);
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuick(Alarm_Quick_Params alarm_Quick_Params)
{
string systemName = "喷煤系统";
var Alarmtype = alarm_Quick_Params.Alarmtype;
var StartTime = Gettime(alarm_Quick_Params.StartTime);
var EndTime = Gettime(alarm_Quick_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuickDesc(Alarm_Quick_Desc_Params alarm_Quick_Desc_Params)
{
string systemName = "喷煤系统";
var hhour = alarm_Quick_Desc_Params.Hhour;
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmHistory(Alarm_History_Params alarm_History_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_History_Params.StartTime);
var EndTime = Gettime(alarm_History_Params.EndTime);
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmSubSystem(SubSystem_Params subSystem_Params)
{
string systemName = "喷煤系统";
var AlarmName = subSystem_Params.AlarmName;
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemName);
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
return Content(data);
}
@ -126,36 +118,31 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[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);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
return Content(data);
}

44
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs
View File

@ -27,7 +27,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()
{
@ -38,73 +38,63 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetAllSubsystemTag(systemName);
var data = await _historyAlarmService.GetAllSubsystemTag(systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
string systemName = "喷煤系统";
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemName);
var data = await _historyAlarmService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecord(Alarm_Params charts_Params)
{
string systemName = "喷煤系统";
short TagID = short.Parse(charts_Params.TagID);
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecord(TagID, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuick(Alarm_Quick_Params alarm_Quick_Params)
{
string systemName = "喷煤系统";
var Alarmtype = alarm_Quick_Params.Alarmtype;
var StartTime = Gettime(alarm_Quick_Params.StartTime);
var EndTime = Gettime(alarm_Quick_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuick(Alarmtype, StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordQuickDesc(Alarm_Quick_Desc_Params alarm_Quick_Desc_Params)
{
string systemName = "喷煤系统";
var hhour = alarm_Quick_Desc_Params.Hhour;
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemName);
var data = await _historyAlarmService.GetAlarmRecordQuickDesc(hhour, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmHistory(Alarm_History_Params alarm_History_Params)
{
string systemName = "喷煤系统";
var StartTime = Gettime(alarm_History_Params.StartTime);
var EndTime = Gettime(alarm_History_Params.EndTime);
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmHistory(StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmSubSystem(SubSystem_Params subSystem_Params)
{
string systemName = "喷煤系统";
var AlarmName = subSystem_Params.AlarmName;
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemName);
var data = await _historyAlarmService.GetAlarmSubSystem(AlarmName,systemDescription);
return Content(data);
}
@ -128,71 +118,65 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
[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);
var data = await _historyAlarmService.GetAlarm_ACC(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Histogram(StartTime, EndTime, systemDescription);
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);
var data = await _historyAlarmService.GetAlarm_Pie(StartTime, EndTime, systemDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetAlarmRecordForTagName(Alarm_ParamsForTagName charts_Params)
{
string systemName = "喷煤系统";
string Description = charts_Params.Description;
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarmRecordForTagName(Description, StartTime, EndTime, systemDescription);
return Content(data);
}
public async Task<ActionResult> GetAlarm_CS(Alarm_CS alarm_CS)
{
string systemName = "喷煤系统";
var StartTime = Gettime_(alarm_CS.StartTime);
var EndTime = Gettime_(alarm_CS.EndTime);
var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarm_CS(StartTime, EndTime, systemDescription);
return Content(data);
}
public async Task<ActionResult> GetAlarm_Ztime(Alarm_Ztime alarm_Ztime)
{
string systemName = "喷煤系统";
var StartTime = Gettime_(alarm_Ztime.StartTime);
var EndTime = Gettime_(alarm_Ztime.EndTime);
var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, systemName);
var data = await _historyAlarmService.GetAlarm_Ztime(StartTime, EndTime, systemDescription);
return Content(data);
}
/*

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

@ -23,7 +23,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -90,14 +90,13 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
[IgnoreAntiforgeryToken]
public async Task<ActionResult> GetReportNewPage(string page, string limit,string StartTime,string EndTime, string Interval)
{
var systemName = "喷煤系统";
//string page = Request.Query["page"].ToString();
//string limit = Request.Query["limit"].ToString();
//var page = Gettime(asyncparam.page.ToString());
//var limit = Gettime(asyncparam.limit.ToString());
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);
}
@ -106,8 +105,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.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]
@ -115,8 +113,7 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.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]
@ -128,7 +125,7 @@ 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);
var data = await _historyReportService.GetReportDownLoad(StartTime, EndTime, Interval, systemDescription);
return Content(data);
}
public string Gettime(string longtime)

13
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportController.cs
View File

@ -22,7 +22,10 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public ServerStateService _serverStateService { get; set; }
public RealTimeIOStateService _realTimeIOState { get; set; }
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetServerDataJson()
@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
[HttpGet]
public async Task<ActionResult> GetRealIOGroup()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
return Content(listgroup.ToJson());
}
@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public async Task<ActionResult> GetRealIOInfo()
{
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOState()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
return Content(data.Result);
}

13
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiJMReportNewController.cs
View File

@ -23,7 +23,10 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public RealTimeIOStateService _realTimeIOState { get; set; }
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetServerDataJson()
{
@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
[HttpGet]
public async Task<ActionResult> GetRealIOGroup()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
return Content(listgroup.ToJson());
}
@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public async Task<ActionResult> GetRealIOInfo()
{
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOState()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
return Content(data.Result);
}

13
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateController.cs
View File

@ -23,7 +23,10 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public RealTimeIOStateService _realTimeIOState { get; set; }
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetServerDataJson()
{
@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
[HttpGet]
public async Task<ActionResult> GetRealIOGroup()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
return Content(listgroup.ToJson());
}
@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public async Task<ActionResult> GetRealIOInfo()
{
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOState()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
return Content(data.Result);
}

13
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiNetWorkStateControllerNew.cs
View File

@ -22,7 +22,10 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public ServerStateService _serverStateService { get; set; }
public RealTimeIOStateService _realTimeIOState { get; set; }
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpGet]
public async Task<ActionResult> GetServerDataJson()
@ -68,7 +71,7 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
[HttpGet]
public async Task<ActionResult> GetRealIOGroup()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
return Content(listgroup.ToJson());
}
@ -76,15 +79,15 @@ namespace HT.Cloud.Web.Areas.SystemSecurity.Controllers
public async Task<ActionResult> GetRealIOInfo()
{
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
return Content(listinfo.ToJson());
}
[HttpGet]
public async Task<ActionResult> GetRealIOState()
{
var listgroup = _realTimeIOState.GetIOGroup("喷煤系统");
var listinfo = _realTimeIOState.GetIOInfo("喷煤系统");
var listgroup = _realTimeIOState.GetIOGroup(systemDescription);
var listinfo = _realTimeIOState.GetIOInfo(systemDescription);
var data = _realTimeIOState.GetRtData();
return Content(data.Result);
}

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

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

2412
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index - 副本 (2).cshtml Normal file
View File

File diff suppressed because it is too large Load Diff

1362
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiJMReportNew/Index.cshtml
View File

File diff suppressed because it is too large Load Diff

13
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,8 +112,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.GetReportSecondHead(systemName);
var data = await _historyReportService.GetReportSecondHead(systemDescription);
return Content(data);
}
[HttpPost]
@ -127,7 +124,7 @@ namespace HT.Cloud.Web.Areas.ReportManage.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);
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()
{

2
HT.Cloud.Web/HT.Cloud.Web.csproj
View File

@ -81,7 +81,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="watercloudnetdb.db">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
</ItemGroup>

2
HT.Cloud.Web/appsettings.json
View File

@ -8,7 +8,7 @@
}
},
"SystemConfig": {
"GroupDescription": "喷煤系统", //系统备注
"SystemDescription": "喷煤系统", //系统备注
"Demo": false, // 是否是演示模式 账号admin 密码0000
"LoginMultiple": false, // 是否允许一个账户在多处登录
"AllowCorsSite": "http://localhost:8058", // 允许的其他站点访问Api