From 067b53334ce75ebe23f3858f5394ced46d95d901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E8=89=B3?= <2836604403@qq.com> Date: Fri, 25 Oct 2024 15:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/GetCarbonEmissionController.cs | 51 ++++++++++--------- .../api/GetCarbonIntensityController.cs | 25 ++++----- .../api/GetDailyElectricityController.cs | 12 ++--- .../api/GetLoadClassificationController.cs | 7 ++- .../LonglslandExhibitionCenter.csproj | 2 +- .../PublishProfiles/FolderProfile.pubxml.user | 6 +-- 6 files changed, 50 insertions(+), 53 deletions(-) diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs index 74a68db..d985f34 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs @@ -31,18 +31,6 @@ namespace LonglslandExhibitionCenter.Controllers.api var time_count = Convert.ToInt32(DateTime.Now.Month); for (int i = 0; i < time_count; i++) { - var stime = now.AddMonths(-i).ToString("yyyyMM"); - var etime = now.AddMonths(-(i + 1)).ToString("yyyyMM"); - var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime); - if (a == false) - { - bll.CreateTable(stime); - } - var b = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + etime); - if (b == false) - { - bll.CreateTable(etime); - } string sdate; if (i == 0) { @@ -53,6 +41,20 @@ namespace LonglslandExhibitionCenter.Controllers.api sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00"); } var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00"); + + var stime = DateTime.Parse(sdate).ToString("yyyyMM"); + var etime = DateTime.Parse(edate).ToString("yyyyMM"); + var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime); + if (a == false) + { + bll.CreateTable(stime); + } + var b = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + etime); + if (b == false) + { + bll.CreateTable(etime); + } + var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime); var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime); decimal? num1 = slist.Sum(x => x.EH); @@ -74,18 +76,6 @@ namespace LonglslandExhibitionCenter.Controllers.api var time_count = Convert.ToInt32(DateTime.Now.Year) - 2023; for (int i = 0; i < time_count; i++) { - var stime = now.AddYears(-i).ToString("yyyyMM"); - var etime = now.AddYears(-(i + 1)).ToString("yyyyMM"); - var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime); - if (a == false) - { - bll.CreateTable(stime); - } - var b = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + etime); - if (b == false) - { - bll.CreateTable(etime); - } string sdate; if (i == 0) { @@ -96,6 +86,19 @@ namespace LonglslandExhibitionCenter.Controllers.api sdate = now.AddYears(-i + 1).ToString("yyyy-01-01 00:00:00"); } var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00"); + + var stime = DateTime.Parse(sdate).ToString("yyyyMM"); + var etime = DateTime.Parse(edate).ToString("yyyyMM"); + var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime); + if (a == false) + { + bll.CreateTable(stime); + } + var b = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + etime); + if (b == false) + { + bll.CreateTable(etime); + } var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime); var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime); decimal? num1 = slist.Sum(x => x.EH); diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs index 55136de..625b152 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs @@ -21,20 +21,9 @@ namespace LonglslandExhibitionCenter.Controllers.api public HttpResponseMessage Get() { var res = new get_carbon_intensity(); - #region 表是否存在 - //表名 - var date_base = ConfigurationManager.AppSettings["MySQLDataBase"].ToString(); - var time = DateTime.Now.ToString("yyyyMM"); - var a = bll.IsExistsTable(date_base, "electricity_data_" + time); - if (a == false) - { - bll.CreateTable(time); - } - #endregion try { var data = new List(); - var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time); var now = DateTime.Now; var time_count = Convert.ToInt32(DateTime.Now.Month); for (int i = 0; i < time_count; i++) @@ -49,14 +38,20 @@ namespace LonglslandExhibitionCenter.Controllers.api sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00"); } var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00"); - var etime = Convert.ToDateTime(edate).ToString("yyyyMM"); - var b = bll.IsExistsTable(date_base, "electricity_data_" + etime); + var stime = DateTime.Parse(sdate).ToString("yyyyMM"); + var etime = DateTime.Parse(edate).ToString("yyyyMM"); + var a = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + stime); + if (a == false) + { + bll.CreateTable(stime); + } + var b = bll.IsExistsTable("changdao_zhanlanguang", "electricity_data_" + etime); if (b == false) { bll.CreateTable(etime); } - var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList(); - var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList(); + var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime); + var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime); var model = new carbon_intensityData() { time = DateTime.Now.AddMonths(-i).ToString("MM月"), diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs index 4746ae6..7d69629 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs @@ -36,18 +36,18 @@ namespace LonglslandExhibitionCenter.Controllers.api bll.CreateTable(time); } var list = bll.GetModelListDate(" Reserve1='配电室低压'", time); - for (int i = 1; i <= time_count; i++) + + var slist = list.Where(x => x.EntireTime == Convert.ToDateTime(now.ToString("yyyy-MM-dd 00:00:00"))).ToList(); + var num1 = slist.Sum(x => x.EH); + for (int i = 1; i < time_count; i++) { var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); - var sdate = now.AddHours(-(i - 1)).ToString("yyyy-MM-dd HH:00:00"); var jlist = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate)).ToList(); - var slist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList(); - var num1 = jlist.Sum(x => x.EH); - var num2 = slist.Sum(x => x.EH); + var num2 = jlist.Sum(x => x.EH); var model = new daily_electricityData { time = now.AddHours(-i).ToString("HH:00"), - EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num2 - num1), 3)) + EH = Convert.ToDecimal(num2 - num1) }; if (model.EH < 0) { diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs index 3b6b9a8..07621f7 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs @@ -26,15 +26,14 @@ namespace LonglslandExhibitionCenter.Controllers.api try { var data = new List(); - var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); - var edate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - var time = DateTime.Now.ToString("yyyyMM"); + var sdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); + var time = DateTime.Now.AddHours(-1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + time); if (a == false) { bll.CreateTable(time); } - var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time); + var list = bll.GetModelListDate(" Reserve1='配电室低压' and EntireTime='" + sdate + "'", time); //一级 var alist = list.Where(x => x.Reserve2.Contains("梯")).ToList(); decimal? num1 = alist.Sum(x => x.P); diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj index 41835a6..ea9d6ef 100644 --- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj +++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj @@ -402,7 +402,7 @@ True 15586 / - http://localhost:44396/ + http://localhost:42396/ False False diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user index f1cc85d..4898e5b 100644 --- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\项目\长岛展览馆\发布文件 - True|2024-09-19T06:04:55.6320188Z;True|2024-09-19T09:42:19.8527457+08:00;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00; + True|2024-10-18T07:40:22.1071380Z;True|2024-10-18T10:43:40.6685613+08:00;True|2024-10-18T10:42:14.0970919+08:00;True|2024-09-19T14:04:55.6320188+08:00;True|2024-09-19T09:42:19.8527457+08:00;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00; @@ -106,10 +106,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 08/13/2024 17:44:43 - 09/27/2024 17:51:35 + 10/18/2024 15:40:16 - 09/27/2024 17:51:35 + 10/18/2024 15:40:16 04/03/2022 22:02:06