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

25
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryChartsController.cs
View File

@ -31,6 +31,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -44,17 +49,17 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var data = await _historyChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
[HttpPost]
public async Task<ActionResult> GetAllSubsystemTag(string[] systemName)
{
var data = await _historyChartsService.GetAllSubsystemTag(systemDescription);
var data = await _historyChartsService.GetAllSubsystemTag(systemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(string SubsysytemName)
public async Task<ActionResult> GetSubsystemAllTag(SubSystemName_params SubSystemName_params)
{
var data = await _historyChartsService.GetSubsystemAllTag(SubsysytemName, systemDescription);
var data = await _historyChartsService.GetSubsystemAllTag(SubSystemName_params.SubSystemName, SubSystemName_params.SystemName);
return Content(data);
}
@ -65,8 +70,9 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var Interval =int.Parse(charts_Params.Interval);
var SystemName = charts_Params.SystemName;
var data = await _historyChartsService.GetChartsTagValue(TagID, StartTime, EndTime, Interval);
var data = await _historyChartsService.GetChartsTagValue(TagID, StartTime, EndTime, Interval, SystemName);
return Content(data);
}
@ -121,6 +127,13 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
public class SubSystemName_params
{
public string SystemName { get; set; }
public string SubSystemName { get; set; }
}
}

15
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiHistoryTechChartsController.cs
View File

@ -11,6 +11,7 @@ using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using Serenity.Services;
using HT.Cloud.Domain.DevicesManage;
using Quartz;
namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
{
@ -29,11 +30,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
[HttpPost]
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
var data = await _historyTechChartsService.GetAllTagList(chartTagType.SystemName, chartTagType.ChartTagTypeName);
return Content(data);
}
@ -73,8 +79,9 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
var StartTime = Gettime(charts_Params.StartTime);
var EndTime = Gettime(charts_Params.EndTime);
var Interval =int.Parse(charts_Params.Interval);
var SystemName = charts_Params.SystemName;
var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval);
var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval, SystemName);
return Content(data);
}
@ -88,6 +95,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class ChartTagType
{
public string SystemName { get; set; }
public string ChartTagTypeName { get;set; }
}
@ -136,6 +144,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string StartTime { get; set; }
public string EndTime { get; set; }
public string Interval { get; set; }
public string SystemName { get; set; }
}
}

16
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtTechChartsController.cs
View File

@ -29,11 +29,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var data = await _rtTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName);
var data = await _rtTechChartsService.GetAllTagList(chartTagType.SystemName, chartTagType.ChartTagTypeName);
return Content(data);
}
@ -66,16 +71,16 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables)
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagNames, string[] Tables, string[] SystemName)
{
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, systemDescription);
var data = await _rtTechChartsService.GetChartsTagValueInit(charts_TagNames, Tables, SystemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames)
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagNames, string[] SystemName)
{
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, systemDescription);
var data = await _rtTechChartsService.GetChartsTagValue(charts_TagNames, SystemName[0]);
return Content(data);
}
@ -90,6 +95,7 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class ChartTagType
{
public string ChartTagTypeName { get;set; }
public string SystemName { get;set; }
}

31
HT.Cloud.Web/Areas/PenMeiChartsManage/Controllers/PenMeiRtchartsController.cs
View File

@ -8,6 +8,7 @@ using HT.Cloud.Domain.ChartsManage;
using HT.Cloud.Service;
using Microsoft.AspNetCore.Authorization;
using HT.Cloud.Service.ChartsManage;
using static HT.Cloud.Web.Areas.ChartsManage.Controllers.PenMeiHistoryChartsController;
namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
{
@ -24,6 +25,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
/// 绑定数据仓库的数据库ID
/// </summary>
private string systemDescription = GlobalContext.SystemConfig.SystemDescription;
public override ActionResult Index()
{
ViewData["SystemName"] = Request.Query["SystemName"];
return View();
}
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
@ -31,31 +37,31 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
[HttpPost]
public async Task<ActionResult> GetAllSubsystemTag(string[] systemName)
{
var data = await _rtchartsService.GetAllSubsystemTag(systemDescription);
var data = await _rtchartsService.GetAllSubsystemTag(systemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
public async Task<ActionResult> GetSubsystemAllTag(SubSystemName_params SubSystemName_params)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, systemDescription);
var data = await _rtchartsService.GetSubsystemAllTag(SubSystemName_params.SubSystemName, SubSystemName_params.SystemName);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs, string[] SystemName)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, systemDescription);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, SystemName[0]);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs, string[] SystemName)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, systemDescription);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, SystemName[0]);
return Content(data);
}
@ -98,5 +104,10 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public string EndTime { get; set; }
public string Interval { get; set; }
}
}
public class SubSystemName_params
{
public string SystemName { get; set; }
public string SubSystemName { get; set; }
}
}
}