diff --git a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs index ca1f490..c64303f 100644 --- a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs @@ -96,9 +96,9 @@ namespace DongYingAPI.Controllers.api var model = new carbon_emissionData() { time = jtime, - PrimaryCirculation = (num1 - num4) / 1000 * Convert.ToDecimal(0.5703), - CollateralCirculation = (num2 - num5) / 1000 * Convert.ToDecimal(0.5703), - TerrestrialSource = (num3 - num6) / 1000 * Convert.ToDecimal(0.5703) + PrimaryCirculation =Convert.ToDecimal( Math.Round(Convert.ToDouble((num1 - num4) / 1000 * Convert.ToDecimal(0.5703)),3)), + CollateralCirculation =Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)),3)), + TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3)) }; data.Add(model); @@ -136,11 +136,11 @@ namespace DongYingAPI.Controllers.api else { //这天 - ztime = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + ztime = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00"); } //上天 - var stime = now.AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-(i + 1)).ToString("yyyyMM"); + var stime = now.AddDays(-(i)).ToString("yyyy-MM-dd 00:00:00"); + var atime = now.AddDays(-(i)).ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (b == false) { @@ -180,9 +180,9 @@ namespace DongYingAPI.Controllers.api var model = new carbon_emissionData() { time = jtime, - PrimaryCirculation = (num1 - num4) / 1000 * Convert.ToDecimal(0.5703), - CollateralCirculation = (num2 - num5) / 1000 * Convert.ToDecimal(0.5703), - TerrestrialSource = (num3 - num6) / 1000 * Convert.ToDecimal(0.5703) + PrimaryCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num1 - num4) / 1000 * Convert.ToDecimal(0.5703)), 3)), + CollateralCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)), 3)), + TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3)) }; data.Add(model); @@ -231,7 +231,7 @@ namespace DongYingAPI.Controllers.api //上天 var stime1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var stime2 = Convert.ToDateTime(stime1); - var stime = stime2.AddDays(-1); + var stime = stime2.AddDays(0); var atime = stime.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (b == false) @@ -273,9 +273,9 @@ namespace DongYingAPI.Controllers.api var model = new carbon_emissionData() { time = jtime, - PrimaryCirculation = (num1 - num4) / 1000 * Convert.ToDecimal(0.5703), - CollateralCirculation = (num2 - num5) / 1000 * Convert.ToDecimal(0.5703), - TerrestrialSource = (num3 - num6) / 1000 * Convert.ToDecimal(0.5703) + PrimaryCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num1 - num4) / 1000 * Convert.ToDecimal(0.5703)), 3)), + CollateralCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)), 3)), + TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3)) }; data.Add(model); diff --git a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs index 37faa41..5b69c35 100644 --- a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs @@ -44,8 +44,8 @@ namespace DongYingAPI.Controllers.api //这个 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上个 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var ltime = DateTime.Now.AddDays(-1).ToString("yyyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var ltime = DateTime.Now.ToString("yyyyMM"); var aa = bll.IsExistsTable(date_base, "electricity_data_" + ltime); if (aa == false) { diff --git a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs index 15708e0..8fccd9c 100644 --- a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs @@ -72,7 +72,7 @@ namespace DongYingAPI.Controllers.api //上月 var stime1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var stime2 = Convert.ToDateTime(stime1); - var stime = stime2.AddDays(-1); + var stime = stime2.AddDays(-0); var atime = stime.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (b == false) @@ -96,8 +96,8 @@ namespace DongYingAPI.Controllers.api } var model = new carbon_intensityData(); model.time = jtime; - model.CarbonPer=((num1-num2) / 1000 * Convert.ToDecimal(0.5703))/100000; - model.ArealCarbon= ((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 59000; + model.CarbonPer=Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000), 3)); + model.ArealCarbon= Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 59000), 3)); data.Add(model); } diff --git a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs index 0d77af3..acdfe8b 100644 --- a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs @@ -65,11 +65,11 @@ namespace DongYingAPI.Controllers else { //这天 - ztime = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + ztime = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00"); } //上天 - var stime = now.AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-(i + 1)).ToString("yyyyMM"); + var stime = now.AddDays(-(i)).ToString("yyyy-MM-dd 00:00:00"); + var atime = now.AddDays(-(i)).ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (b == false) { @@ -92,7 +92,7 @@ namespace DongYingAPI.Controllers } var model = new carbon_measureData(); model.time = jtime; - model.CarbonValue = ((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000; + model.CarbonValue =Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000),3)); data.Add(model); } @@ -100,7 +100,7 @@ namespace DongYingAPI.Controllers else if (date == "年") { var time_count = Convert.ToInt32(DateTime.Now.Month); - for (int i = 0; i < 6; i++) + for (int i = 0; i < time_count; i++) { // 只处理今年的数据 if (DateTime.Now.AddMonths(-i).Year != DateTime.Now.Year) @@ -134,7 +134,7 @@ namespace DongYingAPI.Controllers //上天 var stime1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var stime2 = Convert.ToDateTime(stime1); - var stime = stime2.AddDays(-1); + var stime = stime2.AddDays(-0); var atime = stime.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (b == false) @@ -158,7 +158,7 @@ namespace DongYingAPI.Controllers } var model = new carbon_measureData(); model.time = jtime; - model.CarbonValue = ((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000; + model.CarbonValue = Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000), 3)); data.Add(model); } diff --git a/DongYingAPI/Controllers/api/GetCarbonReductionController.cs b/DongYingAPI/Controllers/api/GetCarbonReductionController.cs index f962afb..64f524d 100644 --- a/DongYingAPI/Controllers/api/GetCarbonReductionController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonReductionController.cs @@ -27,11 +27,11 @@ namespace DongYingAPI.Controllers.api var blist=new List(); var bmodel=new carbon_reduction(); //空调 - bmodel.AirConditioner = 742.81*44.99/100; + bmodel.AirConditioner =Convert.ToDouble(Math.Round(Convert.ToDouble( 742.81*44.99/100),3)); //照明 - bmodel.Illumination = 742.81*13.68/100; + bmodel.Illumination =Convert.ToDouble(Math.Round(Convert.ToDouble(742.81*13.68/100),3)); //其它 - bmodel.Other = 742.81*(35.71+7.61)/100; + bmodel.Other =Convert.ToDouble(Math.Round(Convert.ToDouble(742.81*(35.71+7.61)/100),3)); blist.Add(bmodel); model.list = blist; data.Add(model); diff --git a/DongYingAPI/Controllers/api/GetCellRankingController.cs b/DongYingAPI/Controllers/api/GetCellRankingController.cs index 0c6862a..1316403 100644 --- a/DongYingAPI/Controllers/api/GetCellRankingController.cs +++ b/DongYingAPI/Controllers/api/GetCellRankingController.cs @@ -45,8 +45,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { @@ -86,8 +86,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { @@ -127,8 +127,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { diff --git a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs index 861690f..09b4928 100644 --- a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs +++ b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs @@ -37,7 +37,7 @@ namespace DongYingAPI.Controllers.api model.time = DateTime.Now.AddHours(-i).ToString("HH:00"); var now=DateTime.Now.AddHours(-i); var sdate = now.ToString("yyyy-MM-dd HH:00:00"); - var edate = now.AddHours(1).ToString("yyyy-MM-dd HH:00:00"); + var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var list = bll_info.GetModelList(" DeviceName='"+ room.name + "'"); var alist= bll.GetModelListDate(" EntireTime >='"+sdate+ "' and EntireTime<'"+edate+"'", time); diff --git a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs index 7b938b2..c4e7ee5 100644 --- a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs +++ b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs @@ -45,9 +45,9 @@ namespace DongYingAPI.Controllers.api //今天 var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); //昨天 - var edate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); + var edate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); //前天 - var qdate=DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var qdate=DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); decimal? num1 = 0; diff --git a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs index 6db5b40..08a81cf 100644 --- a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs +++ b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs @@ -39,7 +39,7 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(jtime); } //昨天 - var zdate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); + var zdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); var ztime = now.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + ztime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs index 05d176d..8076867 100644 --- a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs +++ b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs @@ -100,16 +100,16 @@ namespace DongYingAPI.Controllers.api } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00"); } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime = now.AddDays(-i + 1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { bll.CreateTable(jtime); } - var sdate = now.AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00"); - var stime = now.AddDays(-(i + 1)).ToString("yyyyMM"); + var sdate = now.AddDays(-(i)).ToString("yyyy-MM-dd 00:00:00"); + var stime = now.AddDays(-(i)).ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) { @@ -159,7 +159,7 @@ namespace DongYingAPI.Controllers.api } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs index 7dbd944..f0ad804 100644 --- a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs +++ b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs @@ -39,7 +39,7 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(jtime); } //昨天 - var zdate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); + var zdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); var ztime = now.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + ztime); if (b == false) @@ -47,7 +47,7 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(ztime); } //前天 - var qdate = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var qdate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); decimal? num1 = 0; decimal? num2 = 0; decimal? num3 = 0; @@ -78,7 +78,7 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(jmtime); } //昨月 - var zmdate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-01 00:00:00"); + var zmdate = DateTime.Now.ToString("yyyy-MM-01 00:00:00"); var zmtime = now.ToString("yyyyMM"); var bm = bll.IsExistsTable(date_base, "electricity_data_" + zmtime); if (bm == false) @@ -124,15 +124,15 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(jmtime); } //昨年 - var zydate = DateTime.Now.AddYears(-1).ToString("yyyy-12-31 00:00:00"); - var zytime = DateTime.Now.AddYears(-1).ToString("yyyy12"); + var zydate = DateTime.Now.ToString("yyyy-12-31 00:00:00"); + var zytime = DateTime.Now.ToString("yyyy12"); var by = bll.IsExistsTable(date_base, "electricity_data_" + zytime); if (by == false) { bll.CreateTable(zytime); } //前年 - var qydate1 = DateTime.Now.AddYears(-2).ToString("yyyy-12-31 00:00:00"); + var qydate1 = DateTime.Now.AddYears(-1).ToString("yyyy-12-31 00:00:00"); var qydate = Convert.ToDateTime(qydate1); var qytime = qmdate.ToString("yyyyMM"); var qy = bll.IsExistsTable(date_base, "electricity_data_" + qytime); diff --git a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs index bc83bc6..a5572b6 100644 --- a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs +++ b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs @@ -39,7 +39,7 @@ namespace DongYingAPI.Controllers.api bll.CreateTable(jtime); } //昨天 - var zdate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); + var zdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); var ztime = now.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + ztime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs index ea06dda..507f988 100644 --- a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs +++ b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs @@ -107,21 +107,21 @@ namespace DongYingAPI.Controllers } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00"); } // 只处理今月的数据 if (DateTime.Now.AddDays(-i).Month != DateTime.Now.Month) { continue; } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime =Convert.ToDateTime(jdate).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { bll.CreateTable(jtime); } - var sdate = now.AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00"); - var stime = now.AddDays(-(i + 1)).ToString("yyyyMM"); + var sdate = now.AddDays(-(i)).ToString("yyyy-MM-dd 00:00:00"); + var stime = now.AddDays(-(i)).ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) { @@ -176,7 +176,7 @@ namespace DongYingAPI.Controllers } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs index bd38134..edc4e83 100644 --- a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs +++ b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs @@ -90,16 +90,16 @@ namespace DongYingAPI.Controllers.api } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00"); } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime = now.AddDays(-i + 1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { bll.CreateTable(jtime); } - var sdate = now.AddDays(-(i + 1)).ToString("yyyy-MM-dd 00:00:00"); - var stime = now.AddDays(-(i + 1)).ToString("yyyyMM"); + var sdate = now.AddDays(-(i)).ToString("yyyy-MM-dd 00:00:00"); + var stime = now.AddDays(-(i)).ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) { @@ -152,7 +152,7 @@ namespace DongYingAPI.Controllers.api } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs index 5586712..c7e2dc3 100644 --- a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs +++ b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs @@ -46,8 +46,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { @@ -95,8 +95,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { @@ -148,8 +148,8 @@ namespace DongYingAPI.Controllers.api //今天 var ztime = now.ToString("yyyy-MM-dd HH:00:00"); //上天 - var stime = now.AddDays(-1).ToString("yyyy-MM-dd 00:00:00"); - var atime = now.AddDays(-1).ToString("yyyMM"); + var stime = now.ToString("yyyy-MM-dd 00:00:00"); + var atime = now.ToString("yyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + atime); if (a == false) { diff --git a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs index 5b3ab3a..14d8e1d 100644 --- a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs +++ b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs @@ -86,9 +86,9 @@ namespace DongYingAPI.Controllers.api { bll.CreateTable(jtime); } - var sdate1 = now.AddMonths(-1).ToString("yyyy-MM-01 00:00:00"); + var sdate1 = now.ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs b/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs index 72cb833..51d7a07 100644 --- a/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs +++ b/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs @@ -93,8 +93,8 @@ namespace DongYingAPI.Controllers.api var list1 = bll.GetModelListDate(" DeviceId='"+item.DeviceId+ "' and EntireTime>='"+sdate+ "' and EntireTime<='"+edate+"'", time); var list2 = bll.GetModelListDate("DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate1 + "' and EntireTime<='" + edate1 + "'", time); - decimal? num1 = list1.Sum(x=>Convert.ToDecimal(x.EH)); - decimal? num2 = list2.Sum(x=>Convert.ToDecimal(x.EH)); + decimal? num1 = list1.Sum(x=>Convert.ToDecimal(x.P)); + decimal? num2 = list2.Sum(x=>Convert.ToDecimal(x.P)); model.ToDay = num1; model.YearDay = num2; if (model.ToDay > model.YearDay) @@ -113,7 +113,7 @@ namespace DongYingAPI.Controllers.api else if (date == "月") { var time_count = Convert.ToInt32(DateTime.Now.Day); - for (int i = 0; i < 6; i++) + for (int i = 0; i < time_count; i++) { // 只处理今月的数据 if (DateTime.Now.AddDays(-i).Month != DateTime.Now.Month) @@ -133,8 +133,8 @@ namespace DongYingAPI.Controllers.api var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time); var list2 = bll.GetModelListDate("DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate1 + "' and EntireTime<='" + edate1 + "'", time); - decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.EH)); - decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.EH)); + decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.P)); + decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.P)); model.ToDay = num1; model.YearDay = num2; if (model.ToDay > model.YearDay) @@ -174,8 +174,8 @@ namespace DongYingAPI.Controllers.api var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time); var list2 = bll.GetModelListDate("DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate1 + "' and EntireTime<='" + edate1 + "'", time); - decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.EH)); - decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.EH)); + decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.P)); + decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.P)); model.ToDay = num1; model.YearDay = num2; if (model.ToDay > model.YearDay) diff --git a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs index 7745289..ae558ba 100644 --- a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs +++ b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs @@ -97,9 +97,9 @@ namespace DongYingAPI.Controllers.api } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00"); } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime = now.AddDays(-i+1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { @@ -134,7 +134,7 @@ namespace DongYingAPI.Controllers.api if (date == "年") { var time_count = Convert.ToInt32(DateTime.Now.Month); - for (int i = 0; i < 6; i++) + for (int i = 0; i < time_count; i++) { // 只处理今年的数据 if (DateTime.Now.AddMonths(-i).Year != DateTime.Now.Year) @@ -161,7 +161,7 @@ namespace DongYingAPI.Controllers.api } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) @@ -260,9 +260,9 @@ namespace DongYingAPI.Controllers.api } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00"); } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime = now.AddDays(-i + 1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { @@ -297,7 +297,7 @@ namespace DongYingAPI.Controllers.api if (date == "年") { var time_count = Convert.ToInt32(DateTime.Now.Month); - for (int i = 0; i < 6; i++) + for (int i = 0; i < time_count; i++) { // 只处理今年的数据 if (DateTime.Now.AddMonths(-i).Year != DateTime.Now.Year) @@ -324,7 +324,7 @@ namespace DongYingAPI.Controllers.api } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) @@ -423,9 +423,9 @@ namespace DongYingAPI.Controllers.api } else { - jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + jdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00"); } - var jtime = now.AddDays(-i).ToString("yyyyMM"); + var jtime = now.AddDays(-i + 1).ToString("yyyyMM"); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); if (a == false) { @@ -460,7 +460,7 @@ namespace DongYingAPI.Controllers.api if (date == "年") { var time_count = Convert.ToInt32(DateTime.Now.Month); - for (int i = 0; i < 6; i++) + for (int i = 0; i < time_count; i++) { // 只处理今年的数据 if (DateTime.Now.AddMonths(-i).Year != DateTime.Now.Year) @@ -487,7 +487,7 @@ namespace DongYingAPI.Controllers.api } var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00"); var sdate2 = Convert.ToDateTime(sdate1); - var sdate = sdate2.AddDays(-1); + var sdate = sdate2.AddDays(-0); var stime = sdate.ToString("yyyyMM"); var b = bll.IsExistsTable(date_base, "electricity_data_" + stime); if (b == false) diff --git a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs index 1802c55..aa11f2e 100644 --- a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs +++ b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs @@ -83,7 +83,7 @@ namespace DongYingAPI.Controllers.api else { //这天 - ztime = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); + ztime = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00"); } //上天 @@ -144,7 +144,7 @@ namespace DongYingAPI.Controllers.api //上月 var stime1 = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00"); var stime2=Convert.ToDateTime(stime1); - var stime = stime2.AddDays(-1); + var stime = stime2.AddDays(-0); //这月 var zlist = list.Where(x => x.EntireTime == Convert.ToDateTime(ztime)).ToList(); decimal? num1 = 0; diff --git a/DongYingAPI/DongYingAPI.csproj.user b/DongYingAPI/DongYingAPI.csproj.user index 87c7a36..70f6263 100644 --- a/DongYingAPI/DongYingAPI.csproj.user +++ b/DongYingAPI/DongYingAPI.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml ApiControllerEmptyScaffolder root/Common/Web API diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll index 8d68ab1..d359afb 100644 Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb index e99a840..c86e4b1 100644 Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll index 3cb1648..d359afb 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb index 205e860..c86e4b1 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ