1、陕西建龙打包版本
2、drawio导入SFC 3、多系统并存修改
This commit is contained in:
@ -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);///
|
||||
|
||||
|
Reference in New Issue
Block a user