XKH
/
DongYing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提交修改配电室接口

This commit is contained in:
xukanghao 2024-02-21 11:01:30 +08:00
parent 8e769a5266
commit da6f51b873
51 changed files with 787 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataServer/api/get_distribution_power.cs
View File

@ -26,7 +26,9 @@ namespace DataServer.api
} }
public class distribution_powerData public class distribution_powerData
{ {
public string time { get; set; } public string Ttime { get; set; }
public decimal? P { get; set; } public decimal? TP { get; set; }
public string Ytime { get; set; }
public decimal? YP { get; set; }
} }
} }

BIN
DataServer/bin/Debug/DataServer.pdb
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.dll
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.pdb
View File

Binary file not shown.

37
DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
View File

@ -33,7 +33,8 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
var data=new List<device_operation_response>(); var data=new List<device_operation_response>();
var time=DateTime.Now.ToString("yyyyMM"); var time=DateTime.Now.ToString("yyyyMM");
var date = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
var edate= DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var list = bll.GetModelList(""); var list = bll.GetModelList("");
var alist = bll_info.GetModelList(""); var alist = bll_info.GetModelList("");
var lblist = bll_data.GetModelListDate("", time); var lblist = bll_data.GetModelListDate("", time);
@ -46,29 +47,29 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
if (model.SystematicName.Contains("空调")) if (model.SystematicName.Contains("空调"))
{ {
//空调 //空调
kinfolist = alist.Where(x => x.DeviceName.Contains("空调")).ToList(); kinfolist = alist.Where(x => x.DeviceName.Contains("空调")|| x.DeviceName.Contains("照明")|| x.DeviceName.Contains("梯")|| x.DeviceName.Contains("风机")).ToList();
}
if (model.SystematicName.Contains("照明"))
{
//空调
kinfolist = alist.Where(x => x.DeviceName.Contains("照明")).ToList();
}
if (model.SystematicName.Contains("电梯"))
{
//空调
kinfolist = alist.Where(x => x.DeviceName.Contains("梯")).ToList();
}
if (model.SystematicName.Contains("风机"))
{
//空调
kinfolist = alist.Where(x => x.DeviceName.Contains("风机")).ToList();
} }
//if (model.SystematicName.Contains("照明"))
//{
// //空调
// kinfolist = alist.Where(x => x.DeviceName.Contains("照明")).ToList();
//}
//if (model.SystematicName.Contains("电梯"))
//{
// //空调
// kinfolist = alist.Where(x => x.DeviceName.Contains("梯")).ToList();
//}
//if (model.SystematicName.Contains("风机"))
//{
// //空调
// kinfolist = alist.Where(x => x.DeviceName.Contains("风机")).ToList();
//}
var kcount1 = 0; var kcount1 = 0;
kcount1=kinfolist.Count; kcount1=kinfolist.Count;
var kcount2 = 0; var kcount2 = 0;
foreach (var aitem in kinfolist) foreach (var aitem in kinfolist)
{ {
var blist = lblist.Where(x => x.DeviceId == aitem.DeviceId&&x.EntireTime==Convert.ToDateTime(date)).ToList(); var blist = lblist.Where(x => x.DeviceId == aitem.DeviceId&&x.EntireTime>=Convert.ToDateTime(sdate)&&x.EntireTime<Convert.ToDateTime(edate)).ToList();
foreach (var bitem in blist) foreach (var bitem in blist)
{ {
kcount2++; kcount2++;

33
DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs
View File

@ -47,7 +47,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
//根据事件查询两条数据，然后值相减为用水量 //根据事件查询两条数据，然后值相减为用水量
var water_list = water_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' "); var water_list = water_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' ");
var count = (end_time - start_time).TotalHours; var count = (end_time - start_time).TotalHours;
for (int i = 0; i < count; i++) for (int i = 0; i < count-1; i++)
{ {
var start = start_time.AddHours(i); var start = start_time.AddHours(i);
var end = start.AddHours(1); var end = start.AddHours(1);
@ -64,7 +64,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
} }
total_water += water; total_water += water;
var model = new energy_calendar_data(); var model = new energy_calendar_data();
model.Time = start.ToString("HH:mm"); model.Time = end.ToString("HH:mm");
model.Value = water; model.Value = water;
water_data.Add(model); water_data.Add(model);
} }
@ -72,7 +72,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
//总天然气 //总天然气
decimal total_gas = 0; decimal total_gas = 0;
var gas_list = gas_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' "); var gas_list = gas_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' ");
for (int i = 0; i < count; i++) for (int i = 0; i < count-1; i++)
{ {
var start = start_time.AddHours(i); var start = start_time.AddHours(i);
var end = start.AddHours(1); var end = start.AddHours(1);
@ -89,7 +89,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
} }
total_gas += natural_gas; total_gas += natural_gas;
var model = new energy_calendar_data(); var model = new energy_calendar_data();
model.Time = start.ToString("HH:mm"); model.Time = end.ToString("HH:mm");
model.Value = natural_gas; model.Value = natural_gas;
gas_data.Add(model); gas_data.Add(model);
} }
@ -122,29 +122,38 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
list = bll.GetList(source, "", ""); list = bll.GetList(source, "", "");
} }
var device_list = device_bll.GetModelList(""); var device_list = device_bll.GetModelList("");
for (int i = 0; i < count; i++) for (int i = 0; i < count-1; i++)
{ {
var start = start_time.AddHours(i); var start = start_time.AddHours(i);
var end = start.AddHours(1); var end = start.AddHours(1);
decimal electricity = 0; decimal electricity = 0;
var time = start_time.ToString("yyyyMM");
list = bll.GetModelListDate("", time);
var start_list = list.Where(a => a.EntireTime.Value == start).ToList(); var start_list = list.Where(a => a.EntireTime.Value == start).ToList();
var end_list = list.Where(a => a.EntireTime.Value == end).ToList(); var end_list = list.Where(a => a.EntireTime.Value == end).ToList();
foreach (var item in device_list) foreach (var item in device_list)
{ {
var start_data = start_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault(); var start_data = start_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault();
var end_data = end_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault(); var end_data = end_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault();
if (start_data != null && end_data != null) decimal eh = 0;
if (start_data == null && end_data == null)
{ {
if (start_data.EH != null && end_data.EH != null) //eh = end_data.EH.Value - start_data.EH.Value;
{ electricity += eh;
decimal eh = end_data.EH.Value - start_data.EH.Value; }
electricity += eh; else if (start_data == null && end_data != null)
} {
eh = end_data.EH.Value - 0;
electricity += eh;
}
else
{
electricity += eh;
} }
} }
total_electricity += electricity; total_electricity += electricity;
var model = new energy_calendar_data(); var model = new energy_calendar_data();
model.Time = start.ToString("HH:mm"); model.Time = end.ToString("HH:mm");
model.Value = electricity; model.Value = electricity;
electricity_data.Add(model); electricity_data.Add(model);
} }

31
DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
View File

@ -51,8 +51,8 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
bll.CreateTable(time); bll.CreateTable(time);
} }
//查询今天0点和当前小时整点的数据出来 //查询今天0点和当前小时整点的数据出来
var start_time = DateTime.Parse(now.ToString("yyyy-MM-dd") + " 00:00:00"); var start_time = DateTime.Parse(now.ToString("yyyy-MM-dd ") + "00:00:00");
var end_time = DateTime.Parse(now.ToString("yyyy-MM-dd HH") + ":00:00"); var end_time = DateTime.Parse(now.AddHours(-1).ToString("yyyy-MM-dd HH") + ":00:00");
var list = bll.GetModelListDate(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ", time); var list = bll.GetModelListDate(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ", time);
//查询电设备表，计算每个设备的用电量，然后按空调、电梯、照明、其它累加用电量 //查询电设备表，计算每个设备的用电量，然后按空调、电梯、照明、其它累加用电量
var device_list = device_bll.GetModelList(""); var device_list = device_bll.GetModelList("");
@ -60,12 +60,21 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
{ {
var start_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == start_time).FirstOrDefault(); var start_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == start_time).FirstOrDefault();
var end_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == end_time).FirstOrDefault(); var end_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == end_time).FirstOrDefault();
if (start_data != null && end_data != null) decimal eh = 0;
{ if (start_data == null&&end_data==null)
if (start_data.EH != null && end_data.EH != null)
{ {
decimal eh = end_data.EH.Value - start_data.EH.Value; eh = 0;
if (item.DeviceName.Contains("照明")) }
else if (start_data==null&&end_data != null)
{
eh = end_data.EH.Value - 0;
}
else
{
eh = end_data.EH.Value - start_data.EH.Value;
}
if (item.DeviceName.Contains("照明"))
{ {
lighting += eh; lighting += eh;
} }
@ -82,8 +91,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
other += eh; other += eh;
} }
} }
}
}
//查询天然气的设备表，计算每个设备的用气量 //查询天然气的设备表，计算每个设备的用气量
var gas_list = gas_bll.GetModelList(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' "); var gas_list = gas_bll.GetModelList(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ");
if (gas_list.Count >= 2) if (gas_list.Count >= 2)
@ -105,16 +112,16 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
res.data = new energy_flow() res.data = new energy_flow()
{ {
Name = "原始值折标煤", Name = "原始值折标煤",
Value = (air_conditioning + lighting + lift + other + natural_gas), Value = (air_conditioning + lighting + lift + other +Convert.ToDecimal(0.43)),
data = new List<secondary_energy_flow>() { data = new List<secondary_energy_flow>() {
new secondary_energy_flow() { new secondary_energy_flow() {
Name = "天然气", Name = "天然气",
Value = natural_gas, Value =Convert.ToDecimal(0.43),
data=new List<three_level_energy_flow>(){ data=new List<three_level_energy_flow>(){
new three_level_energy_flow() new three_level_energy_flow()
{ {
Name="食堂", Name="食堂",
Value=natural_gas Value=Convert.ToDecimal(0.43)
} }
} }
}, },

32
DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
View File

@ -48,7 +48,7 @@ namespace DongYingAPI.Controllers.api
var clist = list.Where(x => x.DeviceName.Contains("主机控制柜")).ToList(); var clist = list.Where(x => x.DeviceName.Contains("主机控制柜")).ToList();
var now = DateTime.Now; var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今日的数据 // 只处理今日的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -100,7 +100,18 @@ namespace DongYingAPI.Controllers.api
CollateralCirculation =Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)),3)), CollateralCirculation =Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)),3)),
TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3)) TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3))
}; };
if (model.PrimaryCirculation < 0)
{
model.PrimaryCirculation = 0;
}
if(model.CollateralCirculation < 0)
{
model.CollateralCirculation= 0;
}
if(model.TerrestrialSource< 0)
{
model.TerrestrialSource = 0;
}
data.Add(model); data.Add(model);
} }
@ -131,7 +142,7 @@ namespace DongYingAPI.Controllers.api
if (i == 0) if (i == 0)
{ {
//这天 //这天
ztime = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); ztime = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -184,7 +195,18 @@ namespace DongYingAPI.Controllers.api
CollateralCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)), 3)), CollateralCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)), 3)),
TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3)) TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3))
}; };
if (model.PrimaryCirculation < 0)
{
model.PrimaryCirculation = 0;
}
if (model.CollateralCirculation < 0)
{
model.CollateralCirculation = 0;
}
if (model.TerrestrialSource < 0)
{
model.TerrestrialSource = 0;
}
data.Add(model); data.Add(model);
} }
@ -217,7 +239,7 @@ namespace DongYingAPI.Controllers.api
if (i == 0) if (i == 0)
{ {
//这月 //这月
ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
ztime = Convert.ToDateTime(ztime1); ztime = Convert.ToDateTime(ztime1);
} }
else else

4
DongYingAPI/Controllers/api/GetCarbonFluxController.cs
View File

@ -42,7 +42,7 @@ namespace DongYingAPI.Controllers.api
var list = bll_info.GetModelList(""); var list = bll_info.GetModelList("");
var now = DateTime.Now; var now = DateTime.Now;
//这个 //这个
var ztime = now.ToString("yyyy-MM-dd HH:00:00"); var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//上个 //上个
var stime = now.ToString("yyyy-MM-dd 00:00:00"); var stime = now.ToString("yyyy-MM-dd 00:00:00");
var ltime = DateTime.Now.ToString("yyyyMM"); var ltime = DateTime.Now.ToString("yyyyMM");
@ -139,7 +139,7 @@ namespace DongYingAPI.Controllers.api
num6 += aitem.EH; num6 += aitem.EH;
} }
} }
decimal? bnum = 0; decimal? bnum = num5-num6;
bmodel1.ThreeValue = Math.Round(Convert.ToDecimal(bnum / 1000 * Convert.ToDecimal(0.5703)), 3); bmodel1.ThreeValue = Math.Round(Convert.ToDecimal(bnum / 1000 * Convert.ToDecimal(0.5703)), 3);
tlist.Add(bmodel1); tlist.Add(bmodel1);

6
DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
View File

@ -58,7 +58,7 @@ namespace DongYingAPI.Controllers.api
if (i == 0) if (i == 0)
{ {
//这月 //这月
ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
ztime = Convert.ToDateTime(ztime1); ztime = Convert.ToDateTime(ztime1);
} }
else else
@ -100,10 +100,12 @@ namespace DongYingAPI.Controllers.api
model.ArealCarbon= Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 59000), 3)); model.ArealCarbon= Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 59000), 3));
data.Add(model); data.Add(model);
} }
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; var adata=data.OrderBy(x=>x.time).ToList();
res.data = adata;
} }
catch (Exception ex) catch (Exception ex)

12
DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
View File

@ -60,7 +60,7 @@ namespace DongYingAPI.Controllers
if (i == 0) if (i == 0)
{ {
//这天 //这天
ztime = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); ztime = now.AddHours(-1).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -93,6 +93,10 @@ namespace DongYingAPI.Controllers
var model = new carbon_measureData(); var model = new carbon_measureData();
model.time = jtime; model.time = jtime;
model.CarbonValue =Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000),3)); model.CarbonValue =Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000),3));
if (model.CarbonValue < 0)
{
model.CarbonValue = 0;
}
data.Add(model); data.Add(model);
} }
@ -120,7 +124,7 @@ namespace DongYingAPI.Controllers
if (i == 0) if (i == 0)
{ {
//这月 //这月
ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
ztime = Convert.ToDateTime(ztime1); ztime = Convert.ToDateTime(ztime1);
} }
else else
@ -159,6 +163,10 @@ namespace DongYingAPI.Controllers
var model = new carbon_measureData(); var model = new carbon_measureData();
model.time = jtime; model.time = jtime;
model.CarbonValue = Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000), 3)); model.CarbonValue = Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000), 3));
if (model.CarbonValue < 0)
{
model.CarbonValue = 0;
}
data.Add(model); data.Add(model);
} }

6
DongYingAPI/Controllers/api/GetCellRankingController.cs
View File

@ -43,7 +43,7 @@ namespace DongYingAPI.Controllers.api
{ {
var now = DateTime.Now; var now = DateTime.Now;
//今天 //今天
var ztime = now.ToString("yyyy-MM-dd HH:00:00"); var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//上天 //上天
var stime = now.ToString("yyyy-MM-dd 00:00:00"); var stime = now.ToString("yyyy-MM-dd 00:00:00");
var atime = now.ToString("yyyMM"); var atime = now.ToString("yyyMM");
@ -84,7 +84,7 @@ namespace DongYingAPI.Controllers.api
//科技馆负一层地源热泵 //科技馆负一层地源热泵
var now = DateTime.Now; var now = DateTime.Now;
//今天 //今天
var ztime = now.ToString("yyyy-MM-dd HH:00:00"); var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//上天 //上天
var stime = now.ToString("yyyy-MM-dd 00:00:00"); var stime = now.ToString("yyyy-MM-dd 00:00:00");
var atime = now.ToString("yyyMM"); var atime = now.ToString("yyyMM");
@ -125,7 +125,7 @@ namespace DongYingAPI.Controllers.api
//图书馆一楼 //图书馆一楼
var now = DateTime.Now; var now = DateTime.Now;
//今天 //今天
var ztime = now.ToString("yyyy-MM-dd HH:00:00"); var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//上天 //上天
var stime = now.ToString("yyyy-MM-dd 00:00:00"); var stime = now.ToString("yyyy-MM-dd 00:00:00");
var atime = now.ToString("yyyMM"); var atime = now.ToString("yyyMM");

44
DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
View File

@ -18,7 +18,7 @@ namespace DongYingAPI.Controllers.api
public class GetCurrentVoltageController : ApiController public class GetCurrentVoltageController : ApiController
{ {
DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
public HttpResponseMessage Post([FromBody] select_switching_room room) public HttpResponseMessage Post([FromBody] select_switching_room room)
{ {
var res = new get_current_voltage(); var res = new get_current_voltage();
@ -33,17 +33,17 @@ namespace DongYingAPI.Controllers.api
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 0; i < time_count; i++)
{ {
var model=new current_voltageData(); var model=new current_voltageData() { A=0,B=0,C=0 };
model.time = DateTime.Now.AddHours(-i).ToString("HH:00"); model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
var now=DateTime.Now.AddHours(-i); var now=DateTime.Now.AddHours(-i);
var sdate = now.ToString("yyyy-MM-dd HH:00:00"); var date = now.ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); //var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var list = bll_info.GetModelList("Reserve2='" + room.name + "'");
var list = bll_info.GetModelList(" DeviceName='"+ room.name + "'"); var alist= bll.GetModelListDate(" EntireTime ='"+date+"'", time);
var alist= bll.GetModelListDate(" EntireTime >='"+sdate+ "' and EntireTime<'"+edate+"'", time);
foreach (var item in list) foreach (var item in list)
{ {
var list1=alist.Where(x=>x.DeviceId==item.DeviceId).ToList(); var list1=alist.Where(x=>x.DeviceId==item.DeviceId).FirstOrDefault();
if (list1 == null) if (list1 == null)
{ {
model.A = 0; model.A = 0;
@ -52,12 +52,9 @@ namespace DongYingAPI.Controllers.api
} }
else else
{ {
foreach (var aitem in list1) model.A += list1.Ia;
{ model.B += list1.Ib;
model.A = aitem.Ia; model.C += list1.Ic;
model.B = aitem.Ib;
model.C = aitem.Ic;
}
} }
} }
@ -73,15 +70,15 @@ namespace DongYingAPI.Controllers.api
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 0; i < time_count; i++)
{ {
var model = new current_voltageData(); var model = new current_voltageData() { A = 0, B = 0, C = 0 };
model.time = DateTime.Now.AddHours(-i).ToString("HH:00"); model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
var now = DateTime.Now.AddHours(-i); var now = DateTime.Now.AddHours(-i);
var sdate = now.ToString("yyyy-MM-dd HH:00:00"); var date = now.ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddHours(-i + 1).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.DeviceName == room.name).ToList(); var list = bll_info.GetModelList("").Where(x => x.Reserve2 == room.name).ToList();
foreach (var item in list) foreach (var item in list)
{ {
var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)); var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(date) );
if (list1 == null) if (list1 == null)
{ {
model.A = 0; model.A = 0;
@ -92,17 +89,18 @@ namespace DongYingAPI.Controllers.api
{ {
foreach (var aitem in list1) foreach (var aitem in list1)
{ {
model.A = aitem.Ia; model.A += aitem.Ia;
model.B = aitem.Ib; model.B += aitem.Ib;
model.C = aitem.Ic; model.C += aitem.Ic;
} }
} }
} }
data.Add(model); data.Add(model);
} }
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; res.data = adata;
} }
} }
else else

2
DongYingAPI/Controllers/api/GetDailyElectricityController.cs
View File

@ -43,7 +43,7 @@ namespace DongYingAPI.Controllers.api
} }
#endregion #endregion
//今天 //今天
var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var sdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//昨天 //昨天
var edate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); var edate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
//前天 //前天

24
DongYingAPI/Controllers/api/GetDistributionPowerController.cs
View File

@ -17,7 +17,7 @@ namespace DongYingAPI.Controllers.api
public class GetDistributionPowerController : ApiController public class GetDistributionPowerController : ApiController
{ {
DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
public HttpResponseMessage Post([FromBody] select_switching_name room) public HttpResponseMessage Post([FromBody] select_switching_name room)
{ {
@ -27,26 +27,38 @@ namespace DongYingAPI.Controllers.api
if (!string.IsNullOrEmpty(room.name)) if (!string.IsNullOrEmpty(room.name))
{ {
var data = new List<distribution_powerData>(); var data = new List<distribution_powerData>();
var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList(); var list = bll_info.GetModelList("").Where(x => x.Reserve2 == room.name).ToList();
var time = DateTime.Now.ToString("yyyyMM"); var time = DateTime.Now.ToString("yyyyMM");
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 0; i < time_count; i++)
{ {
var model=new distribution_powerData(); var model=new distribution_powerData() { TP=0,YP=0};
model.time = DateTime.Now.AddHours(-i).ToString("HH:00"); model.Ttime = DateTime.Now.AddHours(-i).ToString("HH:00");
model.Ytime = DateTime.Now.AddDays(-i).AddHours(-i).ToString("HH:00");
var now = DateTime.Now; var now = DateTime.Now;
var ynow=DateTime.Now.AddDays(-1);
var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00"); var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
var ysdate = ynow.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var yedate = ynow.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
decimal? num = 0; decimal? num = 0;
decimal? ynum = 0;
var list1= bll.GetModelListDate(" EntireTime>='"+ sdate + "' and EntireTime<'"+ edate + "'", time); var list1= bll.GetModelListDate(" EntireTime>='"+ sdate + "' and EntireTime<'"+ edate + "'", time);
var list2 = bll.GetModelListDate(" EntireTime>='" + ysdate + "' and EntireTime<'" + yedate + "'", time);
foreach (var item in list) foreach (var item in list)
{ {
var alist = list1.Where(x => x.DeviceId == item.DeviceId); var alist = list1.Where(x => x.DeviceId == item.DeviceId);
var blist=list2.Where(x=>x.DeviceId== item.DeviceId);
foreach (var aitem in alist) foreach (var aitem in alist)
{ {
num += aitem.EH; num += aitem.P;
} }
model.P = num; foreach (var bitem in blist)
{
ynum += bitem.P;
}
model.TP = num;
model.YP= ynum;
} }
data.Add(model); data.Add(model);

2
DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
View File

@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
#region 日期 #region 日期
//今天 //今天
var now = DateTime.Now; var now = DateTime.Now;
var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.ToString("yyyyMM"); var jtime = now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
if (a == false) if (a == false)

14
DongYingAPI/Controllers/api/GetElectricQuantityController.cs
View File

@ -33,7 +33,7 @@ namespace DongYingAPI.Controllers.api
if (date == "日") if (date == "日")
{ {
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今年的数据 // 只处理今年的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -76,6 +76,10 @@ namespace DongYingAPI.Controllers.api
time = Convert.ToDateTime(jdate).ToString("HH:00"), time = Convert.ToDateTime(jdate).ToString("HH:00"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
@ -96,7 +100,7 @@ namespace DongYingAPI.Controllers.api
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -122,7 +126,7 @@ namespace DongYingAPI.Controllers.api
var model = new electric_quantityData(); var model = new electric_quantityData();
model.time = DateTime.Now.AddDays(-i).ToString("MM-dd"); model.time = DateTime.Now.AddDays(-i).ToString("MM-dd");
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0) if (model.EH < 0)
{ {
model.EH = 0; model.EH = 0;
} }
@ -142,7 +146,7 @@ namespace DongYingAPI.Controllers.api
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else
@ -173,7 +177,7 @@ namespace DongYingAPI.Controllers.api
var model = new electric_quantityData(); ; var model = new electric_quantityData(); ;
model.time = jdate.ToString("MM月"); model.time = jdate.ToString("MM月");
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0) if (model.EH <0)
{ {
model.EH = 0; model.EH = 0;
} }

30
DongYingAPI/Controllers/api/GetElectricalConditionController.cs
View File

@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
#region 天 #region 天
//今天 //今天
var now = DateTime.Now; var now = DateTime.Now;
var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.ToString("yyyyMM"); var jtime = now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
if (a == false) if (a == false)
@ -70,7 +70,7 @@ namespace DongYingAPI.Controllers.api
#endregion #endregion
#region 月 #region 月
//今月 //今月
var jmdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var jmdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jmtime = now.ToString("yyyyMM"); var jmtime = now.ToString("yyyyMM");
var am = bll.IsExistsTable(date_base, "electricity_data_" + jmtime); var am = bll.IsExistsTable(date_base, "electricity_data_" + jmtime);
if (am == false) if (am == false)
@ -87,8 +87,8 @@ namespace DongYingAPI.Controllers.api
} }
//前月 //前月
var qmdate1 = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01 00:00:00"); var qmdate1 = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01 00:00:00");
var qmdate2=Convert.ToDateTime(qmdate1); var qmdate=Convert.ToDateTime(qmdate1);
var qmdate = qmdate2.AddDays(-1); //var qmdate = qmdate2.AddDays(-1);
var qmtime = qmdate.ToString("yyyyMM"); var qmtime = qmdate.ToString("yyyyMM");
var qm = bll.IsExistsTable(date_base, "electricity_data_" + qmtime); var qm = bll.IsExistsTable(date_base, "electricity_data_" + qmtime);
if (qm == false) if (qm == false)
@ -116,7 +116,7 @@ namespace DongYingAPI.Controllers.api
#endregion #endregion
#region 年 #region 年
//今年 //今年
var jydate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var jydate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jytime = now.ToString("yyyyMM"); var jytime = now.ToString("yyyyMM");
var ay = bll.IsExistsTable(date_base, "electricity_data_" + jytime); var ay = bll.IsExistsTable(date_base, "electricity_data_" + jytime);
if (ay == false) if (ay == false)
@ -197,14 +197,14 @@ namespace DongYingAPI.Controllers.api
} }
else else
{ {
model.DayDency = model.ToDay /model.YearDay * 100; model.DayDency =Convert.ToDecimal( Math.Round(Convert.ToDouble(model.YearDency /model.ToDay * 100),3));
if (model.DayDency < 0) if (model.DayDency < 0)
{ {
model.DayDency = model.DayDency * -1; model.DayDency = model.DayDency * -1;
} }
if (model.ToDay < model.DayDency) if (model.ToDay < model.DayDency)
{ {
model.DayDency = model.DayDency; model.DayDency = model.DayDency*-1;
} }
} }
if (model.LastMonth == 0) if (model.LastMonth == 0)
@ -213,14 +213,14 @@ namespace DongYingAPI.Controllers.api
} }
else else
{ {
model.MonthDency = model.ToDay / model.YearDay * 100; model.MonthDency =Convert.ToDecimal(Math.Round(Convert.ToDouble( model.LastMonth / model.ThisMonth * 100),3));
if (model.DayDency < 0) if (model.MonthDency < 0)
{ {
model.DayDency = model.DayDency * -1; model.MonthDency = model.MonthDency * -1;
} }
if (model.ThisMonth < model.LastMonth) if (model.ThisMonth < model.LastMonth)
{ {
model.DayDency = model.DayDency; model.MonthDency = model.MonthDency*-1;
} }
} }
if (model.LastYear == 0) if (model.LastYear == 0)
@ -229,14 +229,14 @@ namespace DongYingAPI.Controllers.api
} }
else else
{ {
model.YearDency = model.ToDay / model.YearDay * 100; model.YearDency = Convert.ToDecimal(Math.Round(Convert.ToDouble(model.LastYear / model.MonthDency * 100), 3));
if (model.DayDency < 0) if (model.YearDency < 0)
{ {
model.DayDency = model.DayDency * -1; model.YearDency = model.YearDency * -1;
} }
if (model.ThisYear < model.LastYear) if (model.ThisYear < model.LastYear)
{ {
model.DayDency = model.DayDency; model.YearDency = model.YearDency*-1;
} }
} }
data.Add(model); data.Add(model);

2
DongYingAPI/Controllers/api/GetElectricalRankingController.cs
View File

@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
#region 日期 #region 日期
//今天 //今天
var now = DateTime.Now; var now = DateTime.Now;
var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.ToString("yyyyMM"); var jtime = now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
if (a == false) if (a == false)

6
DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs
View File

@ -37,7 +37,7 @@ namespace DongYingAPI.Controllers
if (date == "日") if (date == "日")
{ {
var time_count =Convert.ToInt32(DateTime.Now.Hour); 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 jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
// 只处理今天的数据 // 只处理今天的数据
@ -103,7 +103,7 @@ namespace DongYingAPI.Controllers
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -154,7 +154,7 @@ namespace DongYingAPI.Controllers
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else

18
DongYingAPI/Controllers/api/GetEnergyTrendsController.cs
View File

@ -34,7 +34,7 @@ namespace DongYingAPI.Controllers.api
if (date == "日") if (date == "日")
{ {
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今年的数据 // 只处理今年的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -68,6 +68,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddHours(-i).ToString("HH:00"), time = DateTime.Now.AddHours(-i).ToString("HH:00"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
@ -86,7 +90,7 @@ namespace DongYingAPI.Controllers.api
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -119,6 +123,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddDays(-i).ToString("MM-dd"), time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -135,7 +143,7 @@ namespace DongYingAPI.Controllers.api
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else
@ -173,6 +181,10 @@ namespace DongYingAPI.Controllers.api
time = jdate.ToString("MM月"), time = jdate.ToString("MM月"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }

2
DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
View File

@ -44,7 +44,7 @@ namespace DongYingAPI.Controllers.api
{ {
var now = DateTime.Now; var now = DateTime.Now;
//今天 //今天
var ztime = now.ToString("yyyy-MM-dd HH:00:00"); var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
//上天 //上天
var stime = now.ToString("yyyy-MM-dd 00:00:00"); var stime = now.ToString("yyyy-MM-dd 00:00:00");
var atime = now.ToString("yyyMM"); var atime = now.ToString("yyyMM");

8
DongYingAPI/Controllers/api/GetEssentialInformationController.cs
View File

@ -1,4 +1,5 @@
using DataServer.api; using DataServer.api;
using Microsoft.Ajax.Utilities;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -25,12 +26,12 @@ namespace DongYingAPI.Controllers.api
{ {
var data = new List<essential_informationData>(); var data = new List<essential_informationData>();
var list=bll.GetModelList("").Where(x=>x.DeviceName== room.name).ToList(); var list=bll.GetModelList("").Where(x=>x.Reserve2== room.name).ToList();
foreach (var item in list) foreach (var item in list)
{ {
var model1 = new essential_informationData(); var model1 = new essential_informationData();
model1.name = "设备名称"; model1.name = "设备名称";
model1.value = item.DeviceName; model1.value = item.Reserve1;
data.Add(model1); data.Add(model1);
var model2 = new essential_informationData(); var model2 = new essential_informationData();
model2.name = "设备型号"; model2.name = "设备型号";
@ -57,9 +58,10 @@ namespace DongYingAPI.Controllers.api
model7.value = item.OperationalCondition; model7.value = item.OperationalCondition;
data.Add(model7); data.Add(model7);
} }
var adata=data.DistinctBy(x=>x.name).ToList();
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; res.data = adata;
} }
else else
{ {

4
DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
View File

@ -35,7 +35,7 @@ namespace DongYingAPI.Controllers.api
{ {
var now = DateTime.Now; var now = DateTime.Now;
DateTime jdate; DateTime jdate;
var jdate1 = now.ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
var jtime = jdate.ToString("yyyyMM"); var jtime = jdate.ToString("yyyyMM");
@ -77,7 +77,7 @@ namespace DongYingAPI.Controllers.api
{ {
var now = DateTime.Now; var now = DateTime.Now;
DateTime jdate; DateTime jdate;
var jdate1 = now.ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
var jtime = jdate.ToString("yyyyMM"); var jtime = jdate.ToString("yyyyMM");

32
DongYingAPI/Controllers/api/GetRealtimeDataController.cs
View File

@ -19,7 +19,7 @@ namespace DongYingAPI.Controllers.api
public class GetRealtimeDataController : ApiController public class GetRealtimeDataController : ApiController
{ {
DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data(); DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
public HttpResponseMessage Post([FromBody] select_switching_name room) public HttpResponseMessage Post([FromBody] select_switching_name room)
{ {
@ -33,43 +33,45 @@ namespace DongYingAPI.Controllers.api
var time = DateTime.Now.ToString("yyyyMM"); var time = DateTime.Now.ToString("yyyyMM");
var sdate=DateTime.Now.ToString("yyyy-MM-dd 00:00:00"); 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.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
var list1=bll_info.GetModelList(" DeviceName='"+room.name+"'"); var list1=bll_info.GetModelList(" Reserve2='"+room.name+"'");
var llist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time); var llist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
var alist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time); var alist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
var model = new realtime_dataData() { P = 0, LoadRate = 0, ConversionRate = 0 };
foreach (var bitem in list1) foreach (var bitem in list1)
{ {
var list = llist.Where(x=>x.DeviceId==bitem.DeviceId).ToList(); var list = llist.Where(x=>x.DeviceId==bitem.DeviceId).ToList();
if (list.Count == 0) if (list.Count == 0)
{ {
var model = new realtime_dataData(); var amodel = new realtime_dataData();
model.P = 0; amodel.P = 0;
model.LoadRate = 0; amodel.LoadRate = 0;
model.ConversionRate =0; amodel.ConversionRate =0;
model.DeviceState = 0; amodel.DeviceState = 0;
data.Add(model); data.Add(amodel);
} }
else else
{ {
foreach (var item in list) foreach (var item in list)
{ {
var model = new realtime_dataData(); model.P += item.P;
model.P = item.P;
decimal? num = 0; decimal? num = 0;
foreach (var aitem in alist) foreach (var aitem in alist)
{ {
num += aitem.P; num += aitem.P;
} }
var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3); var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3);
model.LoadRate = Convert.ToDecimal(cnum) * 100; model.LoadRate += Convert.ToDecimal(cnum) * 100;
model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100; model.ConversionRate += Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
model.DeviceState = 1; model.DeviceState = 1;
data.Add(model);
} }
} }
} }
data.Add(model);
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; res.data = data;

4
DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
View File

@ -39,6 +39,10 @@ namespace DongYingAPI.Controllers.api
num += item.P; num += item.P;
} }
model.P = num; model.P = num;
if(model.P == null)
{
model.P = 0;
}
data.Add(model); data.Add(model);
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";

47
DongYingAPI/Controllers/api/GetRoomElectricityController.cs
View File

@ -37,7 +37,7 @@ namespace DongYingAPI.Controllers.api
if (date == "日") if (date == "日")
{ {
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今年的数据 // 只处理今年的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -93,7 +93,7 @@ namespace DongYingAPI.Controllers.api
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -128,6 +128,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddDays(-i).ToString("MM-dd"), time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -144,7 +148,7 @@ namespace DongYingAPI.Controllers.api
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else
@ -184,6 +188,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddMonths(-i).ToString("MM月"), time = DateTime.Now.AddMonths(-i).ToString("MM月"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -200,7 +208,7 @@ namespace DongYingAPI.Controllers.api
if (date == "日") if (date == "日")
{ {
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今年的数据 // 只处理今年的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -256,7 +264,7 @@ namespace DongYingAPI.Controllers.api
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -291,6 +299,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddDays(-i).ToString("MM-dd"), time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -307,7 +319,7 @@ namespace DongYingAPI.Controllers.api
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else
@ -347,6 +359,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddMonths(-i).ToString("MM月"), time = DateTime.Now.AddMonths(-i).ToString("MM月"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -363,7 +379,7 @@ namespace DongYingAPI.Controllers.api
if (date == "日") if (date == "日")
{ {
var time_count = Convert.ToInt32(DateTime.Now.Hour); var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 0; i < time_count; i++) for (int i = 1; i < time_count; i++)
{ {
// 只处理今年的数据 // 只处理今年的数据
if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day) if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@ -400,7 +416,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddHours(-i).ToString("HH:00"), time = DateTime.Now.AddHours(-i).ToString("HH:00"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
@ -419,7 +438,7 @@ namespace DongYingAPI.Controllers.api
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
} }
else else
{ {
@ -454,6 +473,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddDays(-i).ToString("MM-dd"), time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -470,7 +493,7 @@ namespace DongYingAPI.Controllers.api
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1); jdate = Convert.ToDateTime(jdate1);
} }
else else
@ -510,6 +533,10 @@ namespace DongYingAPI.Controllers.api
time = DateTime.Now.AddMonths(-i).ToString("MM月"), time = DateTime.Now.AddMonths(-i).ToString("MM月"),
EH = num1 - num2 EH = num1 - num2
}; };
if (model.EH < 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }

2
DongYingAPI/Controllers/api/GetRunningStatusController.cs
View File

@ -30,7 +30,7 @@ namespace DongYingAPI.Controllers.api
var now=DateTime.Now; var now=DateTime.Now;
var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'").ToList(); var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'").ToList();
string jdate; string jdate;
jdate = now.ToString("yyyy-MM-dd HH:00:00"); jdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.ToString("yyyyMM"); var jtime = now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
if (a == false) if (a == false)

10
DongYingAPI/Controllers/api/SetLightingController.cs
View File

@ -139,6 +139,7 @@ namespace DongYingAPI.Controllers.api
var model = new DataServer.Model.lighting_control(); var model = new DataServer.Model.lighting_control();
model.LightingId = listmodel.LightingId; model.LightingId = listmodel.LightingId;
model.LightingName = listmodel.LightingName; model.LightingName = listmodel.LightingName;
model.LightingIndex= listmodel.LightingIndex;
if (value == Convert.ToString("0")) if (value == Convert.ToString("0"))
{ {
model.LightingState = Convert.ToString("0"); model.LightingState = Convert.ToString("0");
@ -185,7 +186,14 @@ namespace DongYingAPI.Controllers.api
{ {
lighting = Convert.ToString("80"); lighting = Convert.ToString("80");
} }
if (value == Convert.ToString("9"))
{
lighting = Convert.ToString("90");
}
if (value == Convert.ToString("10"))
{
lighting = Convert.ToString("100");
}
#endregion #endregion
model.LightingBrightness = lighting; model.LightingBrightness = lighting;
bll.Update(model); bll.Update(model);

2
DongYingAPI/DongYingAPI.csproj.user
View File

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

58
DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl> <_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl>
<History>True|2024-02-04T06:00:33.8555838Z;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-02-05T09:53:57.0306881Z;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 /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/DataServer.dll"> <File Include="bin/DataServer.dll">
<publishTime>02/04/2024 14:59:16</publishTime> <publishTime>02/20/2024 09:43:27</publishTime>
</File> </File>
<File Include="bin/DataServer.pdb"> <File Include="bin/DataServer.pdb">
<publishTime>02/04/2024 14:59:16</publishTime> <publishTime>02/20/2024 09:43:27</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.dll"> <File Include="bin/DongYingAPI.dll">
<publishTime>02/04/2024 15:16:18</publishTime> <publishTime>02/20/2024 17:11:31</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.pdb"> <File Include="bin/DongYingAPI.pdb">
<publishTime>02/04/2024 15:16:18</publishTime> <publishTime>02/20/2024 17:11:31</publishTime>
</File> </File>
<File Include="bin/HslCommunication.dll"> <File Include="bin/HslCommunication.dll">
<publishTime>08/03/2021 14:52:26</publishTime> <publishTime>08/03/2021 14:52:26</publishTime>
@ -364,7 +364,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/01/2024 10:10:25</publishTime> <publishTime>02/01/2024 10:10:25</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs">
<publishTime>01/31/2024 18:28:03</publishTime> <publishTime>02/20/2024 10:58:53</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs">
<publishTime>01/11/2024 14:58:40</publishTime> <publishTime>01/11/2024 14:58:40</publishTime>
@ -373,13 +373,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/11/2024 14:56:39</publishTime> <publishTime>01/11/2024 14:56:39</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs">
<publishTime>01/31/2024 18:10:58</publishTime> <publishTime>02/20/2024 14:09:26</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs">
<publishTime>02/02/2024 14:20:48</publishTime> <publishTime>02/02/2024 14:20:48</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs">
<publishTime>01/09/2024 18:18:37</publishTime> <publishTime>02/20/2024 16:03:58</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs">
<publishTime>01/31/2024 18:10:58</publishTime> <publishTime>01/31/2024 18:10:58</publishTime>
@ -400,16 +400,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/01/2024 09:28:11</publishTime> <publishTime>02/01/2024 09:28:11</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonEmissionController.cs"> <File Include="Controllers/api/GetCarbonEmissionController.cs">
<publishTime>02/01/2024 17:04:31</publishTime> <publishTime>02/20/2024 14:21:14</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonFluxController.cs"> <File Include="Controllers/api/GetCarbonFluxController.cs">
<publishTime>02/04/2024 13:57:32</publishTime> <publishTime>02/20/2024 14:26:50</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonIntensityController.cs"> <File Include="Controllers/api/GetCarbonIntensityController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/20/2024 14:35:17</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonMeasureController.cs"> <File Include="Controllers/api/GetCarbonMeasureController.cs">
<publishTime>02/01/2024 16:29:09</publishTime> <publishTime>02/20/2024 14:37:50</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonOffsetController.cs"> <File Include="Controllers/api/GetCarbonOffsetController.cs">
<publishTime>01/10/2024 13:25:43</publishTime> <publishTime>01/10/2024 13:25:43</publishTime>
@ -418,7 +418,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/01/2024 16:07:45</publishTime> <publishTime>02/01/2024 16:07:45</publishTime>
</File> </File>
<File Include="Controllers/api/GetCellRankingController.cs"> <File Include="Controllers/api/GetCellRankingController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 14:40:19</publishTime>
</File> </File>
<File Include="Controllers/api/GetChamberLoadController.cs"> <File Include="Controllers/api/GetChamberLoadController.cs">
<publishTime>02/01/2024 14:54:17</publishTime> <publishTime>02/01/2024 14:54:17</publishTime>
@ -427,7 +427,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/01/2024 16:43:20</publishTime>
</File> </File>
<File Include="Controllers/api/GetDailyElectricityController.cs"> <File Include="Controllers/api/GetDailyElectricityController.cs">
<publishTime>02/02/2024 17:28:33</publishTime> <publishTime>02/20/2024 17:07:40</publishTime>
</File> </File>
<File Include="Controllers/api/GetDeviceDetailsController.cs"> <File Include="Controllers/api/GetDeviceDetailsController.cs">
<publishTime>02/04/2024 13:59:28</publishTime> <publishTime>02/04/2024 13:59:28</publishTime>
@ -436,28 +436,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/02/2024 15:19:18</publishTime> <publishTime>02/02/2024 15:19:18</publishTime>
</File> </File>
<File Include="Controllers/api/GetDistributionPowerController.cs"> <File Include="Controllers/api/GetDistributionPowerController.cs">
<publishTime>02/01/2024 15:10:41</publishTime> <publishTime>02/20/2024 09:43:16</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricalConditionController.cs"> <File Include="Controllers/api/GetElectricalConditionController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 16:51:15</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricalRankingController.cs"> <File Include="Controllers/api/GetElectricalRankingController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 14:42:14</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricEquipmentController.cs"> <File Include="Controllers/api/GetElectricEquipmentController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 15:04:19</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricityConsumptionController.cs"> <File Include="Controllers/api/GetElectricityConsumptionController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/20/2024 15:04:15</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricQuantityController.cs"> <File Include="Controllers/api/GetElectricQuantityController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/20/2024 16:01:20</publishTime>
</File> </File>
<File Include="Controllers/api/GetEnergyTrendsController.cs"> <File Include="Controllers/api/GetEnergyTrendsController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/20/2024 17:06:47</publishTime>
</File> </File>
<File Include="Controllers/api/GetEquipmentMonitoringController.cs"> <File Include="Controllers/api/GetEquipmentMonitoringController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 15:11:54</publishTime>
</File> </File>
<File Include="Controllers/api/GetEssentialInformationController.cs"> <File Include="Controllers/api/GetEssentialInformationController.cs">
<publishTime>01/30/2024 18:43:35</publishTime> <publishTime>01/30/2024 18:43:35</publishTime>
@ -469,7 +469,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/01/2024 15:10:41</publishTime> <publishTime>02/01/2024 15:10:41</publishTime>
</File> </File>
<File Include="Controllers/api/GetGeneralCatalogueController.cs"> <File Include="Controllers/api/GetGeneralCatalogueController.cs">
<publishTime>02/01/2024 16:56:20</publishTime> <publishTime>02/20/2024 15:12:57</publishTime>
</File> </File>
<File Include="Controllers/api/GetIlluminationLoadController.cs"> <File Include="Controllers/api/GetIlluminationLoadController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/01/2024 16:43:20</publishTime>
@ -484,22 +484,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/04/2024 14:42:28</publishTime> <publishTime>02/04/2024 14:42:28</publishTime>
</File> </File>
<File Include="Controllers/api/GetMeteorologicalStationController.cs"> <File Include="Controllers/api/GetMeteorologicalStationController.cs">
<publishTime>01/30/2024 17:36:42</publishTime> <publishTime>02/20/2024 16:55:55</publishTime>
</File> </File>
<File Include="Controllers/api/GetPowerLoadController.cs"> <File Include="Controllers/api/GetPowerLoadController.cs">
<publishTime>02/01/2024 15:08:46</publishTime> <publishTime>02/01/2024 15:08:46</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeDataController.cs"> <File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>02/01/2024 15:40:45</publishTime> <publishTime>02/20/2024 15:23:14</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeLoadController.cs"> <File Include="Controllers/api/GetRealtimeLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime> <publishTime>02/05/2024 15:02:52</publishTime>
</File> </File>
<File Include="Controllers/api/GetRoomElectricityController.cs"> <File Include="Controllers/api/GetRoomElectricityController.cs">
<publishTime>02/01/2024 16:42:24</publishTime> <publishTime>02/20/2024 15:55:57</publishTime>
</File> </File>
<File Include="Controllers/api/GetRunningStatusController.cs"> <File Include="Controllers/api/GetRunningStatusController.cs">
<publishTime>01/30/2024 17:33:34</publishTime> <publishTime>02/20/2024 15:28:29</publishTime>
</File> </File>
<File Include="Controllers/api/GetWaterConsumptionController.cs"> <File Include="Controllers/api/GetWaterConsumptionController.cs">
<publishTime>02/01/2024 16:43:20</publishTime> <publishTime>02/01/2024 16:43:20</publishTime>
@ -508,7 +508,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/09/2024 10:54:33</publishTime> <publishTime>01/09/2024 10:54:33</publishTime>
</File> </File>
<File Include="Controllers/api/SetLightingController.cs"> <File Include="Controllers/api/SetLightingController.cs">
<publishTime>02/04/2024 14:46:37</publishTime> <publishTime>02/20/2024 16:24:47</publishTime>
</File> </File>
<File Include="Controllers/GetSingleControlController.cs"> <File Include="Controllers/GetSingleControlController.cs">
<publishTime>02/04/2024 15:01:51</publishTime> <publishTime>02/04/2024 15:01:51</publishTime>

BIN
DongYingAPI/bin/DataServer.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DataServer.pdb
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.pdb
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.pdb
View File

Binary file not shown.

875
Security/ServiceSecurity.cs
View File

File diff suppressed because it is too large Load Diff

BIN
Security/bin/Debug/DataServer.dll
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.pdb
View File

Binary file not shown.

2
Security/bin/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>fXb824TGMzrTlm494R7AK+Eh/lxTphTP4YyCnt60syk=</dsig:DigestValue> <dsig:DigestValue>Jw8TcGOJ6Ux9EnCsouNtJBVBQAwLtRm0OSjSgfh1Plo=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/bin/Debug/ServiceSecurity.exe
View File

Binary file not shown.

6
Security/bin/Debug/ServiceSecurity.exe.manifest
View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>ELr9UH3dGKKDFGL/HOlZwBIs+xZEWkcQhMNTZPZ5Ah8=</dsig:DigestValue> <dsig:DigestValue>bUW7g9n9nwHGCUt1FS7IPZhr5a24DqOcm1OgGsbvvEU=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
@ -138,14 +138,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="128480"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="129504">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash> <hash>
<dsig:Transforms> <dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>3IcD63GbVCdIq/jfW8wzOwgW85Y/moIkXTQMRWSlX/A=</dsig:DigestValue> <dsig:DigestValue>wL9te6sjDrV0xqlUYXEyW++xNXsYbShi/dpEvbxeTsY=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/bin/Debug/ServiceSecurity.pdb
View File

Binary file not shown.

BIN
Security/bin/Debug/app.publish/ServiceSecurity.exe
View File

Binary file not shown.

BIN
Security/obj/Debug/Security.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Security/obj/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>fXb824TGMzrTlm494R7AK+Eh/lxTphTP4YyCnt60syk=</dsig:DigestValue> <dsig:DigestValue>Jw8TcGOJ6Ux9EnCsouNtJBVBQAwLtRm0OSjSgfh1Plo=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/obj/Debug/ServiceSecurity.exe
View File

Binary file not shown.

6
Security/obj/Debug/ServiceSecurity.exe.manifest
View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>ELr9UH3dGKKDFGL/HOlZwBIs+xZEWkcQhMNTZPZ5Ah8=</dsig:DigestValue> <dsig:DigestValue>bUW7g9n9nwHGCUt1FS7IPZhr5a24DqOcm1OgGsbvvEU=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
@ -138,14 +138,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="128480"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="129504">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash> <hash>
<dsig:Transforms> <dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>3IcD63GbVCdIq/jfW8wzOwgW85Y/moIkXTQMRWSlX/A=</dsig:DigestValue> <dsig:DigestValue>wL9te6sjDrV0xqlUYXEyW++xNXsYbShi/dpEvbxeTsY=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/obj/Debug/ServiceSecurity.pdb
View File

Binary file not shown.