From 4b3f5650df97be3d6b1e46ba953d5488eeefe73f Mon Sep 17 00:00:00 2001 From: dell Date: Wed, 26 Feb 2025 09:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E8=A5=BF=E5=BB=BA=E9=BE=9920250226?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=AC=A1=E6=95=B0=E5=B5=8C=E5=A5=97=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HT.Cloud.Service/ChartsManage/HistoryChartsService.cs | 3 +-- HT.Cloud.Service/ChartsManage/RtchartsService.cs | 3 +-- HT.Cloud.Web/appsettings.json | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs index cf819ff..18919a5 100644 --- a/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs +++ b/HT.Cloud.Service/ChartsManage/HistoryChartsService.cs @@ -62,12 +62,11 @@ namespace HT.Cloud.Service.ChartsManage List subsystems = new List(); var systemId = _context.AsTenant().QueryableWithAttr().Where(x => x.SystemName == systemName).First().SystemID; var grouplist = _context.AsTenant().QueryableWithAttr().Where(x => x.SystemID == systemId).ToList(); - + var i = 0; foreach (var group in grouplist) { var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x => x.GroupID == group.GroupID); List 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 }); diff --git a/HT.Cloud.Service/ChartsManage/RtchartsService.cs b/HT.Cloud.Service/ChartsManage/RtchartsService.cs index 421140b..d66b82e 100644 --- a/HT.Cloud.Service/ChartsManage/RtchartsService.cs +++ b/HT.Cloud.Service/ChartsManage/RtchartsService.cs @@ -37,12 +37,11 @@ namespace HT.Cloud.Service.ChartsManage List subsystems = new List(); var systemId = _context.AsTenant().QueryableWithAttr().Where(x => x.SystemName == systemName).First().SystemID; var grouplist = _context.AsTenant().QueryableWithAttr().Where(x => x.SystemID == systemId).ToList(); - + var i = 0; foreach (var group in grouplist) { var grouped = _context.AsTenant().QueryableWithAttr().ToList().Where(x => x.GroupID == group.GroupID); List 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 }); diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json index 1de5256..6b9b9b9 100644 --- a/HT.Cloud.Web/appsettings.json +++ b/HT.Cloud.Web/appsettings.json @@ -14,7 +14,7 @@ "LoginMultiple": false, // 是否允许一个账户在多处登录 "AllowCorsSite": "http://localhost:8058", // 允许的其他站点访问Api "DBProvider": "SqlServer", //SqlServer //Oracle - "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij+l0UiJ189taFaddb/34UyhBPBAHSDyHdS5dutbRWXGxNNPzBz9ObualPXLTjTq2uyK31xmHr+r5SxOpGzS0GwuiKBzdnXYU8I4Ybinhk4JlBwVgrOev6WufioTYfbao/40HHZzqg19GwkCTI+jyaESqFhgk8A9iooUfRElX/+of5CGuSksrvWjyf5By8tGl+A==", + "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij+l0UiJ189taFaddb/34UyhBPBAHSDyHdS5dutbRWXGxVYYJagLsPa0nNF8WvMp1bu2hwEQjZ+vCbe31OyVl5gdPApRd1gXKDbcnT5n6roWQThxTgkpE7Zw/xoEbMUaNNwFApCvAi38Wm7ftcc5ueBjQydkRVKNvQbSpHwbL/pEbftFRhiTcOllV/Pdi1KEt2A==", "DBCommandTimeout": 180, // 数据库超时时间，单位秒 "CacheProvider": "Memory", // 缓存使用方式 Redis/Memory "RedisConnectionString": "127.0.0.1:6379", //docker部署 172.17.0.1 @@ -35,7 +35,7 @@ { "DBNumber": "1", "DBProvider": "SqlServer", //MySql //Oracle - "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij+l0UiJ189taFaddb/34UyhBPBAHSDyHdS5dutbRWXGxNNPzBz9ObualPXLTjTq2uyK31xmHr+r5SxOpGzS0GwuiKBzdnXYU8I4Ybinhk4JlBwVgrOev6WufioTYfbao/40HHZzqg19GwkCTI+jyaESqFhgk8A9iooUfRElX/+of5CGuSksrvWjyf5By8tGl+A==" + "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij+l0UiJ189taFaddb/34UyhBPBAHSDyHdS5dutbRWXGxVYYJagLsPa0nNF8WvMp1bu2hwEQjZ+vCbe31OyVl5gdPApRd1gXKDbcnT5n6roWQThxTgkpE7Zw/xoEbMUaNNwFApCvAi38Wm7ftcc5ueBjQydkRVKNvQbSpHwbL/pEbftFRhiTcOllV/Pdi1KEt2A==" } ], "RabbitMq": {