diff --git a/DataServer/DataServer.csproj b/DataServer/DataServer.csproj index f2f2a85..d50d976 100644 --- a/DataServer/DataServer.csproj +++ b/DataServer/DataServer.csproj @@ -101,6 +101,7 @@ + diff --git a/DataServer/api/get_carbon_measure.cs b/DataServer/api/get_carbon_measure.cs new file mode 100644 index 0000000..22222dd --- /dev/null +++ b/DataServer/api/get_carbon_measure.cs @@ -0,0 +1,32 @@ +using DataServer.api; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataServer.Model +{ + public class get_carbon_measure + { + /// + /// 返回码 + /// + public int code { get; set; } + + /// + /// 返回说明 + /// + public string msg { get; set; } + + /// + /// 数据 + /// + public List data { get; set; } + } + public class carbon_measureData + { + public string time { get; set; } + public decimal? CarbonValue { get; set; } + } +} diff --git a/DongYingAPI/Controllers/api/GetAirConditionerController.cs b/DongYingAPI/Controllers/api/GetAirConditionerController.cs index a41bcb0..fa8e513 100644 --- a/DongYingAPI/Controllers/api/GetAirConditionerController.cs +++ b/DongYingAPI/Controllers/api/GetAirConditionerController.cs @@ -65,11 +65,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new air_conditionerData(); - var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); model.time = atime; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; foreach (var item in list) { @@ -91,11 +91,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new air_conditionerData(); - var atime = DateTime.Now.AddYears(-i).ToString("yyyy年"); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); model.time = atime; - var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; + var now = DateTime.Now.AddMonths(-i); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; decimal? num = 0; foreach (var item in list){ var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); diff --git a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs index 27e009c..131dd4c 100644 --- a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs @@ -90,11 +90,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new carbon_emissionData(); - var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); model.time = atime; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList(); decimal? num1 = 0; @@ -138,11 +138,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new carbon_emissionData(); - var atime = DateTime.Now.AddYears(-i).ToString("yyyy年"); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); model.time = atime; - var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; + var now = DateTime.Now.AddMonths(-i); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList(); decimal? num1 = 0; diff --git a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs index 5bd607f..ad371cc 100644 --- a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs +++ b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs @@ -16,22 +16,22 @@ namespace DongYingAPI.Controllers.api /// public class GetCarbonFluxController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); // GET api/ - public HttpResponseMessage Get(string date = "") + public HttpResponseMessage Get() { var res = new get_carbon_flux(); try { - if (!string.IsNullOrEmpty(date)) - { var data = new List(); - var list = bll.GetModelList(""); var model = new carbon_fluxData(); + var time = DateTime.Now.ToString("yyyyMM"); + var list = bll_info.GetModelList(""); var now = DateTime.Now; var sdate = now.ToString("yyyy-MM-dd 00:00:00"); var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var alist = bll.GetModelListDate("",time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); decimal? num = 0; foreach (var item in alist) { @@ -40,48 +40,96 @@ namespace DongYingAPI.Controllers.api #region 一级 model.AggregateName = "总量"; model.AggregateValue = Math.Round(Convert.ToDecimal(num / 1000 * Convert.ToDecimal(0.5703)), 3); - #endregion + #endregion #region 二级 - #endregion - var amodel = new secondlevel(); + #endregion + #region 天然气 + var alist1 = new List(); + var amodel = new secondlevel(); amodel.SecondName = "天然气"; amodel.SecondValue = 0; - var amodel1=new secondlevel(); + #endregion + #region 电 + var amodel1 = new secondlevel(); amodel1.SecondName = "电"; amodel1.SecondValue = Math.Round(Convert.ToDecimal(num / 1000 * Convert.ToDecimal(0.5703)), 3); - model.list.Add(amodel); - model.list.Add(amodel1); - var bmodel=new threelevel(); + alist1.Add(amodel); + alist1.Add(amodel1); + model.list= alist1; + #endregion + #region 空调 + var tlist= new List(); + var klist = list.Where(x => x.DeviceName.Contains("空调")).ToList(); + var bmodel = new threelevel(); bmodel.ThreeName = "空调"; - var klist=alist.Where(x=>x.DeviceName.Contains("空调")).ToList(); decimal? num1 = 0; foreach (var item in klist) { - num1 += item.EH; + var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + } - bmodel.ThreeValue= Math.Round(Convert.ToDecimal(num1 / 1000 * Convert.ToDecimal(0.5703)), 3); - amodel.list.Add(bmodel); - var bmodel1=new threelevel(); + bmodel.ThreeValue = Math.Round(Convert.ToDecimal(num1 / 1000 * Convert.ToDecimal(0.5703)), 3); + tlist.Add(bmodel); + #endregion + #region 照明 + var bmodel1 = new threelevel(); bmodel1.ThreeName = "照明"; - var zlist = alist.Where(x => x.DeviceName.Contains("照明")).ToList(); + var zlist = list.Where(x => x.DeviceName.Contains("照明")).ToList(); decimal? num2 = 0; foreach (var item in zlist) { - num2 += item.EH; + var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList(); + foreach (var aitem in list1) + { + num2 += aitem.EH; + } } - bmodel1.ThreeValue= Math.Round(Convert.ToDecimal(num2 / 1000 * Convert.ToDecimal(0.5703)), 3); - - data.Add(model); - res.code = 200; + bmodel1.ThreeValue = Math.Round(Convert.ToDecimal(num2 / 1000 * Convert.ToDecimal(0.5703)), 3); + tlist.Add(bmodel1); + + #endregion + #region 电梯 + var dmodel1 = new threelevel(); + dmodel1.ThreeName = "电梯"; + var dlist = list.Where(x => x.DeviceName.Contains("电梯") || x.DeviceName.Contains("梯")).ToList(); + decimal? num3 = 0; + foreach (var item in dlist) + { + var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList(); + foreach (var aitem in list1) + { + num3 += aitem.EH; + } + } + dmodel1.ThreeValue = Math.Round(Convert.ToDecimal(num3 / 1000 * Convert.ToDecimal(0.5703)), 3); + tlist.Add(dmodel1); + #endregion + #region 其它 + var qmodel1 = new threelevel(); + qmodel1.ThreeName = "其它"; + var qlist = list.Where(x =>!( x.DeviceName.Contains("电梯") || x.DeviceName.Contains("梯")||x.DeviceName.Contains("空调")||x.DeviceName.Contains("照明"))).ToList(); + decimal? num4 = 0; + foreach (var item in qlist) + { + var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList(); + foreach (var aitem in list1) + { + num4 += aitem.EH; + } + } + qmodel1.ThreeValue = Math.Round(Convert.ToDecimal(num4 / 1000 * Convert.ToDecimal(0.5703)), 3); + tlist.Add(qmodel1); + #endregion + amodel.list = tlist; + data.Add(model); + res.code = 200; res.msg = "成功"; res.data = data; - } - else - { - res.code = 201; - res.msg = "参数为空"; - } } catch (Exception ex) { diff --git a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs new file mode 100644 index 0000000..9b17a95 --- /dev/null +++ b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs @@ -0,0 +1,134 @@ +using DataServer.api; +using DataServer.Model; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Web.Http; + +namespace DongYingAPI.Controllers +{ + /// + /// 碳-碳排放量 + /// + public class GetCarbonMeasureController : ApiController + { + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); + public HttpResponseMessage Get(string date = "") + { + var res = new get_air_conditioner(); + try + { + if (!string.IsNullOrEmpty(date)) + { + var data = new List(); + var list = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("空调")).ToList(); + var time = DateTime.Now.ToString("yyyyMM"); + if (date == "日") + { + + var a = DateTime.Now.ToString("mm"); + var b = 0; + for (int i = 0; i < 6; i++) + { + var model = new air_conditionerData(); + + var j = i * 60; + b = Convert.ToInt32(a); + string now = ""; + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; + var datetime = Convert.ToDateTime(now); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + decimal? num1 = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.P; + } + model.P = num1; + } + data.Add(model); + + } + } + else if (date == "月") + { + for (int i = 0; i < 6; i++) + { + var model = new air_conditionerData(); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + + } + data.Add(model); + } + } + else if (date == "年") + { + for (int i = 0; i < 6; i++) + { + var model = new air_conditionerData(); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddMonths(-i); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + + } + data.Add(model); + } + } + res.code = 200; + res.msg = "成功"; + res.data = data; + } + else + { + res.code = 201; + res.msg = "参数为空"; + } + } + catch (Exception ex) + { + res.code = 500; + res.msg = "失败，" + ex.Message; + } + HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") }; + return result; + } + } +} \ No newline at end of file diff --git a/DongYingAPI/Controllers/api/GetChamberLoadController.cs b/DongYingAPI/Controllers/api/GetChamberLoadController.cs index 8b51aa9..f307c4a 100644 --- a/DongYingAPI/Controllers/api/GetChamberLoadController.cs +++ b/DongYingAPI/Controllers/api/GetChamberLoadController.cs @@ -68,11 +68,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new power_loadData(); - var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); model.time = atime; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; foreach (var item in list) { @@ -94,11 +94,11 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new power_loadData(); - var atime = DateTime.Now.AddYears(-i).ToString("yyyy年"); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; foreach (var item in list) { @@ -118,180 +118,192 @@ namespace DongYingAPI.Controllers.api res.msg = "成功"; res.data = data; } - //else if (type == "配电室2") - //{ - // var data = new List(); - // var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); - // if (date == "日") - // { + else if (type == "配电室2") + { + var data = new List(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); + var time = DateTime.Now.ToString("yyyyMM"); + if (date == "日") + { - // var a = DateTime.Now.ToString("mm"); - // var b = 0; - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); + var a = DateTime.Now.ToString("mm"); + var b = 0; + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); - // var j = i * 150; - // b = Convert.ToInt32(a); - // string now = ""; - // if (b < 30) - // { - // model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - // now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - // //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - // a = "31"; - // } - // else - // { - // model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - // now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - // a = "29"; - // } - // var datetime = Convert.ToDateTime(now); - // var sdate = datetime.AddMinutes(-(i + 1) * 150); - // var edate = datetime.AddMinutes(-j); - // var list1 = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵" && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); - // decimal? num1 = 0; - // foreach (var item in list1) - // { - // num1 += item.P; - // } - // model.P = num1; - // data.Add(model); + var j = i * 60; + b = Convert.ToInt32(a); + string now = ""; + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; + var datetime = Convert.ToDateTime(now); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + decimal? num1 = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.P; + } + model.P = num1; + } + data.Add(model); - // } - // } - // else if (date == "月") - // { - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); - // var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - // model.time = time; - // var now = DateTime.Now.AddMonths(-i); - // var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - // var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - // var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - // decimal? num = 0; - // foreach (var item in alist) - // { - // num += item.P; - // } - // model.P = num; - // data.Add(model); - // } - // } - // else if (date == "年") - // { - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); - // var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - // model.time = time; - // var now = DateTime.Now.AddYears(-i); - // var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - // var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - // var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - // decimal? num = 0; - // foreach (var item in alist) - // { - // num += item.P; - // } - // model.P = num; - // data.Add(model); - // } - // } - // res.code = 200; - // res.msg = "成功"; - // res.data = data; - //} - //else if (type == "配电室3") - //{ - // var data = new List(); - // var list = bll.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList(); - // if (date == "日") - // { + } + } + else if (date == "月") + { + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); - // var a = DateTime.Now.ToString("mm"); - // var b = 0; - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; - // var j = i * 150; - // b = Convert.ToInt32(a); - // string now = ""; - // if (b < 30) - // { - // model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - // now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - // //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - // a = "31"; - // } - // else - // { - // model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - // now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - // a = "29"; - // } - // var datetime = Convert.ToDateTime(now); - // var sdate = datetime.AddMinutes(-(i + 1) * 150); - // var edate = datetime.AddMinutes(-j); - // var list1 = bll.GetModelList("").Where(x => x.FloorName == "图书馆一楼" && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); - // decimal? num1 = 0; - // foreach (var item in list1) - // { - // num1 += item.P; - // } - // model.P = num1; - // data.Add(model); + } + data.Add(model); + } + } + else if (date == "年") + { + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddYears(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; - // } - // } - // else if (date == "月") - // { - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); - // var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - // model.time = time; - // var now = DateTime.Now.AddMonths(-i); - // var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - // var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - // var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - // decimal? num = 0; - // foreach (var item in alist) - // { - // num += item.P; - // } - // model.P = num; - // data.Add(model); - // } - // } - // else if (date == "年") - // { - // for (int i = 0; i < 6; i++) - // { - // var model = new power_loadData(); - // var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - // model.time = time; - // var now = DateTime.Now.AddYears(-i); - // var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - // var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - // var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); - // decimal? num = 0; - // foreach (var item in alist) - // { - // num += item.P; - // } - // model.P = num; - // data.Add(model); - // } - // } - // res.code = 200; - // res.msg = "成功"; - // res.data = data; - //} + } + data.Add(model); + } + } + res.code = 200; + res.msg = "成功"; + res.data = data; + } + else if (type == "配电室3") + { + var data = new List(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList(); + var time = DateTime.Now.ToString("yyyyMM"); + if (date == "日") + { + + var a = DateTime.Now.ToString("mm"); + var b = 0; + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); + + var j = i * 60; + b = Convert.ToInt32(a); + string now = ""; + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; + var datetime = Convert.ToDateTime(now); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + decimal? num1 = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.P; + } + model.P = num1; + } + data.Add(model); + + } + } + else if (date == "月") + { + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + + } + data.Add(model); + } + } + else if (date == "年") + { + for (int i = 0; i < 6; i++) + { + var model = new power_loadData(); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddYears(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; + decimal? num = 0; + foreach (var item in list) + { + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + + } + data.Add(model); + } + } + res.code = 200; + res.msg = "成功"; + res.data = data; + } } else { diff --git a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs index 855dfd0..de9a5bf 100644 --- a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs +++ b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs @@ -16,8 +16,8 @@ namespace DongYingAPI.Controllers.api /// public class GetCurrentVoltageController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); - + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get([FromBody] select_switching_room room) { var res = new get_current_voltage(); @@ -25,6 +25,7 @@ namespace DongYingAPI.Controllers.api { if (!string.IsNullOrEmpty(room.type)&&!string.IsNullOrEmpty(room.name)) { + string time = DateTime.Now.ToString("yyyyMM"); if (room.type == "电流") { var data = new List(); @@ -35,12 +36,17 @@ namespace DongYingAPI.Controllers.api 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 list = bll.GetModelList("").Where(x => x.DeviceName == room.name && x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + + var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList(); foreach (var item in list) { - model.A = item.Ia; - model.B = item.Ib; - model.C = item.Ic; + var list1=bll.GetModelListDate("",time).Where(x=>x.EntireTime>=Convert.ToDateTime(sdate)&&x.EntireTime x.DeviceName == room.name && x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList(); foreach (var item in list) { - model.A = item.Ua; - model.B = item.Ub; - model.C = item.Uc; + var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)); + foreach (var aitem in list1) + { + model.A = aitem.Ua; + model.B = aitem.Ub; + model.C = aitem.Uc; + } } data.Add(model); } diff --git a/DongYingAPI/Controllers/api/GetDistributionPowerController.cs b/DongYingAPI/Controllers/api/GetDistributionPowerController.cs index 6ade06e..66aee57 100644 --- a/DongYingAPI/Controllers/api/GetDistributionPowerController.cs +++ b/DongYingAPI/Controllers/api/GetDistributionPowerController.cs @@ -16,7 +16,8 @@ namespace DongYingAPI.Controllers.api /// public class GetDistributionPowerController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get([FromBody] select_switching_name room) { @@ -26,7 +27,8 @@ namespace DongYingAPI.Controllers.api if (!string.IsNullOrEmpty(room.name)) { var data = new List(); - var list = bll.GetModelList("").Where(x => x.DeviceName == room.name).ToList(); + var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList(); + var time = DateTime.Now.ToString("yyyyMM"); for (int i = 0; i < 6; i++) { var model=new distribution_powerData(); @@ -34,13 +36,17 @@ namespace DongYingAPI.Controllers.api var now = DateTime.Now; var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00"); - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)); decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var alist = bll.GetModelListDate("",time).Where(x =>x.DeviceId==item.DeviceId&&x.EntireTime>= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.P = num; } - model.P=num; + data.Add(model); } res.code = 200; diff --git a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs index 5b1dff5..59a76d7 100644 --- a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs +++ b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs @@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetElectricEquipmentController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get() { @@ -23,15 +24,20 @@ namespace DongYingAPI.Controllers.api try { var data = new List(); + var time = DateTime.Now.ToString("yyyyMM"); var now = DateTime.Now; var sdate = Convert.ToDateTime(now.ToString("yyyy-MM-dd 00:00:00")); var edate = Convert.ToDateTime(now.AddDays(+1).ToString("yyyy-MM-dd 00:00:00")); - var list = bll.GetModelList("").Where(x => x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var list = bll.GetModelListDate("",time).Where(x => x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + var alist = bll_info.GetModelList(""); decimal? num = 0; foreach (var item in list) { var model = new electrical_rankingData(); - model.ElectricaName = item.DeviceName; + foreach (var aitem in alist) + { + model.ElectricaName = aitem.DeviceName; + } num = item.EH; model.ElectricaValue = num; data.Add(model); diff --git a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs index 1e14908..763db25 100644 --- a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs +++ b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs @@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetElectricQuantityController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get( string date = "") { @@ -25,7 +26,8 @@ namespace DongYingAPI.Controllers.api if (!string.IsNullOrEmpty(date)) { var data = new List(); - var list = bll.GetModelList(""); + var list = bll_info.GetModelList(""); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -35,30 +37,25 @@ namespace DongYingAPI.Controllers.api { var model = new electric_quantityData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x=>x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + } model.EH = num1; data.Add(model); @@ -70,18 +67,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new electric_quantityData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); + model.time = atime; var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -90,18 +93,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new electric_quantityData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM") + "-01 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } diff --git a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs index 79ac402..48b3500 100644 --- a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs +++ b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs @@ -16,7 +16,8 @@ namespace DongYingAPI.Controllers.api /// public class GetElectricalRankingController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get() { @@ -24,36 +25,49 @@ namespace DongYingAPI.Controllers.api try { var data = new List(); + var time = DateTime.Now.ToString("yyyyMM"); var now = DateTime.Now; var sdate = Convert.ToDateTime(now.ToString("yyyy-MM-dd 00:00:00")); var edate = Convert.ToDateTime(now.AddDays(+1).ToString("yyyy-MM-dd 00:00:00")); - var list = bll.GetModelList("").Where(x => x.CreateTime >= sdate && x.CreateTime < edate).ToList(); - var alist = list.Where(x => x.DeviceName.Contains("空调")).ToList(); + + var alist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("空调")).ToList(); var model1 = new electrical_rankingData(); decimal? num = 0; foreach (var item in alist) { - num += item.P; + var list = bll.GetModelListDate("", time).Where(x =>x.DeviceId==item.DeviceId&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list) + { + num += aitem.P; + } } model1.ElectricaValue = num; model1.ElectricaName = "空调系统"; data.Add(model1); - var blist = list.Where(x => x.DeviceName.Contains("照明")).ToList(); + var blist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("照明")).ToList(); var model2 = new electrical_rankingData(); decimal? num1 = 0; foreach (var item in blist) { - num1 += item.P; + var list = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list) + { + num1 += aitem.P; + } } model2.ElectricaValue = num1; model2.ElectricaName = "照明系统"; data.Add(model2); - var clist = list.Where(x => x.DeviceName.Contains("电梯")||x.DeviceName.Contains("货梯")).ToList(); + var clist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("电梯")||x.DeviceName.Contains("货梯")).ToList(); var model3 = new electrical_rankingData(); decimal? num2 = 0; foreach (var item in clist) { - num2 += item.P; + var list = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list) + { + num2 += aitem.P; + } } model3.ElectricaValue = num2; model3.ElectricaName = "电梯系统"; diff --git a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs index ebc7eda..2a2b931 100644 --- a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs +++ b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs @@ -16,7 +16,8 @@ namespace DongYingAPI.Controllers /// public class GetElectricityConsumptionController : ApiController { - DataServer.BLL.device_data bll=new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get(string date="") { @@ -25,8 +26,9 @@ namespace DongYingAPI.Controllers { if (!string.IsNullOrEmpty(date)) { - var data=new List(); - var list=bll.GetModelList(""); + var data = new List(); + var list = bll_info.GetModelList(""); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -36,31 +38,25 @@ namespace DongYingAPI.Controllers { var model = new electricity_consumptionData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); - // var num = 0; string now = ""; - if (b < 30) - { - model.Time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.Time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.Time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x => x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + } model.EH = num1; data.Add(model); @@ -72,18 +68,24 @@ namespace DongYingAPI.Controllers for (int i = 0; i < 6; i++) { var model = new electricity_consumptionData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.Time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); + model.Time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -92,18 +94,23 @@ namespace DongYingAPI.Controllers for (int i = 0; i < 6; i++) { var model = new electricity_consumptionData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.Time = time; - var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.Time = atime; + var now = DateTime.Now.AddMonths(-i); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } diff --git a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs index 2a22770..8c7e817 100644 --- a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs +++ b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Net.Http.Headers; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Web.Http; @@ -16,7 +17,8 @@ namespace DongYingAPI.Controllers.api /// public class GetEquipmentMonitoringController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get(string type = "") { @@ -25,6 +27,7 @@ namespace DongYingAPI.Controllers.api { if (!string.IsNullOrEmpty(type)) { + var time = DateTime.Now.ToString("yyyyMM"); if (type == "配电室1") { var data = new List(); @@ -32,14 +35,18 @@ namespace DongYingAPI.Controllers.api var now=DateTime.Now; var sdate = now.ToString("yyyy-MM-dd 00:00:00"); var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); - var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆一楼"&&x.CreateTime>=Convert.ToDateTime(sdate)&&x.CreateTime x.FloorName == "科技馆一楼").ToList(); foreach (var item in list) { + var alist = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); var model=new equipment_monitoringData(); count++; model.SerialNumber = count; model.DeviceName=item.DeviceName; - model.EH=item.EH; + foreach (var aitem in alist) + { + model.EH = aitem.EH; + } if (model.EH > 0) { model.DeviceState = "正常"; @@ -62,14 +69,18 @@ namespace DongYingAPI.Controllers.api var now = DateTime.Now; var sdate = now.ToString("yyyy-MM-dd 00:00:00"); var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); - var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵" && x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); foreach (var item in list) { + var alist = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); var model = new equipment_monitoringData(); count++; model.SerialNumber = count; model.DeviceName = item.DeviceName; - model.EH = item.EH; + foreach (var aitem in alist) + { + model.EH = aitem.EH; + } if (model.EH > 0) { model.DeviceState = "正常"; @@ -92,14 +103,18 @@ namespace DongYingAPI.Controllers.api var now = DateTime.Now; var sdate = now.ToString("yyyy-MM-dd 00:00:00"); var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); - var list = bll.GetModelList("").Where(x => x.FloorName == "图书馆一楼" && x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList(); foreach (var item in list) { + var alist = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); var model = new equipment_monitoringData(); count++; model.SerialNumber = count; model.DeviceName = item.DeviceName; - model.EH = item.EH; + foreach (var aitem in alist) + { + model.EH = aitem.EH; + } if (model.EH > 0) { model.DeviceState = "正常"; diff --git a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs index b619f5d..bef77e3 100644 --- a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs +++ b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs @@ -17,7 +17,8 @@ namespace DongYingAPI.Controllers.api /// public class GetGeneralCatalogueController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); // GET api/ public HttpResponseMessage Get(string date="") { @@ -26,15 +27,16 @@ namespace DongYingAPI.Controllers.api { if (!string.IsNullOrEmpty(date)) { + var time = DateTime.Now.ToString("yyyyMM"); var data = new List(); - var list = bll.GetModelList(""); + var list = bll.GetModelListDate("",time); if (date == "年") { var model=new general_catalogueData(); var now=DateTime.Now; - var sdate = now.ToString("yyyy-01-01 00:00:00"); - var edate=now.AddYears(1).ToString("yyyy-MM-dd 00:00:00"); - var alist=list.Where(x=>x.CreateTime>=Convert.ToDateTime(sdate)&&x.CreateTimex.EntireTime>=Convert.ToDateTime(sdate)&&x.EntireTime < Convert.ToDateTime(edate)).ToList(); decimal? num = 0; foreach (var item in alist) { @@ -51,9 +53,9 @@ namespace DongYingAPI.Controllers.api { var model = new general_catalogueData(); var now = DateTime.Now; - var sdate = now.ToString("yyyy-01-01 00:00:00"); + var sdate = now.ToString("yyyy-MM-dd 00:00:00"); var edate = now.AddYears(1).ToString("yyyy-MM-dd 00:00:00"); - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); decimal? num = 0; foreach (var item in alist) { diff --git a/DongYingAPI/Controllers/api/GetLightingLoadController.cs b/DongYingAPI/Controllers/api/GetLightingLoadController.cs index 92694b4..63ed51f 100644 --- a/DongYingAPI/Controllers/api/GetLightingLoadController.cs +++ b/DongYingAPI/Controllers/api/GetLightingLoadController.cs @@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetLightingLoadController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get(string date = "") { @@ -25,7 +26,8 @@ namespace DongYingAPI.Controllers.api if (!string.IsNullOrEmpty(date)) { var data = new List(); - var list = bll.GetModelList("").Where(x => x.DeviceName.Contains("照明")).ToList(); + var list = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("照明")).ToList(); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -35,32 +37,26 @@ namespace DongYingAPI.Controllers.api { var model = new lighting_loadData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x => x.DeviceName.Contains("照明") && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.P; + } + model.P = num1; } - model.P = num1; data.Add(model); } @@ -70,18 +66,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new lighting_loadData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + } - model.P = num; data.Add(model); } } @@ -90,18 +92,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new lighting_loadData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; - var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddMonths(-i); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + } - model.P = num; data.Add(model); } } diff --git a/DongYingAPI/Controllers/api/GetPowerLoadController.cs b/DongYingAPI/Controllers/api/GetPowerLoadController.cs index 3f8c7f8..0328730 100644 --- a/DongYingAPI/Controllers/api/GetPowerLoadController.cs +++ b/DongYingAPI/Controllers/api/GetPowerLoadController.cs @@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetPowerLoadController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get(string date = "") { @@ -25,7 +26,8 @@ namespace DongYingAPI.Controllers.api if (!string.IsNullOrEmpty(date)) { var data = new List(); - var list = bll.GetModelList(""); + var list = bll_info.GetModelList(""); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -35,32 +37,26 @@ namespace DongYingAPI.Controllers.api { var model = new power_loadData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x=>x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.P; + } + model.P = num1; } - model.P = num1; data.Add(model); } @@ -70,18 +66,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new power_loadData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("dd号"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddMonths(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + } - model.P = num; data.Add(model); } } @@ -90,18 +92,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new power_loadData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; + var atime = DateTime.Now.AddYears(-i).ToString("MM月"); + model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM") + "-01 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.P; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.P; + } + model.P = num; + } - model.P = num; data.Add(model); } } diff --git a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs index 5cb789b..e978ac0 100644 --- a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs +++ b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs @@ -17,7 +17,8 @@ namespace DongYingAPI.Controllers.api /// public class GetRealtimeDataController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get([FromBody] select_switching_name room) { @@ -28,24 +29,29 @@ namespace DongYingAPI.Controllers.api { var data=new List(); var date=DateTime.Now; + var time = DateTime.Now.ToString("yyyyMM"); var sdate=DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); var edate=DateTime.Now.AddDays(1).ToString("yyyy-MM-dd 00:00:00"); - var list = bll.GetModelList("").Where(x=>x.DeviceName==room.name&&x.CreateTime>=Convert.ToDateTime(sdate)&&x.CreateTimex.DeviceName==room.name).ToList(); + foreach (var bitem in list1) { - var model=new realtime_dataData(); - model.P = item.P; - decimal? num = 0; - foreach (var aitem in alist) + var list = bll.GetModelListDate("", time).Where(x =>x.DeviceId==bitem.DeviceId&& x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var alist = bll.GetModelListDate("", time); + foreach (var item in list) { - num += aitem.P; + var model = new realtime_dataData(); + model.P = item.P; + decimal? num = 0; + foreach (var aitem in alist) + { + num += aitem.P; + } + var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3); + model.LoadRate = Convert.ToDecimal(cnum) * 100; + model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100; + model.DeviceState = "正常"; + data.Add(model); } - var cnum= Math.Round(Convert.ToDouble(item.P) /Convert.ToDouble(num), 3); - model.LoadRate= Convert.ToDecimal(cnum)*100; - model.ConversionRate =Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH),3)*100; - model.DeviceState = "正常"; - data.Add(model); } res.code = 200; res.msg = "成功"; diff --git a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs index 59396be..0e6f724 100644 --- a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs +++ b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs @@ -16,7 +16,8 @@ namespace DongYingAPI.Controllers.api /// public class GetRealtimeLoadController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get() { @@ -24,12 +25,13 @@ namespace DongYingAPI.Controllers.api try { var data = new List(); + var time = DateTime.Now.ToString("yyyyMM"); var model=new realtime_loadData(); var now = DateTime.Now; var sdate =Convert.ToDateTime(now.ToString("yyyy-MM-dd 00:00:00")); var edate =Convert.ToDateTime(now.AddDays(+1).ToString("yyyy-MM-dd 00:00:00")); - var list = bll.GetModelList("").Where(x=>x.CreateTime>=sdate&&x.CreateTimex.FloorName).ToList(); + var list = bll.GetModelListDate("",time).Where(x=>x.EntireTime>=sdate&&x.EntireTime < edate).ToList(); + var alist =bll_info.GetModelList("").DistinctBy(x=>x.FloorName).ToList(); model.LoadCount= alist.Count; decimal? num = 0; foreach (var item in list) diff --git a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs index 1c5af31..f65b59f 100644 --- a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs +++ b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs @@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api /// public class GetRoomElectricityController : ApiController { - DataServer.BLL.device_data bll = new DataServer.BLL.device_data(); + DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); + DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); public HttpResponseMessage Get(string type = "", string date = "") { @@ -27,7 +28,8 @@ namespace DongYingAPI.Controllers.api if (type == "配电室1") { var data = new List(); - var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆一楼").ToList(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆一楼").ToList(); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -37,32 +39,26 @@ namespace DongYingAPI.Controllers.api { var model = new room_electricityData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x => x.FloorName == "科技馆一楼" && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + model.EH = num1; } - model.EH = num1; data.Add(model); } @@ -72,18 +68,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -92,18 +94,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -114,7 +121,8 @@ namespace DongYingAPI.Controllers.api else if (type == "配电室2") { var data = new List(); - var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -124,32 +132,26 @@ namespace DongYingAPI.Controllers.api { var model = new room_electricityData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵" && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + model.EH = num1; } - model.EH = num1; data.Add(model); } @@ -159,18 +161,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -179,18 +187,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -201,7 +214,8 @@ namespace DongYingAPI.Controllers.api else if (type == "配电室3") { var data = new List(); - var list = bll.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList(); + var list = bll_info.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList(); + var time = DateTime.Now.ToString("yyyyMM"); if (date == "日") { @@ -211,32 +225,26 @@ namespace DongYingAPI.Controllers.api { var model = new room_electricityData(); - var j = i * 150; + var j = i * 60; b = Convert.ToInt32(a); string now = ""; - if (b < 30) - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); - //b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm")); - a = "31"; - } - else - { - model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30"); - now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00"); - a = "29"; - } + model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00"); + now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); + a = "31"; var datetime = Convert.ToDateTime(now); - var sdate = datetime.AddMinutes(-(i + 1) * 150); - var edate = datetime.AddMinutes(-j); - var list1 = bll.GetModelList("").Where(x => x.FloorName == "图书馆一楼" && x.CreateTime >= sdate && x.CreateTime < edate).ToList(); + var sdate = datetime.AddHours(-i); + var edate = datetime.AddHours(-i + 1); + //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList(); decimal? num1 = 0; - foreach (var item in list1) + foreach (var item in list) { - num1 += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList(); + foreach (var aitem in list1) + { + num1 += aitem.EH; + } + model.EH = num1; } - model.EH = num1; data.Add(model); } @@ -246,18 +254,24 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddMonths(-i).ToString("MM月"); - model.time = time; - var now = DateTime.Now.AddMonths(-i); - var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; - var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var atime = DateTime.Now.AddDays(-i).ToString("MM月"); + model.time = atime; + var now = DateTime.Now.AddDays(-i); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } @@ -266,18 +280,23 @@ namespace DongYingAPI.Controllers.api for (int i = 0; i < 6; i++) { var model = new room_electricityData(); - var time = DateTime.Now.AddYears(-i).ToString("yyyy年"); - model.time = time; + var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); + model.time = atime; var now = DateTime.Now.AddYears(-i); - var sdate = now.ToString("yyyy") + "-01-01 00:00:00"; - var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00"; - var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); + var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; + var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00"; decimal? num = 0; - foreach (var item in alist) + foreach (var item in list) { - num += item.EH; + var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList(); + var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList(); + foreach (var aitem in alist) + { + num += aitem.EH; + } + model.EH = num; + } - model.EH = num; data.Add(model); } } diff --git a/DongYingAPI/DongYingAPI.csproj b/DongYingAPI/DongYingAPI.csproj index f941b8b..dc833d4 100644 --- a/DongYingAPI/DongYingAPI.csproj +++ b/DongYingAPI/DongYingAPI.csproj @@ -187,6 +187,7 @@ + diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll index 86b2821..4fa3cf9 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 6827a60..c4a626d 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 86b2821..4fa3cf9 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 6827a60..c4a626d 100644 Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ