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

53
HT.Cloud.Service/ChartsManage/HistoryChartsService.cs
View File

@ -57,43 +57,52 @@ namespace HT.Cloud.Service.ChartsManage
return subsystems.ToJson();
}
public async Task<string> GetAllSubsystemTag(string groupDescription)
public async Task<string> GetAllSubsystemTag(string systemName)
{
List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
var groupId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == groupDescription).First().GroupID;
var grouped = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().ToList().Where(x => x.GroupID == groupId);
List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
int i = 0;
foreach (var Meta_Tag in list_name_two)
{
subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
i++;
}
var systemId = _context.AsTenant().QueryableWithAttr<MetaSystemEntity>().Where(x => x.SystemName == systemName).First().SystemID;
var grouplist = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.SystemID == systemId).ToList();
foreach (var group in grouplist)
{
var grouped = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().ToList().Where(x => x.GroupID == group.GroupID);
List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
int i = 0;
foreach (var Meta_Tag in list_name_two)
{
subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
i++;
}
}
return subsystems.ToJson();
}
public async Task<string> GetSubsystemAllTag(string subsysytemName,string groupDescription)
public async Task<string> GetSubsystemAllTag(string subSystemName,string systemName)
{
var subsysname = subsysytemName;
var groupId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == groupDescription).First().GroupID;
var response = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().Where(x => x.Subsystem == subsysname&&x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
var reList = new List<SubAllTagReturn>();
foreach (var subsystem in response)
var subsysname = subSystemName;
var systemId = _context.AsTenant().QueryableWithAttr < MetaSystemEntity >().Where(x=>x.SystemName == systemName).First().SystemID;
var grouplist = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.SystemID == systemId).ToList();//.First().GroupID;
foreach (var group in grouplist)
{
reList.Add(
new SubAllTagReturn()
var response = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().Where(x => x.Subsystem == subsysname && x.GroupID == group.GroupID).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
//var reList = new List<SubAllTagReturn>();
foreach (var subsystem in response)
{
reList.Add(
new SubAllTagReturn()
{
TagID =(short)subsystem.TagID,
TagID = (short)subsystem.TagID,
Description = subsystem.Description + $"({subsystem.Units})",
Units = subsystem.Units
}
);
);
}
}
return reList.ToJson();
}
public async Task<string> GetChartsTagValue(short tagid,string startdt, string enddt, int timeinterval)
public async Task<string> GetChartsTagValue(short tagid,string startdt, string enddt, int timeinterval, string systemName)
{
SugarParameter[] sqlParameters =
{
@ -102,7 +111,7 @@ namespace HT.Cloud.Service.ChartsManage
new SugarParameter("@startdt",startdt),
new SugarParameter("@timeinterval",timeinterval)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Group_Tag", sqlParameters);
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable($"Query_Group_Tag_{systemName}", sqlParameters);
//*
//var ds = db.SqlQuery("Query_Report_Period", sqlParameters);///

12
HT.Cloud.Service/ChartsManage/HistoryTechChartsService.cs
View File

@ -35,10 +35,10 @@ namespace HT.Cloud.Service.ChartsManage
public async Task<string> GetAllTagList(string systemName, string chartTagType)
{
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_CHARTEntity>($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'");
//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_CHARTEntity>($"SELECT * FROM HT_{systemName}_CHART WHERE ChartTagType = '{chartTagType}'");
return list.ToJson();
}
@ -105,7 +105,7 @@ namespace HT.Cloud.Service.ChartsManage
return reList.ToJson();
}
public async Task<string> GetChartsTagValue(string table, string tagName, string startdt, string enddt, int timeinterval)
public async Task<string> GetChartsTagValue(string table, string tagName, string startdt, string enddt, int timeinterval, string systemName)
{
SugarParameter[] sqlParameters =
{
@ -115,7 +115,7 @@ namespace HT.Cloud.Service.ChartsManage
new SugarParameter("@enddt",enddt),
new SugarParameter("@timeinterval",timeinterval)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Chart_Tag", sqlParameters);
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable($"Query_Chart_Tag_{systemName}", sqlParameters);
//*
//var ds = db.SqlQuery("Query_Report_Period", sqlParameters);///

22
HT.Cloud.Service/ChartsManage/RtTechChartsService.cs
View File

@ -38,10 +38,10 @@ namespace HT.Cloud.Service.ChartsManage
{
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_CHARTEntity>($"SELECT * FROM HT_{driverName}_{groupName}_CHART WHERE ChartTagType = '{chartTagType}'");
//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_CHARTEntity>($"SELECT * FROM HT_{systemName}_CHART WHERE ChartTagType = '{chartTagType}'");
return list.ToJson();
}
@ -115,14 +115,14 @@ namespace HT.Cloud.Service.ChartsManage
var result_list = new List<List<ChartData>>();
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;
foreach (string tagNameTxt in charts_TagNames)
{
tagName_list.Add(tagNameTxt);
result_list.Add(new List<ChartData>());
}
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"systemName={systemName}";
/**/
@ -133,7 +133,7 @@ namespace HT.Cloud.Service.ChartsManage
var initDbData = new List<List<ChartData>>();
Task.Run(() =>
{
GetTagValueInit_Backgroud(Tables, charts_TagNames, timeStart, timeEnd, timeinterval, out finish, out initDbData);
GetTagValueInit_Backgroud(Tables, charts_TagNames, timeStart, timeEnd, timeinterval, out finish, out initDbData, systemName);
});
/**/
@ -180,7 +180,7 @@ namespace HT.Cloud.Service.ChartsManage
}
public void GetTagValueInit_Backgroud(string[] tables, string[] tagNames, string startdt, string enddt, int timeinterval,out bool finish, out List<List<ChartData>> initDbData)
public void GetTagValueInit_Backgroud(string[] tables, string[] tagNames, string startdt, string enddt, int timeinterval,out bool finish, out List<List<ChartData>> initDbData, string systemName)
{
finish = false;
initDbData = new List<List<ChartData>>();
@ -194,7 +194,7 @@ namespace HT.Cloud.Service.ChartsManage
new SugarParameter("@enddt",enddt),
new SugarParameter("@timeinterval",timeinterval)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Chart_Tag", sqlParameters);
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable($"Query_Chart_Tag_{systemName}", sqlParameters);
//*
//var ds = db.SqlQuery("Query_Report_Period", sqlParameters);///
@ -220,7 +220,7 @@ namespace HT.Cloud.Service.ChartsManage
var result_list = new List<List<ChartData>>();
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;
foreach (string tagNameTxt in charts_TagNames)
@ -229,7 +229,7 @@ namespace HT.Cloud.Service.ChartsManage
result_list.Add(new List<ChartData>());
}
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);
JObject valueJson = JObject.Parse(responseStr);

89
HT.Cloud.Service/ChartsManage/RtchartsService.cs
View File

@ -32,49 +32,58 @@ namespace HT.Cloud.Service.ChartsManage
var list_group = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().ToList();
return list_group.ToJson();
}
public async Task<string> GetAllSubsystemTag(string groupDescription)
{
List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
var groupId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == groupDescription).First().GroupID;
var grouped = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().ToList().Where(x => x.GroupID == groupId);
List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
int i = 0;
foreach (var Meta_Tag in list_name_two)
{
subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
i++;
}
return subsystems.ToJson();
}
public async Task<string> GetAllSubsystemTag(string systemName)
{
List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
var systemId = _context.AsTenant().QueryableWithAttr<MetaSystemEntity>().Where(x => x.SystemName == systemName).First().SystemID;
var grouplist = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.SystemID == systemId).ToList();
public async Task<string> GetSubsystemAllTag(string subsysytemName, string groupDescription)
{
foreach (var group in grouplist)
{
var grouped = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().ToList().Where(x => x.GroupID == group.GroupID);
List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
int i = 0;
foreach (var Meta_Tag in list_name_two)
{
subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
i++;
}
}
return subsystems.ToJson();
}
var subsysname = subsysytemName;
var groupId = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.GroupDescription == groupDescription).First().GroupID;
var response = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().Where(x => x.Subsystem == subsysname && x.GroupID == groupId).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
var reList = new List<SubAllTagReturn>();
foreach (var subsystem in response)
{
reList.Add(
new SubAllTagReturn()
{
TagID = (short)subsystem.TagID,
Description = subsystem.Description + $"({subsystem.Units})",
Units = subsystem.Units
}
);
}
return reList.ToJson();
}
public async Task<string> GetSubsystemAllTag(string subSystemName, string systemName)
{
var reList = new List<SubAllTagReturn>();
var subsysname = subSystemName;
var systemId = _context.AsTenant().QueryableWithAttr<MetaSystemEntity>().Where(x => x.SystemName == systemName).First().SystemID;
var grouplist = _context.AsTenant().QueryableWithAttr<MetaGroupEntity>().Where(x => x.SystemID == systemId).ToList();//.First().GroupID;
foreach (var group in grouplist)
{
var response = _context.AsTenant().QueryableWithAttr<MetaTagEntity>().Where(x => x.Subsystem == subsysname && x.GroupID == group.GroupID).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
//var reList = new List<SubAllTagReturn>();
foreach (var subsystem in response)
{
reList.Add(
new SubAllTagReturn()
{
TagID = (short)subsystem.TagID,
Description = subsystem.Description + $"({subsystem.Units})",
Units = subsystem.Units
}
);
}
}
return reList.ToJson();
}
public async Task<string> GetChartsTagValueInit(string[] charts_TagIDs, string systemName)
public async Task<string> GetChartsTagValueInit(string[] charts_TagIDs, string systemName)
{
var tagName_list = new List<string>();
var result_list = new List<List<ChartData>>();
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;
foreach (string tagIDTxt in charts_TagIDs)
{
@ -83,8 +92,8 @@ namespace HT.Cloud.Service.ChartsManage
tagName_list.Add(TagName);
result_list.Add(new List<ChartData>());
}
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtchartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
for (int i = 0; i < 3; i++)
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtchartsEntity>().First().remotertdataserver + $"systemName={systemName}";
for (int i = 0; i < 3; i++)
{
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
@ -122,7 +131,7 @@ namespace HT.Cloud.Service.ChartsManage
var result_list = new List<List<ChartData>>();
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;
foreach (string tagIDTxt in charts_TagIDs)
{
@ -132,8 +141,8 @@ namespace HT.Cloud.Service.ChartsManage
result_list.Add(new List<ChartData>());
}
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtchartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtchartsEntity>().First().remotertdataserver + $"systemName={systemName}";
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
JObject valueJson = JObject.Parse(responseStr);
int forid = 0;