diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/8b86239a-abb3-40de-a73b-65249ddd420f.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/32af3570-eb77-4f9e-9edb-c15295bc64db.vsidx similarity index 70% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/8b86239a-abb3-40de-a73b-65249ddd420f.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/32af3570-eb77-4f9e-9edb-c15295bc64db.vsidx index b6949c5..64cbdc0 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/8b86239a-abb3-40de-a73b-65249ddd420f.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/32af3570-eb77-4f9e-9edb-c15295bc64db.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a082f7ef-6e77-4995-9baa-eac53b94f0c7.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/75bcd449-aadd-4e3b-922d-f9c82ede1707.vsidx similarity index 100% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/a082f7ef-6e77-4995-9baa-eac53b94f0c7.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/75bcd449-aadd-4e3b-922d-f9c82ede1707.vsidx diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/81e97ba9-2dd1-44c3-a00d-5243973ee289.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/81e97ba9-2dd1-44c3-a00d-5243973ee289.vsidx new file mode 100644 index 0000000..e8623cd Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/81e97ba9-2dd1-44c3-a00d-5243973ee289.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/965e7255-390f-442b-aca6-ae4368f02b42.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/965e7255-390f-442b-aca6-ae4368f02b42.vsidx deleted file mode 100644 index a362339..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/965e7255-390f-442b-aca6-ae4368f02b42.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ae5c20de-e29c-446a-a2a4-ebfbc692415f.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ae5c20de-e29c-446a-a2a4-ebfbc692415f.vsidx new file mode 100644 index 0000000..efd7a2f Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ae5c20de-e29c-446a-a2a4-ebfbc692415f.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/caa54d5d-8338-4e5f-9c4f-c54cec7448de.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/caa54d5d-8338-4e5f-9c4f-c54cec7448de.vsidx deleted file mode 100644 index 0fa5906..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/caa54d5d-8338-4e5f-9c4f-c54cec7448de.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index 98ecb80..b80e2b9 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt index 838e6e0..996bf3d 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt and b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt differ diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs index cc476a5..e8d18d9 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs @@ -41,17 +41,17 @@ namespace LonglslandExhibitionCenter.Controllers.api var month_list = month_bll.GetModelList(string.Format(" `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate)); - // 处理跨月情况 - var time_count = GetUsedMonth1("月", startDate, endDate); - for (int i = 0; i <= time_count; i++) - { - var time = startDate.AddMonths(i).ToString("yyyyMM"); - if (bll.IsExistsTable(date_base, "electricity_data_" + time)) - { - var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); - list.AddRange(queryData); - } - } + //// 处理跨月情况 + //var time_count = GetUsedMonth1("月", startDate, endDate); + //for (int i = 0; i <= time_count; i++) + //{ + // var time = startDate.AddMonths(i).ToString("yyyyMM"); + // if (bll.IsExistsTable(date_base, "electricity_data_" + time)) + // { + // var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); + // list.AddRange(queryData); + // } + //} var month_count = Convert.ToInt32(now.Month); for (int i = 0; i < month_count; i++) @@ -61,6 +61,8 @@ namespace LonglslandExhibitionCenter.Controllers.api //当前月 if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM")) { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var data_model = new electricity_rateData(); data_model.time = month.ToString("MM月"); data_model.Electricity = 0; @@ -198,6 +200,8 @@ namespace LonglslandExhibitionCenter.Controllers.api } else { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var data_model = new electricity_rateData(); data_model.time = month.ToString("MM月"); data_model.Electricity = 0; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetMultiRateController.cs b/LonglslandExhibitionCenter/Controllers/api/GetMultiRateController.cs index fb4041c..89f4811 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetMultiRateController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetMultiRateController.cs @@ -116,16 +116,16 @@ namespace LonglslandExhibitionCenter.Controllers.api var month_list = month_bll.GetModelList(string.Format(" `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate)); // 处理跨月情况 - var time_count = GetUsedMonth1("月", startDate, endDate); - for (int i = 0; i <= time_count; i++) - { - var time = startDate.AddMonths(i).ToString("yyyyMM"); - if (bll.IsExistsTable(date_base, "electricity_data_" + time)) - { - var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); - list.AddRange(queryData); - } - } + //var time_count = GetUsedMonth1("月", startDate, endDate); + //for (int i = 0; i <= time_count; i++) + //{ + // var time = startDate.AddMonths(i).ToString("yyyyMM"); + // if (bll.IsExistsTable(date_base, "electricity_data_" + time)) + // { + // var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); + // list.AddRange(queryData); + // } + //} var month_count = Convert.ToInt32(now.Month); for (int i = 0; i < month_count; i++) @@ -135,6 +135,8 @@ namespace LonglslandExhibitionCenter.Controllers.api //当前月 if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM")) { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var data_model = new multi_rateData(); data_model.time = month.ToString("MM月"); data_model.Needle = 0; @@ -209,6 +211,8 @@ namespace LonglslandExhibitionCenter.Controllers.api } else { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var data_model = new multi_rateData(); data_model.time = month.ToString("MM月"); data_model.Needle = 0; @@ -282,16 +286,16 @@ namespace LonglslandExhibitionCenter.Controllers.api var month_list = month_bll.GetModelList(string.Format(" `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate)); // 处理跨月情况 - var time_count = GetUsedMonth1("月", startDate, endDate); - for (int i = 0; i <= time_count; i++) - { - var time = startDate.AddMonths(i).ToString("yyyyMM"); - if (bll.IsExistsTable(date_base, "electricity_data_" + time)) - { - var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); - list.AddRange(queryData); - } - } + //var time_count = GetUsedMonth1("月", startDate, endDate); + //for (int i = 0; i <= time_count; i++) + //{ + // var time = startDate.AddMonths(i).ToString("yyyyMM"); + // if (bll.IsExistsTable(date_base, "electricity_data_" + time)) + // { + // var queryData = bll.GetModelListDate(string.Format(" Reserve1='配电室低压' and `EntireTime`>='{0}' AND `EntireTime`<='{1}' ", startDate, endDate), time); + // list.AddRange(queryData); + // } + //} var year_count = Convert.ToInt32(now.Year) - 2023; for (int j = 0; j < year_count; j++) { @@ -315,6 +319,8 @@ namespace LonglslandExhibitionCenter.Controllers.api //当前月 if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM")) { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var day_count = (next_month - month).TotalDays; //循环月里的每一天 for (int day = 0; day < day_count; day++) @@ -376,6 +382,8 @@ namespace LonglslandExhibitionCenter.Controllers.api } else { + var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM")); + list.AddRange(queryData); var day_count = (next_month - month).TotalDays; //循环月里的每一天 for (int day = 0; day < day_count; day++) diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user index 62588c4..64ece66 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-08-27T13:03:21.5928516Z;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-09-19T01:42:19.8527457Z;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 - 08/27/2024 21:03:15 + 09/19/2024 09:42:14 - 08/27/2024 21:03:15 + 09/19/2024 09:42:14 04/03/2022 22:02:06 diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll index 47d528b..bfc3793 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb index 1d10e49..02e3cd8 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll index 6bbab64..5ad9cbb 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb index e16caef..78d31d1 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll index 47d528b..bfc3793 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb index 1d10e49..02e3cd8 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll index 47d528b..bfc3793 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb index 1d10e49..02e3cd8 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb differ