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-09-07 17:21:02 +08:00
parent 28b59aa70e
commit b94dc66092
30 changed files with 799 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HT.Cloud.Web/Areas/ChartsManage/Controllers/HistoryChartsController.cs
View File

@ -23,7 +23,10 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class HistoryChartsController : BaseController
{
public HistoryChartsService _historyChartsService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]

15
HT.Cloud.Web/Areas/ChartsManage/Controllers/RtchartsController.cs
View File

@ -20,8 +20,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class RtchartsController : BaseController
{
public RtchartsService _rtchartsService { get;set;}
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
var data = await _rtchartsService.GetDriverGroupList();
@ -31,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _rtchartsService.GetAllSubsystemTag();
var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName);
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
return Content(data);
}

4
HT.Cloud.Web/Areas/ChartsManage/Views/Rtcharts/Index.cshtml
View File

@ -459,8 +459,8 @@
@*<ul id="dataTree" class="dtree" data-id="0"></ul>*@
<div id="aleft" style="float:left;width:100%;height:100%">
<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>
@*<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>*@
<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>
<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="

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

@ -23,7 +23,10 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class PenMeiHistoryChartsController : BaseController
{
public HistoryChartsService _historyChartsService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]

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

@ -23,8 +23,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class PenMeiHistoryTechChartsController : BaseController
{
public HistoryTechChartsService _historyTechChartsService { get;set;}
[HttpPost]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var systemName = "喷煤系统";

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

@ -23,8 +23,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class PenMeiRtTechChartsController : BaseController
{
public RtTechChartsService _rtTechChartsService { get;set;}
[HttpPost]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpPost]
public async Task<ActionResult> GetAllTagList(ChartTagType chartTagType)
{
var systemName = "喷煤系统";

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

@ -20,8 +20,11 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
public class PenMeiRtchartsController : BaseController
{
public RtchartsService _rtchartsService { get;set;}
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
var data = await _rtchartsService.GetDriverGroupList();
@ -31,28 +34,28 @@ namespace HT.Cloud.Web.Areas.ChartsManage.Controllers
[HttpGet]
public async Task<ActionResult> GetAllSubsystemTag()
{
var data = await _rtchartsService.GetAllSubsystemTag();
var data = await _rtchartsService.GetAllSubsystemTag(groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName)
{
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName);
var data = await _rtchartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValueInit(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs);
var data = await _rtchartsService.GetChartsTagValueInit(charts_TagIDs, groupDescription);
return Content(data);
}
[HttpPost]
public async Task<ActionResult> GetChartsTagValue(string[] charts_TagIDs)
{
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs);
var data = await _rtchartsService.GetChartsTagValue(charts_TagIDs, groupDescription);
return Content(data);
}

4
HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtcharts/Index.cshtml
View File

@ -459,8 +459,8 @@
@*<ul id="dataTree" class="dtree" data-id="0"></ul>*@
<div id="aleft" style="float:left;width:100%;height:100%">
<div class="easyui-panel" title="选择设备信息" style="width:100%;height:100%">
<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>
@*<div class="easyui-combobox" id="groupselect" name="group" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>*@
<div class="easyui-combobox" id="subsystemselect" name="state" data-options="onSelect:function(rec){updateSelect(rec)}" style="width:100%;height:40px">
</div>
<div class="easyui-datalist" id="subsystemTagList" title="变量列表" style="position: relative;width:100%;height:auto;overflow:auto;" data-options="

5
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmController.cs
View File

@ -22,7 +22,10 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public class PenMeiHistoryAlarmController : BaseController
{
public HistoryAlarmService _historyAlarmService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{

7
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryReportController.cs
View File

@ -18,8 +18,11 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
public class PenMeiHistoryReportController : BaseController
{
public HistoryReportService _historyReportService { get; set; }
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");

8
HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/RtReportController.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Threading.Tasks;
using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using HT.Cloud.Code;
namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
{
@ -10,8 +11,11 @@ namespace HT.Cloud.Web.Areas.PenMeiReportManage.Controllers
public class RtReportController : BaseController
{
public RtReportService _rtReportService { get; set; }
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetRtData()
{
var data = await _rtReportService.GetRtSubsysTagValue();

7
HT.Cloud.Web/Areas/ReportManage/Controllers/HistoryReportController.cs
View File

@ -19,8 +19,11 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public class HistoryReportController : BaseController
{
public HistoryReportService _historyReportService { get; set; }
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{
//var StartTime = reportparam.StartTime.ToString("yyyy-MM-dd HH:mm:ss");

49
HT.Cloud.Web/Areas/ReportManage/Controllers/MainPageControl.cs Normal file
View File

@ -0,0 +1,49 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Threading.Tasks;
using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using HT.Cloud.Code;
namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
[Area("ReportManage")]
public class MainPageController : BaseController
{
public MainPageService _mainPageService { get; set; }
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetMainPageInit()
{
var data = await _mainPageService.GetMainPageInit(groupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetMainPageChartInit()
{
var data = await _mainPageService.GetMainPageChartInit(groupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetRtData()
{
var data = await _mainPageService.GetRtData(groupDescription);
return Content(data);
}
[HttpGet]
public async Task<ActionResult> GetRtChartData()
{
var data = await _mainPageService.GetRtChartData(groupDescription);
return Content(data);
}
}
}

5
HT.Cloud.Web/Areas/ReportManage/Controllers/MetaTagAlarmController.cs
View File

@ -22,7 +22,10 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public class MetaTagAlarmController : BaseController
{
public MetaTagAlarmService _metaTagAlarmService { get;set;}
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetDriverGroupList()
{

8
HT.Cloud.Web/Areas/ReportManage/Controllers/RtReportController.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Threading.Tasks;
using HT.Cloud.Service.ChartsManage;
using HT.Cloud.Service.ReportManage;
using HT.Cloud.Code;
namespace HT.Cloud.Web.Areas.ReportManage.Controllers
{
@ -10,8 +11,11 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
public class RtReportController : BaseController
{
public RtReportService _rtReportService { get; set; }
[HttpGet]
/// <summary>
/// 绑定数据仓库的数据库ID
/// </summary>
private string groupDescription = GlobalContext.SystemConfig.GroupDescription;
[HttpGet]
public async Task<ActionResult> GetRtData()
{
var data = await _rtReportService.GetRtSubsysTagValue();

1
HT.Cloud.Web/Areas/SystemSecurity/Views/ServerMonitoring/Index.cshtml
View File

@ -356,7 +356,6 @@
</div>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-card">
<div class="layui-card-header"><i class="fa fa-fire icon"></i>.NET信息</div>