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

20
HT.Cloud.Service/ReportManage/HistoryAlarmService.cs
View File

@ -139,11 +139,11 @@ namespace HT.Cloud.Service.ReportManage
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;
//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");
var alarmList = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<HistoryAlarmEntity>($"SELECT * FROM HT_{systemName}_ALARM");
int tagid = alarmList.Where(x=>x.Description == Description).First().TagID;
SugarParameter[] sqlParameters =
{
@ -177,11 +177,11 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetAlarmHistory(string startdt, string enddt, string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//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("@HSYSTEMNAME",systemName),
new SugarParameter("@Hstartdt",startdt)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm_PMHis", sqlParameters);
@ -260,10 +260,10 @@ namespace HT.Cloud.Service.ReportManage
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;
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
SugarParameter[] sqlParameters =
{
new SugarParameter("@HGROUPNAME",groupName),
new SugarParameter("@HSYSTEMNAME",systemName),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Henddt",enddt)
};
@ -289,10 +289,10 @@ namespace HT.Cloud.Service.ReportManage
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;
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
SugarParameter[] sqlParameters =
{
new SugarParameter("@HGROUPNAME",groupName),
new SugarParameter("@HSYSTEMNAME",systemName),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Henddt",enddt)
};