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

添加设备参数表

This commit is contained in:
xukanghao 2024-02-01 13:15:54 +08:00
parent 8adda618c7
commit 885a7c198e
46 changed files with 835 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataServer/BLL/device_host.cs
View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 N/A 初版 * V0.01 2024/2/1 10:18:14 N/A 初版
* *
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐

2
DataServer/DAL/device_host.cs
View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 N/A 初版 * V0.01 2024/2/1 10:18:14 N/A 初版
* *
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐

3
DataServer/DataServer.csproj
View File

@ -105,6 +105,7 @@
<Compile Include="api\select_switching_room.cs" /> <Compile Include="api\select_switching_room.cs" />
<Compile Include="api\Test.cs" /> <Compile Include="api\Test.cs" />
<Compile Include="BLL\device_data.cs" /> <Compile Include="BLL\device_data.cs" />
<Compile Include="BLL\device_host.cs" />
<Compile Include="BLL\device_info.cs" /> <Compile Include="BLL\device_info.cs" />
<Compile Include="BLL\device_operation.cs" /> <Compile Include="BLL\device_operation.cs" />
<Compile Include="BLL\device_state.cs" /> <Compile Include="BLL\device_state.cs" />
@ -119,6 +120,7 @@
<Compile Include="BLL\water_data.cs" /> <Compile Include="BLL\water_data.cs" />
<Compile Include="DAL\device_data.cs" /> <Compile Include="DAL\device_data.cs" />
<Compile Include="api\get_realtime_data.cs" /> <Compile Include="api\get_realtime_data.cs" />
<Compile Include="DAL\device_host.cs" />
<Compile Include="DAL\device_info.cs" /> <Compile Include="DAL\device_info.cs" />
<Compile Include="DAL\device_operation.cs" /> <Compile Include="DAL\device_operation.cs" />
<Compile Include="DAL\device_state.cs" /> <Compile Include="DAL\device_state.cs" />
@ -132,6 +134,7 @@
<Compile Include="DAL\planned_energy.cs" /> <Compile Include="DAL\planned_energy.cs" />
<Compile Include="DAL\water_data.cs" /> <Compile Include="DAL\water_data.cs" />
<Compile Include="Model\device_data.cs" /> <Compile Include="Model\device_data.cs" />
<Compile Include="Model\device_host.cs" />
<Compile Include="Model\device_info.cs" /> <Compile Include="Model\device_info.cs" />
<Compile Include="Model\device_operation.cs" /> <Compile Include="Model\device_operation.cs" />
<Compile Include="Model\device_state.cs" /> <Compile Include="Model\device_state.cs" />

2
DataServer/Model/device_host.cs
View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 N/A 初版 * V0.01 2024/2/1 10:18:14 N/A 初版
* *
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐

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

Binary file not shown.

2
DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
bd5a431b4433af697881ea2191ec1d9588c75084 098959a00783799e26d9b78bc1dbc8faad3ea038

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

Binary file not shown.

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

Binary file not shown.

5
DongYingAPI/Controllers/api/EnergyEfficiency/GetClassifiedEnergyController.cs
View File

@ -132,6 +132,11 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
var source = ""; var source = "";
for (int i = 0; i <= time_count; i++) for (int i = 0; i <= time_count; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var time = upper_start_time.AddMonths(i).ToString("yyyyMM"); var time = upper_start_time.AddMonths(i).ToString("yyyyMM");
if (bll.IsExistsTable(date_base, "electricity_data_" + time)) if (bll.IsExistsTable(date_base, "electricity_data_" + time))
{ {

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

@ -35,7 +35,8 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
var time=DateTime.Now.ToString("yyyyMM"); var time=DateTime.Now.ToString("yyyyMM");
var date = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); var date = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var list = bll.GetModelList(""); var list = bll.GetModelList("");
var alist = bll_info.GetModelList("");
var lblist = bll_data.GetModelListDate("", time);
foreach (var item in list) foreach (var item in list)
{ {
var model = new device_operation_response(); var model = new device_operation_response();
@ -45,29 +46,29 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
if (model.SystematicName.Contains("空调")) if (model.SystematicName.Contains("空调"))
{ {
//空调 //空调
kinfolist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("空调")).ToList(); kinfolist = alist.Where(x => x.DeviceName.Contains("空调")).ToList();
} }
if (model.SystematicName.Contains("照明")) if (model.SystematicName.Contains("照明"))
{ {
//空调 //空调
kinfolist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("照明")).ToList(); kinfolist = alist.Where(x => x.DeviceName.Contains("照明")).ToList();
} }
if (model.SystematicName.Contains("电梯")) if (model.SystematicName.Contains("电梯"))
{ {
//空调 //空调
kinfolist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("梯")).ToList(); kinfolist = alist.Where(x => x.DeviceName.Contains("梯")).ToList();
} }
if (model.SystematicName.Contains("风机")) if (model.SystematicName.Contains("风机"))
{ {
//空调 //空调
kinfolist = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("风机")).ToList(); 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 = bll_data.GetModelListDate("", time).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(date)).ToList();
foreach (var bitem in blist) foreach (var bitem in blist)
{ {
kcount2++; kcount2++;

15
DongYingAPI/Controllers/api/GetAirConditionerController.cs
View File

@ -33,6 +33,11 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -57,6 +62,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -79,6 +89,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddMonths(-i); var now = DateTime.Now.AddMonths(-i);
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";

22
DongYingAPI/Controllers/api/GetBuildingLightingController.cs
View File

@ -75,10 +75,11 @@ namespace DongYingAPI.Controllers.api
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 model1 = new building_lightingData(); var model1 = new building_lightingData();
model1.BuildingName = "科技馆"; model1.BuildingName = "科技馆";
var lalist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", jtime);
//科技馆 //科技馆
foreach (var item in list) foreach (var item in list)
{ {
var alist = bll.GetModelListDate(" EntireTime>='"+sdate+ "' and EntireTime<'"+edate+"'", jtime); var alist=lalist.Where(x=>x.DeviceId==item.DeviceId).ToList();
decimal? num = alist.Sum(x=>Convert.ToDecimal(x.P)); decimal? num = alist.Sum(x=>Convert.ToDecimal(x.P));
model1.BuildingValue = num; model1.BuildingValue = num;
@ -88,21 +89,26 @@ namespace DongYingAPI.Controllers.api
model2.BuildingName = "少年宫"; model2.BuildingName = "少年宫";
foreach (var item in list1) foreach (var item in list1)
{ {
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", jtime);
decimal? num = alist.Sum(x => Convert.ToDecimal(x.P)); decimal? num = alist.Sum(x => Convert.ToDecimal(x.P));
model1.BuildingValue = num; model2.BuildingValue = num;
}
if (list1 == null)
{
model2.BuildingValue = 0;
} }
data.Add(model2); data.Add(model2);
var model3 = new building_lightingData(); var model3 = new building_lightingData();
model3.BuildingName = "图书馆"; model3.BuildingName = "图书馆";
foreach (var item in list2) foreach (var item in list2)
{ {
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", jtime);
decimal? num = alist.Sum(x => Convert.ToDecimal(x.P)); decimal? num = alist.Sum(x => Convert.ToDecimal(x.P));
model1.BuildingValue = num; model3.BuildingValue = num;
}
if(list2 == null)
{
model3.BuildingValue= 0;
} }
data.Add(model3); data.Add(model3);

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

@ -49,6 +49,11 @@ namespace DongYingAPI.Controllers.api
var now = DateTime.Now; var now = DateTime.Now;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今日的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
time = now.AddDays(-i).ToString("yyyMM"); time = now.AddDays(-i).ToString("yyyMM");
var atime = now.AddDays(-(i + 1)).ToString("yyyyMM"); var atime = now.AddDays(-(i + 1)).ToString("yyyyMM");
var jtime = now.AddHours(-i).ToString("HH:00"); var jtime = now.AddHours(-i).ToString("HH:00");
@ -108,6 +113,11 @@ namespace DongYingAPI.Controllers.api
var now = DateTime.Now; var now = DateTime.Now;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
time = now.AddDays(-i).ToString("yyyMM"); time = now.AddDays(-i).ToString("yyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time); var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
if (a == false) if (a == false)
@ -179,6 +189,7 @@ namespace DongYingAPI.Controllers.api
} }
else if (date == "年") else if (date == "年")
{ {
var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'"); var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'");
var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList(); var alist = list.Where(x => x.DeviceName.Contains("B1一次循环") || x.DeviceName.Contains("B5二次循环")).ToList();
var blist = list.Where(x => x.DeviceName.Contains("地源侧循环泵")).ToList(); var blist = list.Where(x => x.DeviceName.Contains("地源侧循环泵")).ToList();
@ -186,6 +197,11 @@ namespace DongYingAPI.Controllers.api
var now = DateTime.Now; var now = DateTime.Now;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
time = now.AddMonths(-i).ToString("yyyMM"); time = now.AddMonths(-i).ToString("yyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time); var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
if (a == false) if (a == false)

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

@ -42,7 +42,11 @@ namespace DongYingAPI.Controllers
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var now = DateTime.Now; var now = DateTime.Now;
time = now.AddDays(-i).ToString("yyyMM"); time = now.AddDays(-i).ToString("yyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time); var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
@ -96,7 +100,11 @@ namespace DongYingAPI.Controllers
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var now = DateTime.Now; var now = DateTime.Now;
time = now.AddMonths(-i).ToString("yyyMM"); time = now.AddMonths(-i).ToString("yyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time); var a = bll.IsExistsTable(date_base, "electricity_data_" + time);

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

@ -67,6 +67,10 @@ namespace DongYingAPI.Controllers.api
decimal? num2 = 0; decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH)); num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
@ -104,6 +108,10 @@ namespace DongYingAPI.Controllers.api
decimal? num2 = 0; decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH)); num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
@ -141,6 +149,10 @@ namespace DongYingAPI.Controllers.api
decimal? num2 = 0; decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH)); num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }

45
DongYingAPI/Controllers/api/GetChamberLoadController.cs
View File

@ -34,6 +34,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -59,6 +64,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -82,6 +92,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddYears(-i); var now = DateTime.Now.AddYears(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -115,6 +130,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今日的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -140,6 +160,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -163,6 +188,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddYears(-i); var now = DateTime.Now.AddYears(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -196,6 +226,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -221,6 +256,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -244,6 +284,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddYears(-i); var now = DateTime.Now.AddYears(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";

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

@ -49,12 +49,16 @@ namespace DongYingAPI.Controllers.api
model.B = 0; model.B = 0;
model.C = 0; model.C = 0;
} }
foreach (var aitem in list1) else
{ {
model.A = aitem.Ia; foreach (var aitem in list1)
model.B = aitem.Ib; {
model.C = aitem.Ic; model.A = aitem.Ia;
model.B = aitem.Ib;
model.C = aitem.Ic;
}
} }
} }
data.Add(model); data.Add(model);
} }
@ -76,11 +80,20 @@ namespace DongYingAPI.Controllers.api
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(sdate) && x.EntireTime < Convert.ToDateTime(edate));
foreach (var aitem in list1) if (list1 == null)
{ {
model.A = aitem.Ua; model.A = 0;
model.B = aitem.Ub; model.B = 0;
model.C = aitem.Uc; model.C = 0;
}
else
{
foreach (var aitem in list1)
{
model.A = aitem.Ia;
model.B = aitem.Ib;
model.C = aitem.Ic;
}
} }
} }
data.Add(model); data.Add(model);

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

@ -34,6 +34,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
@ -81,6 +86,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
@ -110,6 +120,10 @@ 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)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -117,6 +131,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
@ -151,6 +170,10 @@ 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)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }

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

@ -27,7 +27,7 @@ namespace DongYingAPI.Controllers.api
try try
{ {
var data = new List<electrical_conditionData>(); var data = new List<electrical_conditionData>();
var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList(); var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'");
#region 天 #region 天
//今天 //今天
var now = DateTime.Now; var now = DateTime.Now;
@ -51,16 +51,19 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = 0; decimal? num1 = 0;
decimal? num2 = 0; decimal? num2 = 0;
decimal? num3 = 0; decimal? num3 = 0;
var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var zlist= bll.GetModelListDate(" EntireTime='" + zdate + "'", ztime);
var qlist = bll.GetModelListDate(" EntireTime='" + qdate + "'", jtime);
foreach (var aitem in list) foreach (var aitem in list)
{ {
//今天列表 //今天列表
var list1 = bll.GetModelListDate(" DeviceId='"+aitem.DeviceId+ "' and EntireTime='"+ jdate + "'", jtime); var list1 = jlist.Where(x=>x.DeviceId==aitem.DeviceId).ToList();
num1 += list1.Sum(x=>Convert.ToDecimal(x.EH)); num1 += list1.Sum(x=>Convert.ToDecimal(x.EH));
//昨天列表 //昨天列表
var list2 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + zdate + "'", ztime); var list2 = zlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num2 += list2.Sum(x => Convert.ToDecimal(x.EH)); num2 += list2.Sum(x => Convert.ToDecimal(x.EH));
//前天列表 //前天列表
var list3 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + qdate + "'", jtime); var list3 = qlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num3 += list3.Sum(x => Convert.ToDecimal(x.EH)); num3 += list3.Sum(x => Convert.ToDecimal(x.EH));
} }
@ -95,16 +98,19 @@ namespace DongYingAPI.Controllers.api
decimal? mnum1 = 0; decimal? mnum1 = 0;
decimal? mnum2 = 0; decimal? mnum2 = 0;
decimal? mnum3 = 0; decimal? mnum3 = 0;
var jmlist = bll.GetModelListDate(" EntireTime='" + jmdate + "'", jmtime);
var zmlist = bll.GetModelListDate(" EntireTime='" + zmdate + "'", zmtime);
var qmlist = bll.GetModelListDate(" EntireTime='" + qmdate + "'", qmtime);
foreach (var aitem in list) foreach (var aitem in list)
{ {
//今月列表 //今月列表
var mlist1 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jmdate + "'", jmtime); var mlist1 = jmlist.Where(x=>x.DeviceId== aitem.DeviceId).ToList();
mnum1 += mlist1.Sum(x => Convert.ToDecimal(x.EH)); mnum1 += mlist1.Sum(x => Convert.ToDecimal(x.EH));
//昨月列表 //昨月列表
var mlist2 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + zmdate + "'", zmtime); var mlist2 = zmlist.Where(x=>x.DeviceId==aitem.DeviceId).ToList();
mnum2 += mlist2.Sum(x => Convert.ToDecimal(x.EH)); mnum2 += mlist2.Sum(x => Convert.ToDecimal(x.EH));
//前月列表 //前月列表
var mlist3 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + qmdate + "'", jmtime); var mlist3 = qmlist.Where(x=>x.DeviceId== aitem.DeviceId).ToList();
mnum3 += mlist3.Sum(x => Convert.ToDecimal(x.EH)); mnum3 += mlist3.Sum(x => Convert.ToDecimal(x.EH));
} }
#endregion #endregion
@ -137,16 +143,19 @@ namespace DongYingAPI.Controllers.api
decimal? ynum1 = 0; decimal? ynum1 = 0;
decimal? ynum2 = 0; decimal? ynum2 = 0;
decimal? ynum3 = 0; decimal? ynum3 = 0;
var jylist= bll.GetModelListDate(" EntireTime='" + jydate + "'", jytime);
var zylist = bll.GetModelListDate(" EntireTime='" + zydate + "'", zytime);
var qylist= bll.GetModelListDate(" EntireTime='" + qydate + "'", qytime);
foreach (var aitem in list) foreach (var aitem in list)
{ {
//今年列表 //今年列表
var ylist1 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jydate + "'", jytime); var ylist1 = jylist.Where(x=>x.DeviceId==aitem.DeviceId).ToList();
ynum1 += ylist1.Sum(x => Convert.ToDecimal(x.EH)); ynum1 += ylist1.Sum(x => Convert.ToDecimal(x.EH));
//昨年列表 //昨年列表
var ylist2 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + zydate + "'", zytime); var ylist2 = zylist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
ynum2 += ylist2.Sum(x => Convert.ToDecimal(x.EH)); ynum2 += ylist2.Sum(x => Convert.ToDecimal(x.EH));
//前年列表 //前年列表
var ylist3 = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + qydate + "'", qytime); var ylist3 = qylist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
ynum3 += ylist3.Sum(x => Convert.ToDecimal(x.EH)); ynum3 += ylist3.Sum(x => Convert.ToDecimal(x.EH));
} }
@ -158,6 +167,30 @@ namespace DongYingAPI.Controllers.api
model.LastMonth = mnum2 - mnum3; model.LastMonth = mnum2 - mnum3;
model.ThisYear= ynum1 - ynum2; model.ThisYear= ynum1 - ynum2;
model.LastYear= ynum2 - ynum3; model.LastYear= ynum2 - ynum3;
if (model.ToDay < 0)
{
model.ToDay = 0;
}
if (model.YearDay < 0)
{
model.YearDay = 0;
}
if (model.ThisMonth < 0)
{
model.ThisMonth = 0;
}
if (model.LastMonth < 0)
{
model.LastMonth = 0;
}
if (model.ThisYear < 0)
{
model.ThisYear = 0;
}
if (model.LastYear < 0)
{
model.LastYear = 0;
}
if (model.YearDay == 0) if (model.YearDay == 0)
{ {
model.DayDency = 100; model.DayDency = 100;

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

@ -37,7 +37,17 @@ namespace DongYingAPI.Controllers
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
// 只处理今天的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).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)
@ -84,15 +94,25 @@ namespace DongYingAPI.Controllers
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
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).ToString("yyyy-MM-dd HH:00:00");
} }
else
{ {
jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00"); jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
} }
// 只处理今月的数据
if (DateTime.Now.AddDays(-i).Month != DateTime.Now.Month)
{
continue;
}
var jtime = now.AddDays(-i).ToString("yyyyMM"); var jtime = now.AddDays(-i).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)
@ -113,6 +133,10 @@ namespace DongYingAPI.Controllers
var model = new electricity_consumptionData(); ; var model = new electricity_consumptionData(); ;
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)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
@ -120,6 +144,11 @@ namespace DongYingAPI.Controllers
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
@ -132,6 +161,11 @@ namespace DongYingAPI.Controllers
var jdate2 = Convert.ToDateTime(jdate1); var jdate2 = Convert.ToDateTime(jdate1);
jdate = jdate2.AddDays(-i); jdate = jdate2.AddDays(-i);
} }
// 只处理今年的数据
if (jdate.Year != DateTime.Now.Year)
{
continue;
}
var jtime = jdate.ToString("yyyyMM"); var jtime = jdate.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)
@ -154,12 +188,17 @@ namespace DongYingAPI.Controllers
var model = new electricity_consumptionData(); ; var model = new electricity_consumptionData(); ;
model.Time = jdate.ToString("MM月"); model.Time = jdate.ToString("MM月");
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
data.Add(model); data.Add(model);
} }
} }
var adata = data.OrderBy(x => x.EH).ToList();
res.code = 200; res.code = 200;
res.msg = "成功"; res.msg = "成功";
res.data = data; res.data = adata;
} }
else else
{ {

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

@ -35,6 +35,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
@ -71,6 +76,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
@ -114,6 +124,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {

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

@ -122,6 +122,10 @@ namespace DongYingAPI.Controllers.api
decimal? num2 = 0; decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH)); num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
if (model.EH == 0) if (model.EH == 0)
{ {
model.DeviceState = 0; model.DeviceState = 0;
@ -171,6 +175,10 @@ namespace DongYingAPI.Controllers.api
decimal? num2 = 0; decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH)); num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH > 0)
{
model.EH = 0;
}
if (model.EH == 0) if (model.EH == 0)
{ {
model.DeviceState = 0; model.DeviceState = 0;

15
DongYingAPI/Controllers/api/GetGasConsumptionController.cs
View File

@ -25,6 +25,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var now = DateTime.Now; var now = DateTime.Now;
var time = now.AddHours(-i).ToString("HH:00"); var time = now.AddHours(-i).ToString("HH:00");
var model = new gas_consumptionData(); var model = new gas_consumptionData();
@ -41,6 +46,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var now = DateTime.Now; var now = DateTime.Now;
var time = now.AddDays(-i).ToString("MM-dd"); var time = now.AddDays(-i).ToString("MM-dd");
var model = new gas_consumptionData(); var model = new gas_consumptionData();
@ -57,6 +67,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var now = DateTime.Now; var now = DateTime.Now;
var time = now.AddMonths(-i).ToString("MM月"); var time = now.AddMonths(-i).ToString("MM月");
var model = new gas_consumptionData(); var model = new gas_consumptionData();

15
DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
View File

@ -71,6 +71,11 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var model = new illumination_loadData(); var model = new illumination_loadData();
var j = i * 60; var j = i * 60;
@ -109,6 +114,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var model = new illumination_loadData(); var model = new illumination_loadData();
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
model.time = atime; model.time = atime;
@ -142,6 +152,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var model = new illumination_loadData(); var model = new illumination_loadData();
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
model.time = atime; model.time = atime;

15
DongYingAPI/Controllers/api/GetLightingLoadController.cs
View File

@ -34,6 +34,11 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今日的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -59,6 +64,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -82,6 +92,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddMonths(-i); var now = DateTime.Now.AddMonths(-i);
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";

16
DongYingAPI/Controllers/api/GetPowerLoadController.cs
View File

@ -31,7 +31,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
string now = ""; string now = "";
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00"); now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var datetime = Convert.ToDateTime(now); var datetime = Convert.ToDateTime(now);
@ -53,6 +57,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd"); var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i); var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00"; var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -72,6 +81,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
var atime = DateTime.Now.AddMonths(-i).ToString("MM月"); var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
var now = DateTime.Now.AddMonths(-i); var now = DateTime.Now.AddMonths(-i);
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00"; var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";

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

@ -33,11 +33,13 @@ 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("").Where(x=>x.DeviceName==room.name).ToList(); var list1=bll_info.GetModelList(" DeviceName='"+room.name+"'");
var llist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
var alist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
foreach (var bitem in list1) foreach (var bitem in list1)
{ {
var list = bll.GetModelListDate("", time).Where(x =>x.DeviceId==bitem.DeviceId&& x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList(); var list = llist.Where(x=>x.DeviceId==bitem.DeviceId).ToList();
var alist = bll.GetModelListDate("", time);
if (list.Count == 0) if (list.Count == 0)
{ {
var model = new realtime_dataData(); var model = new realtime_dataData();

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

@ -38,6 +38,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
@ -78,6 +83,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
@ -123,6 +133,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
@ -183,6 +198,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今日的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
@ -223,6 +243,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
@ -268,6 +293,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {
@ -328,6 +358,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今日的数据
if (DateTime.Now.AddDays(-i).Day != DateTime.Now.Day)
{
continue;
}
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00"); var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var jtime = now.AddHours(-i).ToString("yyyyMM"); var jtime = now.AddHours(-i).ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime); var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
@ -368,6 +403,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今月的数据
if (DateTime.Now.AddMonths(-i).Month != DateTime.Now.Month)
{
continue;
}
string jdate; string jdate;
if (i == 0) if (i == 0)
{ {
@ -413,6 +453,11 @@ namespace DongYingAPI.Controllers.api
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
// 只处理今年的数据
if (DateTime.Now.AddYears(-i).Year != DateTime.Now.Year)
{
continue;
}
DateTime jdate; DateTime jdate;
if (i == 0) if (i == 0)
{ {

2
DongYingAPI/DongYingAPI.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|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-01-31T08:21:08.6583762Z;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-01T02:10:55.0739031Z;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>01/30/2024 18:41:38</publishTime> <publishTime>01/31/2024 18:14:34</publishTime>
</File> </File>
<File Include="bin/DataServer.pdb"> <File Include="bin/DataServer.pdb">
<publishTime>01/30/2024 18:41:38</publishTime> <publishTime>01/31/2024 18:14:34</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.dll"> <File Include="bin/DongYingAPI.dll">
<publishTime>01/31/2024 16:21:08</publishTime> <publishTime>02/01/2024 10:14:51</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.pdb"> <File Include="bin/DongYingAPI.pdb">
<publishTime>01/31/2024 16:21:08</publishTime> <publishTime>02/01/2024 10:14:51</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>
@ -361,10 +361,10 @@ 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/GetClassifiedEnergyController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetClassifiedEnergyController.cs">
<publishTime>01/24/2024 17:21:00</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/24/2024 17:21:00</publishTime> <publishTime>01/31/2024 18:28:03</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,16 +373,16 @@ 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/24/2024 17:21:00</publishTime> <publishTime>01/31/2024 18:10:58</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs">
<publishTime>01/10/2024 17:33:29</publishTime> <publishTime>01/31/2024 18:10:58</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>01/09/2024 18:18:37</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs">
<publishTime>01/10/2024 17:33:29</publishTime> <publishTime>01/31/2024 18:10:58</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs">
<publishTime>01/24/2024 17:21:00</publishTime> <publishTime>01/24/2024 17:21:00</publishTime>
@ -394,13 +394,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/10/2024 13:26:12</publishTime> <publishTime>01/10/2024 13:26:12</publishTime>
</File> </File>
<File Include="Controllers/api/GetAirConditionerController.cs"> <File Include="Controllers/api/GetAirConditionerController.cs">
<publishTime>01/31/2024 13:20:43</publishTime> <publishTime>02/01/2024 09:54:37</publishTime>
</File> </File>
<File Include="Controllers/api/GetBuildingLightingController.cs"> <File Include="Controllers/api/GetBuildingLightingController.cs">
<publishTime>01/30/2024 17:58:16</publishTime> <publishTime>02/01/2024 09:28:11</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonEmissionController.cs"> <File Include="Controllers/api/GetCarbonEmissionController.cs">
<publishTime>01/31/2024 16:15:50</publishTime> <publishTime>02/01/2024 09:56:10</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonFluxController.cs"> <File Include="Controllers/api/GetCarbonFluxController.cs">
<publishTime>01/11/2024 18:27:33</publishTime> <publishTime>01/11/2024 18:27:33</publishTime>
@ -409,7 +409,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/12/2024 09:45:18</publishTime> <publishTime>01/12/2024 09:45:18</publishTime>
</File> </File>
<File Include="Controllers/api/GetCarbonMeasureController.cs"> <File Include="Controllers/api/GetCarbonMeasureController.cs">
<publishTime>01/31/2024 13:27:02</publishTime> <publishTime>02/01/2024 10:10:27</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,13 +418,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/11/2024 14:10:28</publishTime> <publishTime>01/11/2024 14:10:28</publishTime>
</File> </File>
<File Include="Controllers/api/GetCellRankingController.cs"> <File Include="Controllers/api/GetCellRankingController.cs">
<publishTime>01/30/2024 16:49:54</publishTime> <publishTime>01/31/2024 18:13:29</publishTime>
</File> </File>
<File Include="Controllers/api/GetChamberLoadController.cs"> <File Include="Controllers/api/GetChamberLoadController.cs">
<publishTime>01/31/2024 13:30:35</publishTime> <publishTime>02/01/2024 10:00:03</publishTime>
</File> </File>
<File Include="Controllers/api/GetCurrentVoltageController.cs"> <File Include="Controllers/api/GetCurrentVoltageController.cs">
<publishTime>01/30/2024 09:36:06</publishTime> <publishTime>01/31/2024 18:10:56</publishTime>
</File> </File>
<File Include="Controllers/api/GetDailyElectricityController.cs"> <File Include="Controllers/api/GetDailyElectricityController.cs">
<publishTime>01/12/2024 15:06:05</publishTime> <publishTime>01/12/2024 15:06:05</publishTime>
@ -439,25 +439,25 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/31/2024 16:19:42</publishTime> <publishTime>01/31/2024 16:19:42</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricalConditionController.cs"> <File Include="Controllers/api/GetElectricalConditionController.cs">
<publishTime>01/30/2024 17:01:12</publishTime> <publishTime>01/31/2024 18:39:40</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricalRankingController.cs"> <File Include="Controllers/api/GetElectricalRankingController.cs">
<publishTime>01/30/2024 14:08:39</publishTime> <publishTime>01/30/2024 14:08:39</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricEquipmentController.cs"> <File Include="Controllers/api/GetElectricEquipmentController.cs">
<publishTime>01/30/2024 15:12:00</publishTime> <publishTime>01/31/2024 16:39:57</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricityConsumptionController.cs"> <File Include="Controllers/api/GetElectricityConsumptionController.cs">
<publishTime>01/31/2024 15:59:26</publishTime> <publishTime>02/01/2024 10:01:29</publishTime>
</File> </File>
<File Include="Controllers/api/GetElectricQuantityController.cs"> <File Include="Controllers/api/GetElectricQuantityController.cs">
<publishTime>01/31/2024 13:38:45</publishTime> <publishTime>02/01/2024 10:02:20</publishTime>
</File> </File>
<File Include="Controllers/api/GetEnergyTrendsController.cs"> <File Include="Controllers/api/GetEnergyTrendsController.cs">
<publishTime>01/31/2024 13:38:45</publishTime> <publishTime>02/01/2024 10:03:02</publishTime>
</File> </File>
<File Include="Controllers/api/GetEquipmentMonitoringController.cs"> <File Include="Controllers/api/GetEquipmentMonitoringController.cs">
<publishTime>01/30/2024 16:43:36</publishTime> <publishTime>01/31/2024 18:14:26</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>
@ -466,16 +466,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/11/2024 13:37:00</publishTime> <publishTime>01/11/2024 13:37:00</publishTime>
</File> </File>
<File Include="Controllers/api/GetGasConsumptionController.cs"> <File Include="Controllers/api/GetGasConsumptionController.cs">
<publishTime>01/31/2024 13:38:45</publishTime> <publishTime>02/01/2024 10:03:47</publishTime>
</File> </File>
<File Include="Controllers/api/GetGeneralCatalogueController.cs"> <File Include="Controllers/api/GetGeneralCatalogueController.cs">
<publishTime>01/24/2024 17:21:00</publishTime> <publishTime>01/24/2024 17:21:00</publishTime>
</File> </File>
<File Include="Controllers/api/GetIlluminationLoadController.cs"> <File Include="Controllers/api/GetIlluminationLoadController.cs">
<publishTime>01/31/2024 13:36:10</publishTime> <publishTime>02/01/2024 10:04:57</publishTime>
</File> </File>
<File Include="Controllers/api/GetLightingLoadController.cs"> <File Include="Controllers/api/GetLightingLoadController.cs">
<publishTime>01/31/2024 13:38:45</publishTime> <publishTime>02/01/2024 10:10:27</publishTime>
</File> </File>
<File Include="Controllers/api/GetLightingMonitoringController.cs"> <File Include="Controllers/api/GetLightingMonitoringController.cs">
<publishTime>01/10/2024 16:58:07</publishTime> <publishTime>01/10/2024 16:58:07</publishTime>
@ -487,16 +487,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/30/2024 17:36:42</publishTime> <publishTime>01/30/2024 17:36:42</publishTime>
</File> </File>
<File Include="Controllers/api/GetPowerLoadController.cs"> <File Include="Controllers/api/GetPowerLoadController.cs">
<publishTime>01/31/2024 13:38:45</publishTime> <publishTime>02/01/2024 10:06:37</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeDataController.cs"> <File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>01/30/2024 09:43:45</publishTime> <publishTime>01/31/2024 18:22:15</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeLoadController.cs"> <File Include="Controllers/api/GetRealtimeLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime> <publishTime>01/09/2024 17:02:14</publishTime>
</File> </File>
<File Include="Controllers/api/GetRoomElectricityController.cs"> <File Include="Controllers/api/GetRoomElectricityController.cs">
<publishTime>01/31/2024 13:34:44</publishTime> <publishTime>02/01/2024 10:08:52</publishTime>
</File> </File>
<File Include="Controllers/api/GetRunningStatusController.cs"> <File Include="Controllers/api/GetRunningStatusController.cs">
<publishTime>01/30/2024 17:33:34</publishTime> <publishTime>01/30/2024 17:33:34</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.

2
DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
d9ea997d3ff3557d0aa57072d033b88686537157 6dd66ccb40f501fe19d1c9c146e1abf6c1d24609

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

Binary file not shown.

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

Binary file not shown.

670
Security/ServiceSecurity.cs
View File

@ -34,7 +34,7 @@ namespace Security
static DataServer.BLL.meteorological_station bll_meteorological =new DataServer.BLL.meteorological_station(); static DataServer.BLL.meteorological_station bll_meteorological =new DataServer.BLL.meteorological_station();
static DataServer.BLL.device_state bll_state=new DataServer.BLL.device_state(); static DataServer.BLL.device_state bll_state=new DataServer.BLL.device_state();
static DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info(); static DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
//static DataServer.BLL.device_host bll_host=new DataServer.BLL.device_host(); static DataServer.BLL.device_host bll_host=new DataServer.BLL.device_host();
public ServiceSecurity() public ServiceSecurity()
{ {
InitializeComponent(); InitializeComponent();
@ -5716,284 +5716,426 @@ namespace Security
} }
} }
////设备参数 ////设备参数
//if (topic.Contains("/ce5a0665-b5eb-4e75-a6a5-799449c3f092")) if (topic.Contains("/ce5a0665-b5eb-4e75-a6a5-799449c3f092"))
//{ {
// log.Info("设备参数msg" + msg); log.Info("设备参数msg" + msg);
// //设备参数 //设备参数
// var j = msg.Substring(1); var j = msg.Substring(1);
// var data = JsonConvert.DeserializeObject<DataServer.api.get_data_state>(j); var data = JsonConvert.DeserializeObject<DataServer.api.get_data_state>(j);
// log.Info("设备参数:" + data); log.Info("设备参数:" + data);
// if (data.b != null) if (data.b != null)
// { {
// foreach (var item in data.b.dvl) foreach (var item in data.b.dvl)
// { {
// var name = ""; var name = "";
// char delimiter = '.'; // 分隔符 char delimiter = '.'; // 分隔符
// int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置 int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置
// if (lastDotIndex != -1) // 如果找到分隔符 if (lastDotIndex != -1) // 如果找到分隔符
// { {
// name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串 name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串
// } }
// var now = DateTime.Now; var now = DateTime.Now;
// var edate = Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:00:00")); var edate = Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:00:00"));
// var alist = bll_state.GetModelList("").Where(x => x.EntireTime == edate).ToList(); var alist = bll_state.GetModelList("").Where(x => x.EntireTime == edate).ToList();
// if (alist.Count == 0) if (alist.Count == 0)
// { {
// if (name == "1") if (name == "1")
// { {
// if (item.dl.ContainsKey("1号压缩机当前容量")) if (item.dl.ContainsKey("1号压缩机当前容量"))
// { {
// var hmodel = new DataServer.Model.device_host();
// hmodel.HostId = Guid.NewGuid().ToString("N");
// hmodel.HostName = "一号主机";
// hmodel.DeviceName = "1号压缩机当前容量";
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 var hmodel = new DataServer.Model.device_host();
// { hmodel.HostId = Guid.NewGuid().ToString("N");
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); hmodel.HostName = "一号主机";
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 hmodel.DeviceName = "1号压缩机当前容量";
// //smodel.DeviceOneState = number; int number;
// } var stringnumber = item.dl["1号压缩机当前容量"];
// else char delimiters = ':'; // 分隔符
// { int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// var num = Convert.ToInt32(stringnumber);
// // smodel.DeviceOneState = num;
// }
// }
// if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// {
// var hmodel = new DataServer.Model.device_host();
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num; // smodel.DeviceOneState = num;
// } }
// } }
// } if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// if (name == "2") {
// { var hmodel = new DataServer.Model.device_host();
// //状态 hmodel.HostId = Guid.NewGuid().ToString("N");
// smodel.DeviceId = Guid.NewGuid().ToString("N"); hmodel.HostName = "一号主机";
// smodel.DeviceName = "二号主机"; hmodel.DeviceName = "1号压缩机主机运行状态";
// if (item.dl.ContainsKey("1号压缩机主机运行状态")) int number;
// { var stringnumber = item.dl["1号压缩机主机运行状态"];
// int number; char delimiters = ':'; // 分隔符
// var stringnumber = item.dl["1号压缩机主机运行状态"]; int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num; // smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("2号压缩机主机运行状态")) if (item.dl.ContainsKey("2号压缩机当前容量"))
// { {
// int number; var hmodel = new DataServer.Model.device_host();
// var stringnumber = item.dl["2号压缩机主机运行状态"]; hmodel.HostId = Guid.NewGuid().ToString("N");
// char delimiters = ':'; // 分隔符 hmodel.HostName = "一号主机";
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 hmodel.DeviceName = "2号压缩机当前容量";
int number;
var stringnumber = item.dl["2号压缩机当前容量"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num; // smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("3号压缩机主机运行状态")) if (item.dl.ContainsKey("2号压缩机主机运行状态"))
// { {
// int number; var hmodel = new DataServer.Model.device_host();
// var stringnumber = item.dl["3号压缩机主机运行状态"]; hmodel.HostId = Guid.NewGuid().ToString("N");
// char delimiters = ':'; // 分隔符 hmodel.HostName = "一号主机";
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 hmodel.DeviceName = "2号压缩机主机运行状态";
int number;
var stringnumber = item.dl["2号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num; // smodel.DeviceOneState = num;
// } }
// } }
// smodel.CreateTime = DateTime.Now; if (item.dl.ContainsKey("3号压缩机当前容量"))
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); {
// bll_state.Add(smodel); var hmodel = new DataServer.Model.device_host();
// } hmodel.HostId = Guid.NewGuid().ToString("N");
// if (name == "3") hmodel.HostName = "一号主机";
// { hmodel.DeviceName = "3号压缩机当前容量";
// //状态 int number;
// smodel.DeviceId = Guid.NewGuid().ToString("N"); var stringnumber = item.dl["3号压缩机当前容量"];
// smodel.DeviceName = "三号主机"; char delimiters = ':'; // 分隔符
// if (item.dl.ContainsKey("1号压缩机主机运行状态")) int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// {
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num; // smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("2号压缩机主机运行状态")) if (item.dl.ContainsKey("3号压缩机主机运行状态"))
// { {
// int number; var hmodel = new DataServer.Model.device_host();
// var stringnumber = item.dl["2号压缩机主机运行状态"]; hmodel.HostId = Guid.NewGuid().ToString("N");
// char delimiters = ':'; // 分隔符 hmodel.HostName = "一号主机";
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 hmodel.DeviceName = "3号压缩机主机运行状态";
int number;
var stringnumber = item.dl["3号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num; // smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("3号压缩机主机运行状态")) if (item.dl.ContainsKey("本地远程指示，0本地，1远程"))
// { {
// int number; var hmodel = new DataServer.Model.device_host();
// var stringnumber = item.dl["3号压缩机主机运行状态"]; hmodel.HostId = Guid.NewGuid().ToString("N");
// char delimiters = ':'; // 分隔符 hmodel.HostName = "一号主机";
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 hmodel.DeviceName = "本地远程指示，0本地，1远程";
int number;
var stringnumber = item.dl["本地远程指示，0本地，1远程"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num; // smodel.DeviceOneState = num;
// } }
// } }
// smodel.CreateTime = DateTime.Now; if (item.dl.ContainsKey("电源电源，单位V"))
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); {
// bll_state.Add(smodel); var hmodel = new DataServer.Model.device_host();
// } hmodel.HostId = Guid.NewGuid().ToString("N");
// if (name == "4") hmodel.HostName = "一号主机";
// { hmodel.DeviceName = "电源电源，单位V";
// //状态 int number;
// smodel.DeviceId = Guid.NewGuid().ToString("N"); var stringnumber = item.dl["电源电源，单位V"];
// smodel.DeviceName = "四号主机"; char delimiters = ':'; // 分隔符
// if (item.dl.ContainsKey("1号压缩机主机运行状态")) int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// {
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number; //smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num; // smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("2号压缩机主机运行状态")) }
// { if (name == "2")
// int number; {
// var stringnumber = item.dl["2号压缩机主机运行状态"]; //状态
// char delimiters = ':'; // 分隔符 smodel.DeviceId = Guid.NewGuid().ToString("N");
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 smodel.DeviceName = "二号主机";
if (item.dl.ContainsKey("1号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["1号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number; smodel.DeviceOneState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num; smodel.DeviceOneState = num;
// } }
// } }
// if (item.dl.ContainsKey("3号压缩机主机运行状态")) if (item.dl.ContainsKey("2号压缩机主机运行状态"))
// { {
// int number; int number;
// var stringnumber = item.dl["3号压缩机主机运行状态"]; var stringnumber = item.dl["2号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符 char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置 int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符 if (lastDotIndexs != -1) // 如果找到分隔符
// { {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1); var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number; smodel.DeviceTwoState = number;
// } }
// else else
// { {
// var num = Convert.ToInt32(stringnumber); var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num; smodel.DeviceTwoState = num;
// } }
// } }
// smodel.CreateTime = DateTime.Now; if (item.dl.ContainsKey("3号压缩机主机运行状态"))
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); {
// bll_state.Add(smodel); int number;
// } var stringnumber = item.dl["3号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
// } int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// } if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceThreeState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceThreeState = num;
}
}
smodel.CreateTime = DateTime.Now;
smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
bll_state.Add(smodel);
}
if (name == "3")
{
//状态
smodel.DeviceId = Guid.NewGuid().ToString("N");
smodel.DeviceName = "三号主机";
if (item.dl.ContainsKey("1号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["1号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceOneState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceOneState = num;
}
}
if (item.dl.ContainsKey("2号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["2号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceTwoState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceTwoState = num;
}
}
if (item.dl.ContainsKey("3号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["3号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceThreeState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceThreeState = num;
}
}
smodel.CreateTime = DateTime.Now;
smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
bll_state.Add(smodel);
}
if (name == "4")
{
//状态
smodel.DeviceId = Guid.NewGuid().ToString("N");
smodel.DeviceName = "四号主机";
if (item.dl.ContainsKey("1号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["1号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceOneState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceOneState = num;
}
}
if (item.dl.ContainsKey("2号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["2号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceTwoState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceTwoState = num;
}
}
if (item.dl.ContainsKey("3号压缩机主机运行状态"))
{
int number;
var stringnumber = item.dl["3号压缩机主机运行状态"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
{
var num = stringnumber.Substring(lastDotIndexs + 1, 1);
number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
smodel.DeviceThreeState = number;
}
else
{
var num = Convert.ToInt32(stringnumber);
smodel.DeviceThreeState = num;
}
}
smodel.CreateTime = DateTime.Now;
smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
bll_state.Add(smodel);
}
}
}
// } }
//} }
} }
catch (Exception ex) catch (Exception ex)
{ {

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>aoc88+8FY3klsP2A/z6KMToSWOQIttHrHP8rOil7WM4=</dsig:DigestValue> <dsig:DigestValue>M35gbFM7GTDeHhYLvOzYTJUnd8unscXCkE14yPNwwH4=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

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

@ -42,14 +42,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="162304"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="163328">
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="DataServer" 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>Mxmk0J80etfRN6I7K6yBoXL0FSF/sshPcFmgRYVeTyQ=</dsig:DigestValue> <dsig:DigestValue>9km1gcVNWyjli/FvSB8HY8mLmhv1NJdJJyNVFTY36dU=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

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>aoc88+8FY3klsP2A/z6KMToSWOQIttHrHP8rOil7WM4=</dsig:DigestValue> <dsig:DigestValue>M35gbFM7GTDeHhYLvOzYTJUnd8unscXCkE14yPNwwH4=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

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

@ -42,14 +42,14 @@
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency> <dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="162304"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="163328">
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <assemblyIdentity name="DataServer" 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>Mxmk0J80etfRN6I7K6yBoXL0FSF/sshPcFmgRYVeTyQ=</dsig:DigestValue> <dsig:DigestValue>9km1gcVNWyjli/FvSB8HY8mLmhv1NJdJJyNVFTY36dU=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>