diff --git a/DataServer/BLL/gas_data.cs b/DataServer/BLL/gas_data.cs
index 2f14e41..92c1f5e 100644
--- a/DataServer/BLL/gas_data.cs
+++ b/DataServer/BLL/gas_data.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-* V0.01 2024/1/9 14:05:57 N/A 初版
+* V0.01 2024/1/9 15:01:46 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
diff --git a/DataServer/DAL/gas_data.cs b/DataServer/DAL/gas_data.cs
index fb021d8..9261aa8 100644
--- a/DataServer/DAL/gas_data.cs
+++ b/DataServer/DAL/gas_data.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-* V0.01 2024/1/9 14:05:57 N/A 初版
+* V0.01 2024/1/9 15:01:46 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
@@ -60,7 +60,7 @@ namespace DataServer.DAL
new MySqlParameter("@GasId", MySqlDbType.VarChar,255),
new MySqlParameter("@GasNumber", MySqlDbType.VarChar,255),
new MySqlParameter("@GasName", MySqlDbType.VarChar,255),
- new MySqlParameter("@GasConsumption", MySqlDbType.VarChar,255),
+ new MySqlParameter("@GasConsumption", MySqlDbType.Float,255),
new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
@@ -111,7 +111,7 @@ namespace DataServer.DAL
MySqlParameter[] parameters = {
new MySqlParameter("@GasNumber", MySqlDbType.VarChar,255),
new MySqlParameter("@GasName", MySqlDbType.VarChar,255),
- new MySqlParameter("@GasConsumption", MySqlDbType.VarChar,255),
+ new MySqlParameter("@GasConsumption", MySqlDbType.Float,255),
new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
@@ -232,9 +232,9 @@ namespace DataServer.DAL
{
model.GasName=row["GasName"].ToString();
}
- if(row["GasConsumption"]!=null)
+ if(row["GasConsumption"]!=null && row["GasConsumption"].ToString()!="")
{
- model.GasConsumption=row["GasConsumption"].ToString();
+ model.GasConsumption=decimal.Parse(row["GasConsumption"].ToString());
}
if(row["CreateTime"]!=null && row["CreateTime"].ToString()!="")
{
diff --git a/DataServer/Model/gas_data.cs b/DataServer/Model/gas_data.cs
index a21ba3b..e471e07 100644
--- a/DataServer/Model/gas_data.cs
+++ b/DataServer/Model/gas_data.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-* V0.01 2024/1/9 14:05:57 N/A 初版
+* V0.01 2024/1/9 15:01:45 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
@@ -29,7 +29,7 @@ namespace DataServer.Model
private string _gasid;
private string _gasnumber;
private string _gasname;
- private string _gasconsumption;
+ private decimal? _gasconsumption;
private DateTime? _createtime;
private DateTime? _entiretime;
private string _reserve1;
@@ -64,7 +64,7 @@ namespace DataServer.Model
///
///
///
- public string GasConsumption
+ public decimal? GasConsumption
{
set{ _gasconsumption=value;}
get{return _gasconsumption;}
diff --git a/DongYingAPI/Controllers/api/GetAirConditionerController.cs b/DongYingAPI/Controllers/api/GetAirConditionerController.cs
index dc57168..a41bcb0 100644
--- a/DongYingAPI/Controllers/api/GetAirConditionerController.cs
+++ b/DongYingAPI/Controllers/api/GetAirConditionerController.cs
@@ -26,6 +26,7 @@ namespace DongYingAPI.Controllers.api
{
var data = new List();
var list = bll_info.GetModelList("").Where(x=>x.DeviceName.Contains("空调")).ToList();
+ var time = DateTime.Now.ToString("yyyyMM");
if (date == "日")
{
@@ -35,29 +36,28 @@ namespace DongYingAPI.Controllers.api
{
var model = new air_conditionerData();
- var j = i * 120;
+ 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.AddMinutes(-(i + 1) * 120);
- var edate = datetime.AddMinutes(-j);
- var time = DateTime.Now.ToString("yyyyMM");
- //var list1 = bll_info.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 list)
{
- var list1=bll.GetModelListDate("",time).Where(x=>x.DeviceId== item.DeviceId&&x.CreateTime>=sdate&&x.CreateTimex.DeviceId== item.DeviceId&&x.EntireTime>=sdate&&x.EntireTime x.DeviceId == item.DeviceId).ToList();
- var alist = list1.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
- decimal? num = 0;
+ 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);
}
}
@@ -90,20 +91,21 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var model = new air_conditionerData();
- var time = DateTime.Now.AddYears(-i).ToString("yyyy年");
- model.time = time;
+ var atime = DateTime.Now.AddYears(-i).ToString("yyyy年");
+ 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";
+ 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.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
- decimal? num = 0;
+ 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);
}
diff --git a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
index 40ae6f9..27e009c 100644
--- a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
@@ -16,8 +16,8 @@ namespace DongYingAPI.Controllers.api
///
public class GetCarbonEmissionController : 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 = "")
{
var res = new get_carbon_emission();
@@ -26,6 +26,7 @@ namespace DongYingAPI.Controllers.api
if (!string.IsNullOrEmpty(date))
{
var data = new List();
+ var time = DateTime.Now.ToString("yyyyMM");
if (date == "日")
{
@@ -35,45 +36,49 @@ namespace DongYingAPI.Controllers.api
{
var model = new carbon_emissionData();
- 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";
- }
var datetime = Convert.ToDateTime(now);
- var sdate=datetime.AddMinutes(-(i + 1) * 150);
+ var sdate=datetime.AddMinutes(-(i + 1) * 60);
var edate = datetime.AddMinutes(-j);
- var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵"&&x.CreateTime>=sdate&&x.CreateTime x.FloorName == "科技馆负一层地源热泵").ToList();
var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList();
decimal? num1 = 0;
foreach (var item in alist)
{
- 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.PrimaryCirculation = num1 / 1000 * Convert.ToDecimal(0.5703);
decimal? num2 = 0;
var blist = list.Where(x => x.DeviceName.Contains("地源侧循环泵")).ToList();
foreach (var item in blist)
{
- num2 += 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)
+ {
+ num2 += aitem.EH;
+ }
}
model.CollateralCirculation=num2 / 1000 * Convert.ToDecimal(0.5703);
decimal? num3 = 0;
var clist = list.Where(x => x.DeviceName.Contains("主机控制柜")).ToList();
foreach (var item in clist)
{
- num3+= 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)
+ {
+ num3 += aitem.EH;
+ }
}
model.TerrestrialSource=num3 / 1000 * Convert.ToDecimal(0.5703);
data.Add(model);
@@ -85,34 +90,47 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var model = new carbon_emissionData();
- var time = DateTime.Now.AddMonths(-i).ToString("MM月");
- model.time = time;
+ 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";
- var list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵"&&x.CreateTime>=Convert.ToDateTime(sdate)&&x.CreateTime x.FloorName == "科技馆负一层地源热泵").ToList();
var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList();
decimal? num1 = 0;
foreach (var item in alist)
{
- num1 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >=Convert.ToDateTime(sdate) && x.EntireTime x.DeviceName.Contains("地源侧循环泵")).ToList();
foreach (var item in blist)
{
- num2 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >=Convert.ToDateTime(sdate) && x.EntireTime x.DeviceName.Contains("主机控制柜")).ToList();
foreach (var item in clist)
{
- num3 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
+ foreach (var aitem in list1)
+ {
+ num3 += aitem.EH;
+ }
}
model.TerrestrialSource = num3 / 1000 * Convert.ToDecimal(0.5703);
data.Add(model);
+
}
}
else if (date == "年")
@@ -120,34 +138,47 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var model = new carbon_emissionData();
- var time = DateTime.Now.AddYears(-i).ToString("yyyy年");
- model.time = time;
+ var atime = DateTime.Now.AddYears(-i).ToString("yyyy年");
+ 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 list = bll.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵" && x.CreateTime >=Convert.ToDateTime(sdate) && x.CreateTime x.FloorName == "科技馆负一层地源热泵").ToList();
var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList();
decimal? num1 = 0;
foreach (var item in alist)
{
- num1 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >=Convert.ToDateTime(sdate) && x.EntireTime x.DeviceName.Contains("地源侧循环泵")).ToList();
foreach (var item in blist)
{
- num2 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
+ foreach (var aitem in list1)
+ {
+ num2 += aitem.EH;
+ }
}
model.CollateralCirculation = num2 / 1000 * Convert.ToDecimal(0.5703);
decimal? num3 = 0;
var clist = list.Where(x => x.DeviceName.Contains("主机控制柜")).ToList();
foreach (var item in clist)
{
- num3 += item.EH;
+ var list1 = bll.GetModelListDate("",time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
+ foreach (var aitem in list1)
+ {
+ num3 += aitem.EH;
+ }
}
model.TerrestrialSource = num3 / 1000 * Convert.ToDecimal(0.5703);
data.Add(model);
+
}
}
res.code = 200;
diff --git a/DongYingAPI/Controllers/api/GetCellRankingController.cs b/DongYingAPI/Controllers/api/GetCellRankingController.cs
index 173b36a..64f0c1d 100644
--- a/DongYingAPI/Controllers/api/GetCellRankingController.cs
+++ b/DongYingAPI/Controllers/api/GetCellRankingController.cs
@@ -10,9 +10,13 @@ using System.Web.Http;
namespace DongYingAPI.Controllers.api
{
+ ///
+ /// 用能监测3-用电排名
+ ///
public class GetCellRankingController : 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 = "")
{
@@ -21,19 +25,25 @@ namespace DongYingAPI.Controllers.api
{
if (!string.IsNullOrEmpty(type))
{
+ var time = DateTime.Now.ToString("yyyyMM");
if (type == "配电室1")
{
var data = new List();
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 cell_rankingData();
- model.CellName = item.DeviceName;
- model.EH = item.EH;
+ foreach (var aitem in alist)
+ {
+ model.CellName = item.DeviceName;
+ model.EH = aitem.EH;
+ }
data.Add(model);
+
}
var elist=data.OrderByDescending(x=>x.EH).ToList();
res.code = 200;
@@ -46,13 +56,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 cell_rankingData();
- model.CellName = item.DeviceName;
- model.EH = item.EH;
+ foreach (var aitem in alist)
+ {
+ model.CellName = item.DeviceName;
+ model.EH = aitem.EH;
+ }
data.Add(model);
+
}
var elist = data.OrderByDescending(x => x.EH).ToList();
res.code = 200;
@@ -65,13 +80,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 cell_rankingData();
- model.CellName = item.DeviceName;
- model.EH = item.EH;
+ foreach (var aitem in alist)
+ {
+ model.CellName = item.DeviceName;
+ model.EH = aitem.EH;
+ }
data.Add(model);
+
}
var elist = data.OrderByDescending(x => x.EH).ToList();
res.code = 200;
diff --git a/DongYingAPI/Controllers/api/GetChamberLoadController.cs b/DongYingAPI/Controllers/api/GetChamberLoadController.cs
index 3fd84d4..d5b0485 100644
--- a/DongYingAPI/Controllers/api/GetChamberLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetChamberLoadController.cs
@@ -15,7 +15,8 @@ namespace DongYingAPI.Controllers.api
///
public class GetChamberLoadController : 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 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.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.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);
}
@@ -71,19 +67,25 @@ 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 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";
- var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
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);
}
}
@@ -91,19 +93,24 @@ 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 model = new air_conditionerData();
+ var atime = DateTime.Now.AddYears(-i).ToString("yyyy年");
+ 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();
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/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll
index cab4b3e..6ef89b1 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 54bda42..c1de4a3 100644
Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
index e11a7ec..05002cf 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache and b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll
index cab4b3e..6ef89b1 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 54bda42..c1de4a3 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ
diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll
index 08273c7..eddf501 100644
Binary files a/Security/bin/Debug/DataServer.dll and b/Security/bin/Debug/DataServer.dll differ
diff --git a/Security/bin/Debug/DataServer.pdb b/Security/bin/Debug/DataServer.pdb
index 0e82b21..3d9e39a 100644
Binary files a/Security/bin/Debug/DataServer.pdb and b/Security/bin/Debug/DataServer.pdb differ
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index d3e749c..a80f1e4 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- wz4nd8r90dO71rHMl0A46+kFV1ComXowjuSBrJUCbSs=
+ FjB8i0VJ4mh8t9gJB+0cKYgMW6Scj9Z6PRzCcn/iHHo=
diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest
index 4cde3f1..3711aec 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -42,14 +42,14 @@
-
+
- fFVjvwM2ibdsQhpAwww7UhuCyZEMeyTJEqNJArAq5Y8=
+ cH7kM2pqIw9EpcKsmqER8/KRZ34vzyrkc9Dx/tsNUvc=
diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache
index c7691d8..796b227 100644
Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index d3e749c..a80f1e4 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- wz4nd8r90dO71rHMl0A46+kFV1ComXowjuSBrJUCbSs=
+ FjB8i0VJ4mh8t9gJB+0cKYgMW6Scj9Z6PRzCcn/iHHo=
diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest
index 4cde3f1..3711aec 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -42,14 +42,14 @@
-
+
- fFVjvwM2ibdsQhpAwww7UhuCyZEMeyTJEqNJArAq5Y8=
+ cH7kM2pqIw9EpcKsmqER8/KRZ34vzyrkc9Dx/tsNUvc=