1、陕西建龙打包版本

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

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;