cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大版本更新推送

Browse Source
This commit is contained in:
dell
2023-11-06 21:26:55 +08:00
parent b94dc66092
commit 17b4e899ff
36 changed files with 3491 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ using HT.Cloud.Domain.ReportManage;
using Quartz;
using Newtonsoft.Json.Linq;
using System.Threading;
using System.Security.Cryptography.Xml;
namespace HT.Cloud.Service.ChartsManage
{
@ -107,8 +108,9 @@ namespace HT.Cloud.Service.ChartsManage
return reList.ToJson();
}
public async Task<string> GetChartsTagValueInit(string[] charts_TagNames,string systemName)
public async Task<string> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables, string systemName)
{
var tagName_list = new List<string>();
var result_list = new List<List<ChartData>>();
@ -121,7 +123,23 @@ namespace HT.Cloud.Service.ChartsManage
result_list.Add(new List<ChartData>());
}
var remoteRtDataServer = _context.AsTenant().QueryableWithAttr<RtTechChartsEntity>().First().remotertdataserver + $"?groupName={groupName}";
for (int i = 0; i < 3; i++)
/**/
var timeEnd = DateTime.Now.AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss");
var timeStart = DateTime.Now.AddHours(-2).ToString("yyyy-MM-dd HH:mm:ss");
var timeinterval = 1;
bool finish = false;
var initDbData = new List<List<ChartData>>();
Task.Run(() =>
{
GetTagValueInit_Backgroud(Tables, charts_TagNames, timeStart, timeEnd, timeinterval, out finish, out initDbData);
});
/**/
while (!finish)
{
var responseStr = RemoteHttpRequest.HttpGet(remoteRtDataServer);
@ -150,9 +168,52 @@ namespace HT.Cloud.Service.ChartsManage
}
Thread.Sleep(980);
}
return result_list.ToJson();
for(int ii =0;ii<initDbData.Count;ii++)
{
var item = result_list[ii].ToList();
initDbData[ii].AddRange(item);
}
return initDbData.ToJson();
}
public void GetTagValueInit_Backgroud(string[] tables, string[] tagNames, string startdt, string enddt, int timeinterval,out bool finish, out List<List<ChartData>> initDbData)
{
finish = false;
initDbData = new List<List<ChartData>>();
for(int i = 0;i<tagNames.Length;i++)
{
SugarParameter[] sqlParameters =
{
new SugarParameter("@HTable",tables[i]),
new SugarParameter("@HTagName",tagNames[i]),
new SugarParameter("@startdt",startdt),
new SugarParameter("@enddt",enddt),
new SugarParameter("@timeinterval",timeinterval)
};
var dt = _context.AsTenant().GetConnection(dataDBNumber).Ado.UseStoredProcedure().GetDataTable("Query_Chart_Tag", sqlParameters);
//*
//var ds = db.SqlQuery("Query_Report_Period", sqlParameters);///
var valuelist = DataTableConvertModel<HDATETIMEVALUE>.ConvertDataTableToList(dt);
var resultlist = new List<ChartData>();
foreach (var value in valuelist)
{
resultlist.Add(new ChartData()
{
name = value.HDATETIME,
value = value.VALUE
});
}
initDbData.Add(resultlist);
}
finish = true;
}
public async Task<string> GetChartsTagValue(string[] charts_TagNames, string systemName)
{
var tagName_list = new List<string>();
@ -227,5 +288,6 @@ namespace HT.Cloud.Service.ChartsManage
public String HDATETIME { get; set; }
public decimal VALUE { get; set; }
}
}
}
}