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)
};

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

@ -137,7 +137,7 @@ namespace HT.Cloud.Service.ReportManage
}
public async Task<string> GetReportNewAsync(string page, string limit, string Startdt, string Enddt, string Timeinterval, 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("@startdt",Startdt),
// new SugarParameter("@enddt",Enddt),
@ -150,12 +150,12 @@ namespace HT.Cloud.Service.ReportManage
SugarParameter[] sqlReportParameters ={
new SugarParameter("@startdt",Startdt),
new SugarParameter("@enddt",Enddt),
new SugarParameter("@groupname",groupName),
//new SugarParameter("@groupname",groupName),
new SugarParameter("@timeinterval",Timeinterval),
new SugarParameter("@hpage",page.ToInt()),
new SugarParameter("@hlimit",limit.ToInt())
};
var Report = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Report_PAGE", sqlReportParameters);
var Report = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable($"Query_Report_PAGE_{systemName}", sqlReportParameters);
var jsonResult = JsonConvert.SerializeObject(Report);
@ -189,10 +189,10 @@ namespace HT.Cloud.Service.ReportManage
}
public async Task<string> GetReportFirstHead(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{driverName}_{groupName}_REPORT");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{systemName}_REPORT");
//var list = _context.AsTenant().QueryableWithAttr<Ht_History_ReportEntity>().ToList();
List<string> list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList();
return list_name_two.ToJson();
@ -200,10 +200,10 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetReportSecondHead(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{driverName}_{groupName}_REPORT");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<Ht_History_ReportEntity>($"SELECT * FROM HT_{systemName}_REPORT");
List<string> list_name_two = list.Select(t => t.HSYS).GroupBy(c => c).Select(c => c.First()).ToList();
var relist = new List<SecondHead>();
foreach(var t in list_name_two)
@ -228,10 +228,10 @@ namespace HT.Cloud.Service.ReportManage
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 driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<HistoryReportPathEntity>($"SELECT * FROM HT_{driverName}_{groupName}_REPORTPATH");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
// var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
// var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<HistoryReportPathEntity>($"SELECT * FROM HT_{systemName}_REPORTPATH");
var f3dpath = list.First().ReportPath;
var listSub = TimeInOneDay(startTime, endTime);
@ -253,11 +253,11 @@ namespace HT.Cloud.Service.ReportManage
SugarParameter[] sqlParameters ={
new SugarParameter("@enddt", fendTime.ToString("yyyy-MM-dd HH:mm:ss")),
new SugarParameter("@groupname", groupName),
//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);
var reader = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataReader($"Query_Report_DownLoad_{systemName}", 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);

40
HT.Cloud.Service/ReportManage/MainPageService.cs
View File

@ -32,12 +32,12 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetRtData(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{driverName}_{groupName}_MAINPAGE");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{systemName}_MAINPAGE");
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"systemName={systemName}"; ;
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
@ -96,10 +96,10 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetRtChartData(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{driverName}_{groupName}_MAINPAGE");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{systemName}_MAINPAGE");
var dlist = list.Where(x => x.ElementIndex.Contains("C") && x.Hsig == "VP").ToList();
var rlist = new List<ChartDataFormat>();
@ -111,7 +111,7 @@ namespace HT.Cloud.Service.ReportManage
chartDataFormat.TagName = item.TagName;
chartDataFormat.Description = item.Description + $"({item.Units})";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"systemName={systemName}";
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
@ -134,11 +134,11 @@ namespace HT.Cloud.Service.ReportManage
}
public async Task<string> GetMainPageInit(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{driverName}_{groupName}_MAINPAGE");
{
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{systemName}_MAINPAGE");
Dictionary<string,string> dict = new Dictionary<string, string>();
foreach (var item in list)
{
@ -157,10 +157,10 @@ namespace HT.Cloud.Service.ReportManage
public async Task<string> GetMainPageChartInit(string systemName)
{
var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{driverName}_{groupName}_MAINPAGE");
//var groupName = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().GroupName;
//var driverId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == systemName).First().DriverID;
//var driverName = _context.AsTenant().QueryableWithAttr<MetaDriverEntity>().Where(x => x.DriverID == driverId).First().DriverName;
var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery<RTMainPageEntity>($"SELECT * FROM HT_{systemName}_MAINPAGE");
var dlist = list.Where(x=>x.ElementIndex.Contains("C")&&x.Hsig == "VP").ToList();
var rlist = new List<ChartDataFormat>();
@ -172,7 +172,7 @@ namespace HT.Cloud.Service.ReportManage
chartDataFormat.TagName = item.TagName;
chartDataFormat.Description = item.Description + $"({item.Units})";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver+ $"?groupName={groupName}";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"systemName={systemName}"; ;
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);