This commit is contained in:
xukanghao 2024-03-20 14:21:34 +08:00
parent 9ca78d8228
commit d99f7633f9
14 changed files with 123 additions and 91 deletions

View File

@ -77,22 +77,25 @@ namespace DongYingAPI.Controllers.api
model1.BuildingName = "科技馆";
var lalist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", jtime);
//科技馆
decimal? num1 = 0;
foreach (var item in list)
{
var alist=lalist.Where(x=>x.DeviceId==item.DeviceId).ToList();
decimal? num = alist.Sum(x=>Convert.ToDecimal(x.P));
model1.BuildingValue = num;
num1 += Convert.ToDecimal(num);
}
model1.BuildingValue = num1;
data.Add(model1);
var model2 = new building_lightingData();
model2.BuildingName = "少年宫";
decimal? num2 = 0;
foreach (var item in list1)
{
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
decimal? num = alist.Sum(x => Convert.ToDecimal(x.P));
model2.BuildingValue = num;
num2 += Convert.ToDecimal(num);
}
model2.BuildingValue = num2;
if (list1 == null)
{
model2.BuildingValue = 0;
@ -100,13 +103,15 @@ namespace DongYingAPI.Controllers.api
data.Add(model2);
var model3 = new building_lightingData();
model3.BuildingName = "图书馆";
decimal? num3 = 0;
foreach (var item in list2)
{
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
decimal? num = alist.Sum(x => Convert.ToDecimal(x.P));
model3.BuildingValue = num;
num3+= Convert.ToDecimal(num);
}
if(list2 == null)
model3.BuildingValue = num3;
if (list2 == null)
{
model3.BuildingValue= 0;
}

View File

@ -56,14 +56,14 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = 0;
foreach (var item in alist)
{
num1 += item.EH;
num1 +=Convert.ToDecimal(item.EH);
}
//上个列表
var alists = bll.GetModelListDate("", ltime).Where(x => x.EntireTime == Convert.ToDateTime(stime)).ToList();
decimal? num2 = 0;
foreach (var item in alists)
{
num2 += item.EH;
num2 +=Convert.ToDecimal(item.EH);
}
decimal? num = num1 - num2;
#region

View File

@ -84,7 +84,7 @@ namespace DongYingAPI.Controllers.api
var list1 = bll.GetModelListDate("", time).Where(x=>x.EntireTime == Convert.ToDateTime(ztime)).ToList();
foreach (var aitem in list1)
{
num1 += aitem.EH;
num1 += Convert.ToDecimal(aitem.EH);
}
//上个小时
decimal? num2 = 0;
@ -92,7 +92,7 @@ namespace DongYingAPI.Controllers.api
var list2 = bll.GetModelListDate("", atime).Where(x => x.EntireTime == Convert.ToDateTime(stime)).ToList();
foreach (var aitem in list2)
{
num2 += aitem.EH;
num2 += Convert.ToDecimal(aitem.EH);
}
var model = new carbon_intensityData();
model.time = jtime;

View File

@ -80,7 +80,7 @@ namespace DongYingAPI.Controllers
var list1 = bll.GetModelListDate(" EntireTime='"+ ztime + "'", time);
foreach (var aitem in list1)
{
num1 += aitem.EH;
num1 +=Convert.ToDecimal(aitem.EH);
}
//上个小时
decimal? num2 = 0;
@ -88,7 +88,7 @@ namespace DongYingAPI.Controllers
var list2 = bll.GetModelListDate(" EntireTime='"+ stime + "'", atime);
foreach (var aitem in list2)
{
num2 += aitem.EH;
num2 += Convert.ToDecimal(aitem.EH);
}
var model = new carbon_measureData();
model.time = jtime;
@ -150,7 +150,7 @@ namespace DongYingAPI.Controllers
var list1 = bll.GetModelListDate(" EntireTime='" + ztime + "'", time);
foreach (var aitem in list1)
{
num1 += aitem.EH;
num1 += Convert.ToDecimal(aitem.EH);
}
//上个小时
decimal? num2 = 0;
@ -158,7 +158,7 @@ namespace DongYingAPI.Controllers
var list2 = bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var aitem in list2)
{
num2 += aitem.EH;
num2 += Convert.ToDecimal(aitem.EH);
}
var model = new carbon_measureData();
model.time = jtime;

View File

@ -61,13 +61,13 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = 0;
model.CellName = item.DeviceName;
// model.CellName = item.DeviceName;
num1 = alist.Sum(x => Convert.ToDecimal(x.EH));
num1 =Convert.ToDecimal( alist.Sum(x => Convert.ToDecimal(x.EH)));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
num2 =Convert.ToDecimal( blist.Sum(x => Convert.ToDecimal(x.EH)));
model.EH = num1 - num2;
if (model.EH > 0)
if (model.EH < 0)
{
model.EH = 0;
}
@ -102,13 +102,13 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = 0;
model.CellName = item.DeviceName;
// model.CellName = item.DeviceName;
num1 = alist.Sum(x => Convert.ToDecimal(x.EH));
num1 = Convert.ToDecimal(alist.Sum(x => Convert.ToDecimal(x.EH)));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
num2 = Convert.ToDecimal(blist.Sum(x => Convert.ToDecimal(x.EH)));
model.EH = num1 - num2;
if (model.EH > 0)
if (model.EH < 0)
{
model.EH = 0;
}
@ -143,13 +143,13 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = 0;
model.CellName = item.DeviceName;
// model.CellName = item.DeviceName;
num1 = alist.Sum(x => Convert.ToDecimal(x.EH));
num1 = Convert.ToDecimal(alist.Sum(x => Convert.ToDecimal(x.EH)));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
num2 = Convert.ToDecimal(blist.Sum(x => Convert.ToDecimal(x.EH)));
model.EH = num1 - num2;
if (model.EH > 0)
if (model.EH < 0)
{
model.EH = 0;
}

View File

@ -31,33 +31,39 @@ namespace DongYingAPI.Controllers.api
{
var data = new List<current_voltageData>();
var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++)
for (int i = 1; i < time_count; i++)
{
var model=new current_voltageData() { A=0,B=0,C=0 };
var model=new current_voltageData();
model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
var now=DateTime.Now.AddHours(-i);
var date = now.ToString("yyyy-MM-dd HH:00:00");
//var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var list = bll_info.GetModelList("Reserve2='" + room.name + "'");
var alist= bll.GetModelListDate(" EntireTime ='"+date+"'", time);
decimal? num1 = 0;
decimal? num2 = 0;
decimal? num3 = 0;
foreach (var item in list)
{
var list1=alist.Where(x=>x.DeviceId==item.DeviceId).FirstOrDefault();
if (list1 == null)
{
model.A = 0;
model.B = 0;
model.C = 0;
num1 = num1;
num2 = num2;
num3 = num3;
}
else
{
model.A += list1.Ia;
model.B += list1.Ib;
model.C += list1.Ic;
num1 += Convert.ToDecimal(list1.Ia);
num2 +=Convert.ToDecimal(list1.Ib);
num3 += Convert.ToDecimal(list1.Ic);
}
}
model.A = num1;
model.B= num2;
model.C = num3;
data.Add(model);
}
var adata = data.OrderBy(x => x.time).ToList();
@ -69,33 +75,37 @@ namespace DongYingAPI.Controllers.api
{
var data = new List<current_voltageData>();
var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++)
for (int i = 1; i < time_count; i++)
{
var model = new current_voltageData() { A = 0, B = 0, C = 0 };
var model = new current_voltageData();
model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
var now = DateTime.Now.AddHours(-i);
var date = now.ToString("yyyy-MM-dd HH:00:00");
//var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
var list = bll_info.GetModelList("").Where(x => x.Reserve2 == room.name).ToList();
var alist = bll.GetModelListDate(" EntireTime='"+date+"'", time);
decimal? num1 = 0;
decimal? num2 = 0;
decimal? num3 = 0;
foreach (var item in list)
{
var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(date) );
var list1= alist.Where(x => x.DeviceId == item.DeviceId).FirstOrDefault();
if (list1 == null)
{
model.A = 0;
model.B = 0;
model.C = 0;
num1 = num1;
num2 = num2;
num3 = num3;
}
else
{
foreach (var aitem in list1)
{
model.A += aitem.Ia;
model.B += aitem.Ib;
model.C += aitem.Ic;
}
num1 += Convert.ToDecimal(list1.Ua);
num2 += Convert.ToDecimal(list1.Ub);
num3 += Convert.ToDecimal(list1.Uc);
}
}
model.A = num1;
model.B = num2;
model.C = num3;
data.Add(model);
}
var adata=data.OrderBy(x=>x.time).ToList();

View File

@ -87,6 +87,8 @@ namespace DongYingAPI.Controllers.api
var edate = datetime.AddHours(-i + 1);
var sdate1=datetime.AddDays(-1).AddHours(-i);
var edate1=datetime.AddDays(-2).AddHours(-i+1);
decimal? num3 = 0;
decimal? num4 = 0;
//var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList();
foreach (var item in list)
{
@ -95,8 +97,11 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = list1.Sum(x=>Convert.ToDecimal(x.P));
decimal? num2 = list2.Sum(x=>Convert.ToDecimal(x.P));
model.ToDay = num1;
model.YearDay = num2;
num3 += Convert.ToDecimal(num1);
num4+= Convert.ToDecimal(num2);
}
model.ToDay = num3;
model.YearDay =num4;
if (model.ToDay > model.YearDay)
{
model.Tendency = "上升";
@ -105,7 +110,6 @@ namespace DongYingAPI.Controllers.api
{
model.Tendency = "下降";
}
}
data.Add(model);
}
@ -128,6 +132,8 @@ namespace DongYingAPI.Controllers.api
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
var sdate1 = now.AddMonths(-1).ToString("yyyy-MM-dd") + " 00:00:00";
var edate1 = now.AddMonths(-1).AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num3 = 0;
decimal? num4 = 0;
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time);
@ -135,8 +141,11 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.P));
decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.P));
model.ToDay = num1;
model.YearDay = num2;
num3 += Convert.ToDecimal(num1);
num4 += Convert.ToDecimal(num2);
}
model.ToDay = num3;
model.YearDay =num4;
if (model.ToDay > model.YearDay)
{
model.Tendency = "上升";
@ -145,7 +154,6 @@ namespace DongYingAPI.Controllers.api
{
model.Tendency = "下降";
}
}
data.Add(model);
}
}
@ -169,6 +177,9 @@ namespace DongYingAPI.Controllers.api
var edate1= now.AddYears(-1).AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
var ctime = now.ToString("yyyMM");
var etime = now.AddYears(-1).ToString("yyyyMM");
decimal? num3 = 0;
decimal? num4 = 0;
decimal? num5 = 0;
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time);
@ -176,8 +187,11 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = list1.Sum(x => Convert.ToDecimal(x.P));
decimal? num2 = list2.Sum(x => Convert.ToDecimal(x.P));
model.ToDay = num1;
model.YearDay = num2;
num3 += Convert.ToDecimal(num1);
num5 += Convert.ToDecimal(num2);
}
model.ToDay = num3;
model.YearDay = num5;
if (model.ToDay > model.YearDay)
{
model.Tendency = "上升";
@ -186,7 +200,6 @@ namespace DongYingAPI.Controllers.api
{
model.Tendency = "下降";
}
}
data.Add(model);
}
}

View File

@ -58,18 +58,22 @@ namespace DongYingAPI.Controllers.api
decimal? num = 0;
foreach (var aitem in alist)
{
num += aitem.P;
num +=Convert.ToDecimal(aitem.P);
}
var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3);
if (cnum == 0)
{
model.LoadRate =0;
}
else
{
model.LoadRate += Convert.ToDecimal(cnum) * 100;
}
model.ConversionRate += Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
model.DeviceState = 1;
}
}
}
data.Add(model);
res.code = 200;

View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl>
<History>True|2024-03-19T09:05:11.6998862Z;True|2024-03-19T16:15:08.2016341+08:00;True|2024-03-12T13:39:36.5196065+08:00;True|2024-03-08T15:20:13.3402822+08:00;True|2024-03-08T09:32:17.5138435+08:00;True|2024-03-04T10:00:33.0681294+08:00;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
<History>True|2024-03-20T05:58:42.4555031Z;True|2024-03-19T17:05:11.6998862+08:00;True|2024-03-19T16:15:08.2016341+08:00;True|2024-03-12T13:39:36.5196065+08:00;True|2024-03-08T15:20:13.3402822+08:00;True|2024-03-08T09:32:17.5138435+08:00;True|2024-03-04T10:00:33.0681294+08:00;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -85,10 +85,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>03/04/2024 09:29:28</publishTime>
</File>
<File Include="bin/DongYingAPI.dll">
<publishTime>03/19/2024 17:05:10</publishTime>
<publishTime>03/20/2024 13:58:41</publishTime>
</File>
<File Include="bin/DongYingAPI.pdb">
<publishTime>03/19/2024 17:05:10</publishTime>
<publishTime>03/20/2024 13:58:41</publishTime>
</File>
<File Include="bin/HslCommunication.dll">
<publishTime>08/03/2021 14:52:26</publishTime>
@ -400,34 +400,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>03/04/2024 09:51:33</publishTime>
</File>
<File Include="Controllers/api/GetBuildingLightingController.cs">
<publishTime>02/01/2024 09:28:11</publishTime>
<publishTime>03/20/2024 11:15:49</publishTime>
</File>
<File Include="Controllers/api/GetCarbonEmissionController.cs">
<publishTime>03/19/2024 16:06:25</publishTime>
</File>
<File Include="Controllers/api/GetCarbonFluxController.cs">
<publishTime>03/19/2024 16:12:35</publishTime>
<publishTime>03/20/2024 10:50:13</publishTime>
</File>
<File Include="Controllers/api/GetCarbonIntensityController.cs">
<publishTime>03/19/2024 16:13:45</publishTime>
<publishTime>03/20/2024 10:54:14</publishTime>
</File>
<File Include="Controllers/api/GetCarbonMeasureController.cs">
<publishTime>03/19/2024 16:12:11</publishTime>
<publishTime>03/20/2024 10:52:07</publishTime>
</File>
<File Include="Controllers/api/GetCarbonOffsetController.cs">
<publishTime>01/10/2024 13:25:43</publishTime>
</File>
<File Include="Controllers/api/GetCarbonReductionController.cs">
<publishTime>03/12/2024 15:05:03</publishTime>
<publishTime>03/20/2024 10:55:36</publishTime>
</File>
<File Include="Controllers/api/GetCellRankingController.cs">
<publishTime>02/20/2024 14:40:19</publishTime>
<publishTime>03/20/2024 11:23:49</publishTime>
</File>
<File Include="Controllers/api/GetChamberLoadController.cs">
<publishTime>03/12/2024 15:12:49</publishTime>
</File>
<File Include="Controllers/api/GetCurrentVoltageController.cs">
<publishTime>03/04/2024 16:24:57</publishTime>
<publishTime>03/20/2024 13:44:45</publishTime>
</File>
<File Include="Controllers/api/GetDailyElectricityController.cs">
<publishTime>02/20/2024 17:07:40</publishTime>
@ -484,7 +484,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>03/01/2024 17:07:01</publishTime>
</File>
<File Include="Controllers/api/GetIlluminationLoadController.cs">
<publishTime>02/01/2024 16:43:20</publishTime>
<publishTime>03/20/2024 11:09:00</publishTime>
</File>
<File Include="Controllers/api/GetLightingLoadController.cs">
<publishTime>02/01/2024 15:10:41</publishTime>
@ -505,7 +505,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>03/01/2024 17:25:32</publishTime>
</File>
<File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>02/21/2024 10:24:34</publishTime>
<publishTime>03/20/2024 13:58:08</publishTime>
</File>
<File Include="Controllers/api/GetRealtimeLoadController.cs">
<publishTime>03/19/2024 16:50:46</publishTime>

Binary file not shown.

Binary file not shown.