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
var list = bll.GetModelListDate(" Reserve2 like '%空调%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var date = DateTime.Now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(date)).ToList();
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
index 2aacfee..74a68db 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
@@ -50,17 +50,17 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_emissionData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
- CarbonEmission =Convert.ToDecimal( Math.Round(Convert.ToDouble(num1 - num2)/1000* 0.5703,3))
+ CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2) / 1000 * 0.5703, 3))
};
if (model.CarbonEmission < 0)
{
@@ -93,11 +93,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddYears(-i+1).ToString("yyyy-01-01 00:00:00");
+ sdate = now.AddYears(-i + 1).ToString("yyyy-01-01 00:00:00");
}
var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_emissionData()
@@ -112,7 +112,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
@@ -127,7 +127,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
res.code = 500;
- res.msg ="失败:"+ex.Message;
+ res.msg = "失败:" + ex.Message;
}
HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
return result;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
index e15f99c..79b9c2c 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
@@ -35,7 +35,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
#region 电
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
index f1867b8..55136de 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Month);
for (int i = 0; i < time_count; i++)
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
index 3e45202..90bbee1 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
@@ -44,8 +44,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_overviewData()
@@ -77,8 +77,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_overviewData()
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
index 14640fe..6d70271 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
@@ -18,7 +18,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_carbon_trend();
#region 表是否存在
@@ -34,9 +34,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
- var now=DateTime.Now;
- if(!string.IsNullOrEmpty(date))
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
+ var now = DateTime.Now;
+ if (!string.IsNullOrEmpty(date))
{
if (date == "日")
{
@@ -50,7 +50,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
+ sdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
}
var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
@@ -79,7 +79,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
//sdate = Convert.ToDateTime(sdate1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
@@ -91,12 +91,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
string stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
var c = bll.IsExistsTable(date_base, "electricity_data_" + stime);
- if(c == false)
+ if (c == false)
{
bll.CreateTable(stime);
}
- var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var blist=bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var model = new carbon_trendData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
@@ -112,10 +112,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- res.code= 201;
+ res.code = 201;
res.msg = "参数不能为空";
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
index 5dde551..4746ae6 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
@@ -26,7 +26,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var date_base = ConfigurationManager.AppSettings["MySQLDataBase"].ToString();
try
{
- var data=new List();
+ var data = new List();
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Hour);
var time = DateTime.Now.ToString("yyyyMM");
@@ -35,19 +35,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(time);
}
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
- for (int i = 0; i < time_count; i++)
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
+ for (int i = 1; i <= time_count; i++)
{
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
- var sdate = now.AddHours(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
+ var sdate = now.AddHours(-(i - 1)).ToString("yyyy-MM-dd HH:00:00");
var jlist = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate)).ToList();
- var slist=list.Where(x=>x.EntireTime==Convert.ToDateTime(sdate)).ToList();
+ var slist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
var num1 = jlist.Sum(x => x.EH);
var num2 = slist.Sum(x => x.EH);
var model = new daily_electricityData
{
- time = DateTime.Now.AddHours(-(i + 1)).ToString("HH:00"),
- EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
+ time = now.AddHours(-i).ToString("HH:00"),
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num2 - num1), 3))
};
if (model.EH < 0)
{
@@ -55,7 +55,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
data.Add(model);
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
index 48984ae..1fd5f17 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
@@ -36,7 +36,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var data = new List();
var list = bll.GetModelListDate(" Reserve2 like '%展陈%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var date = DateTime.Now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(date)).ToList();
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
index 4f5c12f..9ccfb9a 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
@@ -18,13 +18,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/();
- var now=DateTime.Now;
+ var now = DateTime.Now;
if (!string.IsNullOrEmpty(date))
{
if (date == "月")
@@ -35,12 +35,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
string sdate;
if (i == 0)
{
- sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+ sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
- //sdate = stime1.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
@@ -55,10 +54,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='"+edate+ "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
- decimal? num2=elist.Sum(x => x.EH);
+ decimal? num2 = elist.Sum(x => x.EH);
var model = new electricity_consumptionData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
@@ -71,7 +70,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- if(date == "年")
+ if (date == "年")
{
var time_count = Convert.ToInt32(DateTime.Now.Year) - 2023;
for (int i = 0; i < time_count; i++)
@@ -98,14 +97,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new electricity_consumptionData()
{
time = DateTime.Now.AddYears(-i).ToString("yyyy年"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2), 3))
};
if (model.EH < 0)
{
@@ -114,7 +113,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
@@ -128,7 +127,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
catch (Exception ex)
{
res.code = 500;
- res.msg ="失败:"+ex.Message;
+ res.msg = "失败:" + ex.Message;
}
HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
return result;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
index ccfca3f..08b24a4 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
@@ -46,12 +46,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
bll.CreateTable(btime);
}
var list = new List();
- var list1 = bll.GetModelListDate(" Reserve1='配电室高压'", atime);
+ var list1 = bll.GetModelListDate(" Reserve1='配电室低压'", atime);
if (list1.Count() > 0)
{
list.AddRange(list1);
}
- var list2 = bll.GetModelListDate(" Reserve1='配电室高压'", btime);
+ var list2 = bll.GetModelListDate(" Reserve1='配电室低压'", btime);
if (list2.Count() > 0)
{
list.AddRange(list2);
@@ -78,7 +78,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var model = new electricity_consumptionData()
{
time = stime.AddDays(-i).ToString("dd"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble((anum - bnum) * Convert.ToDecimal(1.229)), 3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble((anum - bnum) / 10000 * Convert.ToDecimal(1.229)), 3))
};
data.Add(model);
}
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
index 0830635..accdcea 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
@@ -60,13 +60,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and EntireTime='" + eedate + "'", etime);
num += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
var model = new energy_flowData()
{
- Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(num) * 1.229, 3))
+ Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(num) / 10000 * 1.229, 3))
};
#endregion
#region 空调
@@ -95,13 +95,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%空调%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%空调%' and EntireTime='" + eedate + "'", etime);
knum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
var adata = new List();
var amodel = new energy_flow();
- amodel.AirConditioner = Convert.ToDecimal(Math.Round(Convert.ToDouble(knum) * 1.229, 3));
+ amodel.AirConditioner = Convert.ToDecimal(Math.Round(Convert.ToDouble(knum) / 10000 * 1.229, 3));
#endregion
#region 照明
decimal? znum = 0;
@@ -129,11 +129,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%照明%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%照明%' and EntireTime='" + eedate + "'", etime);
znum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
- amodel.Illumination = Convert.ToDecimal(Math.Round(Convert.ToDouble(znum) * 1.229, 3));
+ amodel.Illumination = Convert.ToDecimal(Math.Round(Convert.ToDouble(znum) / 10000 * 1.229, 3));
#endregion
#region 电梯
decimal? dnum = 0;
@@ -161,11 +161,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%电梯%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%电梯%' and EntireTime='" + eedate + "'", etime);
dnum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
- amodel.Elevator = Convert.ToDecimal(Math.Round(Convert.ToDouble(dnum) * 1.229, 3));
+ amodel.Elevator = Convert.ToDecimal(Math.Round(Convert.ToDouble(dnum) / 10000 * 1.229, 3));
#endregion
adata.Add(amodel);
model.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
index da9bd28..299b465 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
@@ -64,13 +64,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new energy_indexingData()
{
time = now.AddMonths(-i).ToString("MM月"),
- EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num * Convert.ToDecimal(1.229)) / 26010), 3))
+ EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num / 10000 * Convert.ToDecimal(1.229)) / 26010), 3))
};
data.Add(model);
}
@@ -102,13 +102,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new energy_indexingData()
{
time = now.AddYears(-i).ToString("yyyy"),
- EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num * Convert.ToDecimal(1.229)) / 26010), 3))
+ EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num / 10000 * Convert.ToDecimal(1.229)) / 26010), 3))
};
data.Add(model);
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
index 498c5c3..c43d166 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
@@ -17,7 +17,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
public class GetLightingLoadController : ApiController
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_lighting_load();
#region 表是否存在
@@ -33,19 +33,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var now=DateTime.Now;
+ var now = DateTime.Now;
var list = bll.GetModelListDate("", time);
if (!string.IsNullOrEmpty(date))
{
if (date == "日")
{
var time_count = Convert.ToInt32(now.Hour);
- for (int i = 0; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
- var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)&&x.Reserve2.Contains("照明")).ToList();
- var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate) && x.Reserve2.Contains("照明")).ToList();
+ var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate) && x.Reserve2.Contains("照明")).ToList();
+ var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = Convert.ToDateTime(sdate).ToString("HH:00"),
@@ -61,7 +61,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
for (int i = 0; i < time_count; i++)
{
var tsdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
- var tedate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
+ var tedate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
var ysdate = now.AddMonths(-1).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var yedate = now.AddMonths(-1).AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
var ytime = now.AddMonths(-1).ToString("yyyyMM");
@@ -72,7 +72,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var list1 = bll.GetModelListDate("", ytime);
var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(tsdate) && x.EntireTime < Convert.ToDateTime(tedate) && x.Reserve2.Contains("照明")).ToList();
- var blist= list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.Reserve2.Contains("照明")).ToList();
+ var blist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = now.AddDays(-i).ToString("MM-dd"),
@@ -125,7 +125,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
res.code = 201;
res.msg = "参数不能为空";
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
index 3ec50d4..3b6b9a8 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
@@ -27,7 +27,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
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 edate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var time = DateTime.Now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
if (a == false)
@@ -36,13 +36,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
//一级
- var alist = list.Where(x=>x.Reserve2.Contains("梯")).ToList();
+ var alist = list.Where(x => x.Reserve2.Contains("梯")).ToList();
decimal? num1 = alist.Sum(x => x.P);
//二级
var blist = list.Where(x => x.Reserve2.Contains("潜污泵")).ToList();
decimal? num2 = blist.Sum(x => x.P);
//三级
- var clist = list.Where(x =>!x.Reserve2.Contains("梯")&&!x.Reserve2.Contains("潜污泵")).ToList();
+ var clist = list.Where(x => !x.Reserve2.Contains("梯") && !x.Reserve2.Contains("潜污泵")).ToList();
decimal? num3 = clist.Sum(x => x.P);
var model = new load_classifcationData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
index fd1f7bd..5e963eb 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
@@ -35,9 +35,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
var list = bll.GetModelListDate(" Reserve2 like '%照明%'", time);
- var now=DateTime.Now;
+ 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 edate = now.ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
var model = new pavilion_lightingData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
index e7e2e2e..9517d0b 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
@@ -29,7 +29,7 @@ namespace LonglslandExhibitionCenter.Controllers
var time = DateTime.Now.ToString("yyyyMM");
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
// 只处理今天的数据
@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers
{
bll.CreateTable(jtime);
}
- var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "' and Reserve1='配电室高压'", jtime);
+ var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "' and Reserve1='配电室低压'", jtime);
if (jlist.Count == 0)
{
var model = new real_loadData
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
index cfa2ecc..7313e30 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
@@ -14,8 +14,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
/// 总览-实时负荷
///
public class GetRealtimeLoadController : ApiController
- { DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
- // GET api/();
var now = DateTime.Now;
var time = DateTime.Now.ToString("yyyyMM");
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var stime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var etime = now.ToString("yyyy-MM-dd 00:00:00");
- var alist=list.Where(x=>x.EntireTime>=Convert.ToDateTime(etime)&&x.EntireTime<=Convert.ToDateTime(stime)).ToList();
- var p = alist.Sum(x => x.P);
+ var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(etime) && x.EntireTime <= Convert.ToDateTime(stime)).ToList();
var list1 = list.Where(x => x.EntireTime == Convert.ToDateTime(stime)).ToList();
- var list2=list.Where(x=>x.EntireTime==Convert.ToDateTime(etime)).ToList();
+ var p = list1.Sum(x => x.P);
+ var list2 = list.Where(x => x.EntireTime == Convert.ToDateTime(etime)).ToList();
var num1 = list1.Sum(x => x.EH);
- var num2=list2.Sum(x => x.EH);
+ var num2 = list2.Sum(x => x.EH);
var model = new realtime_loadData()
{
Amount = 3,
- P= p,
- EH=num1-num2
+ P = p,
+ EH = num1 - num2
};
data.Add(model);
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
index a910e67..b9714db 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
@@ -79,8 +79,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -114,8 +114,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -139,11 +139,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -177,8 +177,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -202,11 +202,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -242,8 +242,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -267,11 +267,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -321,8 +321,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -356,8 +356,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -381,11 +381,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -419,8 +419,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -444,11 +444,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -484,8 +484,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -509,11 +509,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -563,8 +563,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -598,8 +598,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -623,11 +623,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -661,8 +661,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -686,11 +686,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -726,8 +726,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -751,11 +751,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -805,8 +805,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -840,8 +840,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -865,11 +865,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -903,8 +903,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -928,11 +928,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -968,8 +968,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -993,11 +993,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -1047,8 +1047,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -1082,8 +1082,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -1107,11 +1107,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -1145,8 +1145,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -1170,11 +1170,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -1192,26 +1192,26 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%电梯%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%梯%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%电梯%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%梯%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%电梯%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%梯%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -1235,11 +1235,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
index 47146f1..3ff8e7d 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate("", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
var salist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == sdate).ToList();
@@ -49,7 +49,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
var model1 = new system_purgeData();
model1.name = "空调系统";
- model1.CarbonEmission =Convert.ToDecimal(Math.Round(Convert.ToDouble( salist.Sum(x => x.EH) - ealist.Sum(x => x.EH))/1000*0.5703,3));
+ model1.CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH) - ealist.Sum(x => x.EH)) / 1000 * 0.5703, 3));
if (model1.CarbonEmission < 0)
{
model1.CarbonEmission = 0;
@@ -57,7 +57,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model1);
var model2 = new system_purgeData();
model2.name = "照明系统";
- model2.CarbonEmission =Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH))/1000*0.5703,3));
+ model2.CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH)) / 1000 * 0.5703, 3));
if (model2.CarbonEmission < 0)
{
model2.CarbonEmission = 0;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
index e61796c..5bd2c67 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
@@ -35,9 +35,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
var list = bll.GetModelListDate("", time);
- var sdate =Convert.ToDateTime( DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
- var edate =Convert.ToDateTime( DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
- var salist = list.Where(x => x.Reserve2.Contains("空调") &&x.EntireTime==sdate).ToList();
+ var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
+ var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+ var salist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == sdate).ToList();
var sblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == sdate).ToList();
var sclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == sdate).ToList();
var selist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == sdate).ToList();
@@ -47,40 +47,40 @@ namespace LonglslandExhibitionCenter.Controllers.api
var eclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == edate).ToList();
var eelist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == edate).ToList();
var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
- var model1=new system_rankingData();
+ var model1 = new system_rankingData();
model1.name = "空调系统";
- model1.EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH)),3));
+ model1.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH) - ealist.Sum(x => x.EH)), 3));
if (model1.EH < 0)
{
- model1.EH = 0;
+ model1.EH = 0;
}
data.Add(model1);
- var model2=new system_rankingData();
+ var model2 = new system_rankingData();
model2.name = "照明系统";
- model2.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH)),3));
- if(model2.EH < 0)
+ model2.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH)), 3));
+ if (model2.EH < 0)
{
model2.EH = 0;
}
data.Add(model2);
- var model3=new system_rankingData();
+ var model3 = new system_rankingData();
model3.name = "消防系统";
- model3.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH)),3));
+ model3.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x => x.EH) - eclist.Sum(x => x.EH)), 3));
if (model3.EH < 0)
{
model3.EH = 0;
}
- var model4=new system_rankingData();
+ var model4 = new system_rankingData();
model4.name = "电梯系统";
- model4.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH)),3));
+ model4.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x => x.EH) - eelist.Sum(x => x.EH)), 3));
if (model4.EH < 0)
{
model4.EH = 0;
}
data.Add(model4);
- var model5=new system_rankingData();
+ var model5 = new system_rankingData();
model5.name = "展陈系统";
- model5.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH)),3));
+ model5.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x => x.EH) - eflist.Sum(x => x.EH)), 3));
if (model5.EH < 0)
{
model5.EH = 0;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
index 09cafc0..ce313f2 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
@@ -18,7 +18,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_total_energy();
#region 表是否存在
@@ -33,11 +33,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
#endregion
try
{
- if(!string.IsNullOrEmpty(date))
+ if (!string.IsNullOrEmpty(date))
{
var data = new List();
var now = DateTime.Now;
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
if (date == "日")
{
var time_count = Convert.ToInt32(DateTime.Now.Day);
@@ -46,21 +46,21 @@ namespace LonglslandExhibitionCenter.Controllers.api
string sdate;
if (i == 0)
{
- sdate= now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+ sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
}
else
{
- sdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
-
+ sdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
+
}
var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
- var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate)).ToList();
- var num= alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
+ var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
+ var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new total_energyData()
{
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num* Convert.ToDecimal(1.229)),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num / 10000 * Convert.ToDecimal(1.229)), 3))
};
if (model.EH < 0)
{
@@ -81,9 +81,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
- var edate=now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
+ var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
var etime = Convert.ToDateTime((edate)).ToString("yyyyMM");
var b = bll.IsExistsTable(date_base, "electricity_data_" + stime);
@@ -96,13 +96,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new total_energyData()
{
time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
- EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num*Convert.ToDecimal(1.229)),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num / 10000 * Convert.ToDecimal(1.229)), 3))
};
if (model.EH < 0)
{
@@ -111,7 +111,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
index ea1456f..d32425e 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
@@ -320,7 +320,7 @@
True
15586
/
- https://localhost:44396/
+ http://localhost:44396/
False
False
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
index d90d2a4..4a694b4 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
@@ -8,8 +8,8 @@
- Debug|Any CPU
- E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml
+ Release|Any CPU
+ F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml
diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
index f30ea3b..9f3cbf5 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
Release
Any CPU
FileSystem
- E:\项目\长岛展览馆\发布文件
+ F:\项目\长岛展览馆\发布文件
FileSystem
<_TargetId>Folder
diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1dc7b94..04b6811 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,352 +4,352 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
- <_PublishTargetUrl>E:\项目\长岛展览馆\发布文件
- True|2024-08-11T12:53:54.5556138Z;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;
+ <_PublishTargetUrl>F:\项目\长岛展览馆\发布文件
+ True|2024-08-15T05:20:14.7663530Z;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:44
- 08/10/2024 15:24:24
+ 08/13/2024 17:44:43
- 08/10/2024 15:24:24
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/11/2024 20:53:53
+ 08/14/2024 11:25:28
- 08/11/2024 20:53:53
+ 08/14/2024 11:25:28
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:53
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
03/25/2024 14:45:01
@@ -493,73 +493,73 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/30/2024 18:21:28
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
02/23/2024 18:15:19
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:16:41
+ 08/14/2024 09:50:14
\ No newline at end of file
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll
index 4c6fc3c0fe664930e629a6879206e76cdc211f74..53b7d7ac29649f36879ddd5bcde2ef0a869eefa3 100644
GIT binary patch
delta 31378
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