新版推送

This commit is contained in:
dell
2023-12-20 15:51:03 +08:00
parent 0ed29a90d4
commit 6025fb75a3
15 changed files with 4399 additions and 316 deletions

View File

@ -136,6 +136,28 @@ namespace HT.Cloud.Service.ReportManage
//return resultlist.ToJson();
}
public async Task<string> GetAlarmRecordForTagName(string Description, string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverID = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupName == groupName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverID).First().DriverName;
//short tagid = (short)_context.AsTenant().QueryableWithAttr<MetaTagEntity>().Where(x => x.Description == Description).First().TagID;
var alarmList = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<HistoryAlarmEntity>($"SELECT * FROM HT_{driverName}_{groupName}_ALARM");
int tagid = alarmList.Where(x=>x.Description == Description).First().TagID;
SugarParameter[] sqlParameters =
{
new SugarParameter("@Henddt",enddt),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Htagid",tagid)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters);
var valuelist = DataTableConvertModel<AlarmValue>.ConvertDataTableToList(dt);
return valuelist.ToJson();
}
public async Task<string> GetAlarmRecordQuick(string HATYPE, string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
@ -152,6 +174,22 @@ namespace HT.Cloud.Service.ReportManage
return valuelist.ToJson();
}
public async Task<string> GetAlarmHistory(string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
SugarParameter[] sqlParameters =
{
new SugarParameter("@Henddt",enddt),
new SugarParameter("@HGROUPNAME",groupName),
new SugarParameter("@Hstartdt",startdt)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_PMHis", sqlParameters);
var valuelist = DataTableConvertModel<AlarmValueCountDesc>.ConvertDataTableToList(dt);
return valuelist.ToJson();
}
//GetAlarmRecordQuickDesc
public async Task<string> GetAlarmRecordQuickDesc(string hhour, string systemName)
{
@ -220,6 +258,60 @@ namespace HT.Cloud.Service.ReportManage
return valuelist.ToJson();
}
public async Task<string> GetAlarm_CS(string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
SugarParameter[] sqlParameters =
{
new SugarParameter("@HGROUPNAME",groupName),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Henddt",enddt)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("HT_BI_Alarm_CS", sqlParameters);
var valuelist = DataTableConvertModel<AlarmCS>.ConvertDataTableToList(dt);
var result = new List<AlarmCS_Result>();
var hdate = startdt + "至" + enddt;
foreach (var item in valuelist)
{
result.Add(new AlarmCS_Result()
{
HDATE = hdate,
Tagname = item.Tagname,
Description = item.Description,
Hcount = item.Hcount,
});
}
return valuelist.ToJson();
}
public async Task<string> GetAlarm_Ztime(string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
SugarParameter[] sqlParameters =
{
new SugarParameter("@HGROUPNAME",groupName),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Henddt",enddt)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("HT_BI_Alarm_Ztime", sqlParameters);
var valuelist = DataTableConvertModel<AlarmZtime>.ConvertDataTableToList(dt);
var result = new List<AlarmZtime_Result>();
var hdate = startdt + "至" + enddt;
foreach ( var item in valuelist)
{
result.Add(new AlarmZtime_Result() {
HDATE =hdate,
TAGNAME = item.TAGNAME,
Description = item.Description,
Hztime = item.Hztime,
});
}
return result.ToJson();
}
private class AlarmValueCount
{
public string Alarmtype { get; set; }
@ -283,5 +375,34 @@ namespace HT.Cloud.Service.ReportManage
public string Description { get; set; }
public double Hpercent { get; set; }
}
private class AlarmCS
{
public string Tagname { get; set; }
public string Description { get; set; }
public int Hcount { get; set; }
}
private class AlarmCS_Result
{
public string HDATE { get; set; }
public string Tagname { get; set; }
public string Description { get; set; }
public int Hcount { get; set; }
}
private class AlarmZtime
{
public string TAGNAME { get; set; }
public string Description { get; set; }
public int Hztime { get; set; }
}
private class AlarmZtime_Result
{
public string HDATE { get; set; }
public string TAGNAME { get; set; }
public string Description { get; set; }
public int Hztime { get; set; }
}
}
}