diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/010f088c-801a-45c6-8568-39ab089b689d.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/010f088c-801a-45c6-8568-39ab089b689d.vsidx
deleted file mode 100644
index 395c73e..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/010f088c-801a-45c6-8568-39ab089b689d.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx
new file mode 100644
index 0000000..06182b0
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx
new file mode 100644
index 0000000..e62b4be
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a68a75c0-2941-4751-8b8b-a63d5fca77d3.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx
similarity index 99%
rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/a68a75c0-2941-4751-8b8b-a63d5fca77d3.vsidx
rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx
index b8619fd..0957a89 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a68a75c0-2941-4751-8b8b-a63d5fca77d3.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx
new file mode 100644
index 0000000..bd6adac
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/aab3e858-766e-44cc-9168-e5f9f809231b.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/aab3e858-766e-44cc-9168-e5f9f809231b.vsidx
deleted file mode 100644
index 9f2d700..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/aab3e858-766e-44cc-9168-e5f9f809231b.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d186fa33-fbae-4ed2-8686-79b58a6532ca.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d186fa33-fbae-4ed2-8686-79b58a6532ca.vsidx
deleted file mode 100644
index 0a08528..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d186fa33-fbae-4ed2-8686-79b58a6532ca.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo
index fccde46..ddabca0 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt
index 6b6fd0f..0975177 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt and b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt differ
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
index 1458d17..96e347a 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
@@ -35,7 +35,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data=new List<airconditioning_loadData>();
- var list = bll.GetModelListDate(" DeviceName like '%空调%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%空调%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 1; i < time_count; i++)
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
index cb63ba9..ce42f38 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
@@ -51,23 +51,23 @@ namespace LonglslandExhibitionCenter.Controllers.api
var adata = new List<carbon_flux>();
#region 空调
var model1 = new carbon_flux();
- var salist = list.Where(x => x.DeviceName.Contains("空调")&&x.EntireTime==sdate);
- var ealist = list.Where(x => x.DeviceName.Contains("空调") && x.EntireTime == edate);
+ var salist = list.Where(x => x.Reserve2.Contains("空调")&&x.EntireTime==sdate);
+ var ealist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == edate);
model1.AirConditioner = Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x=>x.EH) - ealist.Sum(x=>x.EH)) / 1000 * 0.5703, 3));
#endregion
#region 照明
- var sblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == sdate);
- var eblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == edate);
+ var sblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == sdate);
+ var eblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == edate);
model1.Lighting = Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH)) / 1000 * 0.5703, 3) );
#endregion
#region 电梯
- var sclist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == sdate);
- var eclist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == edate);
+ var sclist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == sdate);
+ var eclist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == edate);
model1.Elevator = Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x => x.EH) - eclist.Sum(x => x.EH)) / 1000 * 0.5703, 3) );
#endregion
#region 其它
- var selist = list.Where(x =>!x.DeviceName.Contains("空调")&&!x.DeviceName.Contains("照明")&&! x.DeviceName.Contains("电梯") && x.EntireTime == sdate);
- var eelist = list.Where(x => !x.DeviceName.Contains("空调") &&! x.DeviceName.Contains("照明") && x.DeviceName.Contains("电梯") && x.EntireTime == edate);
+ var selist = list.Where(x =>!x.Reserve2.Contains("空调")&&!x.Reserve2.Contains("照明")&&! x.Reserve2.Contains("电梯") && x.EntireTime == sdate);
+ var eelist = list.Where(x => !x.Reserve2.Contains("空调") &&! x.Reserve2.Contains("照明") && x.Reserve2.Contains("电梯") && x.EntireTime == edate);
model1.Other = Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x => x.EH) - eelist.Sum(x => x.EH)) / 1000 * 0.5703, 3));
adata.Add(model1);
#endregion
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
index b516326..f043ee4 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List<airconditioning_loadData>();
- var list = bll.GetModelListDate(" DeviceName like '%展陈%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%展陈%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
for (int i = 1; i < time_count; i++)
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
index 172d945..a908b5d 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
@@ -101,8 +101,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%空调%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && DeviceName like '%空调%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%空调%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%空调%'", etime);
anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
}
@@ -110,8 +110,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%空调%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && DeviceName like '%空调%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%空调%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%空调%'", etime);
bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
amodel.AirConditioner = anum + bnum;
@@ -129,8 +129,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%照明%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && DeviceName like '%照明%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%照明%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%照明%'", etime);
anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
}
@@ -138,8 +138,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%照明%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && DeviceName like '%照明%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%照明%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%照明%'", etime);
bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
amodel.Illumination = anum + bnum;
@@ -157,8 +157,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(edate).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
eedate = Convert.ToDateTime(edate).AddDays(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%电梯%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && DeviceName like '%电梯%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%电梯%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate + "' && Reserve2 like '%电梯%'", etime);
anum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
}
@@ -166,8 +166,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sedate = Convert.ToDateTime(eedate).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var eedate1 = Convert.ToDateTime(eedate).AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH;00:00");
- var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && DeviceName like '%电梯%'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && DeviceName like '%电梯%'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sedate + "' && Reserve2 like '%电梯%'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%电梯%'", etime);
bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
}
amodel.Elevator = anum + bnum;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
index f6b5d35..498c5c3 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
@@ -44,8 +44,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
- var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)&&x.DeviceName.Contains("照明")).ToList();
- var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate) && x.DeviceName.Contains("照明")).ToList();
+ var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)&&x.Reserve2.Contains("照明")).ToList();
+ var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = Convert.ToDateTime(sdate).ToString("HH:00"),
@@ -71,8 +71,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
bll.CreateTable(ytime);
}
var list1 = bll.GetModelListDate("", ytime);
- var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(tsdate) && x.EntireTime < Convert.ToDateTime(tedate) && x.DeviceName.Contains("照明")).ToList();
- var blist= list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.DeviceName.Contains("照明")).ToList();
+ var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(tsdate) && x.EntireTime < Convert.ToDateTime(tedate) && x.Reserve2.Contains("照明")).ToList();
+ var blist= list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = now.AddDays(-i).ToString("MM-dd"),
@@ -107,8 +107,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
bll.CreateTable(ystime);
}
- var tslist = bll.GetModelListDate(" DeviceName like '%照明%'", tstime);
- var yslist = bll.GetModelListDate(" DeviceName like '%照明%'", ystime);
+ var tslist = bll.GetModelListDate(" Reserve2 like '%照明%'", tstime);
+ var yslist = bll.GetModelListDate(" Reserve2 like '%照明%'", ystime);
#endregion
var model = new lighting_loadData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
index cc72938..bfee148 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
@@ -36,13 +36,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<='" + edate + "'", time);
//一级
- var alist = list.Where(x=>x.Reserve1== "配电室低压").ToList();
+ var alist = list.Where(x=>x.Reserve2.Contains("梯")).ToList();
decimal? num1 = alist.Sum(x => x.P);
//二级
- var blist = list.Where(x => x.Reserve1 == "配电室高压").ToList();
+ var blist = list.Where(x => x.Reserve2.Contains("潜污泵")).ToList();
decimal? num2 = blist.Sum(x => x.P);
//三级
- var clist = list.Where(x => x.Reserve1 == "电能-室外箱变").ToList();
+ var clist = list.Where(x =>!x.Reserve2.Contains("梯")||!x.Reserve2.Contains("潜污泵")).ToList();
decimal? num3 = clist.Sum(x => x.P);
var model = new load_classifcationData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs
index 4d33797..29f17f5 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs
@@ -33,18 +33,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
var model = new meteorological_stationData();
model.name = item.MeteorologicalName;
model.value = Convert.ToString(item.MeteorologicalValue);
- if (model.name == "风速")
- {
- model.value = item.MeteorologicalValue+"m/s";
- }
- if (model.name == "光照度")
- {
- model.value = item.MeteorologicalValue + "lux";
- }
- if(model.name== "空气质量")
- {
- model.value = item.MeteorologicalValue + "ug/m3";
- }
data.Add(model);
}
res.code = 200;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
index cd404f2..fd1f7bd 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List<pavilion_lightingData>();
- var list = bll.GetModelListDate(" DeviceName like '%照明%'",time);
+ var list = bll.GetModelListDate(" Reserve2 like '%照明%'", time);
var now=DateTime.Now;
var sdate = now.ToString("yyyy-MM-dd 00:00:00");
var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
index ad6744e..dcf714f 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
@@ -38,7 +38,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var now = DateTime.Now;
if (name == "空调")
{
- var list = bll.GetModelListDate(" DeviceName like '%空调%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%空调%'", time);
#region 峰值
decimal? anum=0;
var time_count = Convert.ToInt32(now.Hour);
@@ -96,19 +96,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime1);
}
- var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && DeviceName like '%空调%'", jtime1);
+ var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && Reserve2 like '%空调%'", jtime1);
var b1 = bll.IsExistsTable(date_base, "electricity_data_" + stime1);
if (b1 == false)
{
bll.CreateTable(stime1);
}
- var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && DeviceName like '%空调%'", stime1);
+ var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && Reserve2 like '%空调%'", stime1);
var q1= bll.IsExistsTable(date_base, "electricity_data_" + qtime1);
if (q1 == false)
{
bll.CreateTable(qtime1);
}
- var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && DeviceName like '%空调%'", qtime1);
+ var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && Reserve2 like '%空调%'", qtime1);
var jnum1 = jlist1.Sum(x => x.EH);
var snum1 = slist1.Sum(x => x.EH);
var qnum1 = qlist1.Sum(x => x.EH);
@@ -159,19 +159,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime2);
}
- var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%空调%'", jtime2);
+ var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%空调%'", jtime2);
var b2 = bll.IsExistsTable(date_base, "electricity_data_" + stime2);
if (b2 == false)
{
bll.CreateTable(stime2);
}
- var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && DeviceName like '%空调%'", stime2);
+ var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && Reserve2 like '%空调%'", stime2);
var q2 = bll.IsExistsTable(date_base, "electricity_data_" + qtime2);
if (q2 == false)
{
bll.CreateTable(qtime2);
}
- var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && DeviceName like '%空调%'", qtime2);
+ var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && Reserve2 like '%空调%'", qtime2);
var jnum2 = jlist2.Sum(x => x.EH);
var snum2 = slist2.Sum(x => x.EH);
var qnum2 = qlist2.Sum(x => x.EH);
@@ -224,19 +224,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%空调%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%空调%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && DeviceName like '%空调%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%空调%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && DeviceName like '%空调%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%空调%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
@@ -280,7 +280,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
if (name == "照明")
{
- var list = bll.GetModelListDate(" DeviceName like '%照明%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%照明%'", time);
#region 峰值
decimal? anum = 0;
var time_count = Convert.ToInt32(now.Hour);
@@ -338,19 +338,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime1);
}
- var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && DeviceName like '%照明%'", jtime1);
+ var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && Reserve2 like '%照明%'", jtime1);
var b1 = bll.IsExistsTable(date_base, "electricity_data_" + stime1);
if (b1 == false)
{
bll.CreateTable(stime1);
}
- var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && DeviceName like '%照明%'", stime1);
+ var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && Reserve2 like '%照明%'", stime1);
var q1 = bll.IsExistsTable(date_base, "electricity_data_" + qtime1);
if (q1 == false)
{
bll.CreateTable(qtime1);
}
- var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && DeviceName like '%照明%'", qtime1);
+ var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && Reserve2 like '%照明%'", qtime1);
var jnum1 = jlist1.Sum(x => x.EH);
var snum1 = slist1.Sum(x => x.EH);
var qnum1 = qlist1.Sum(x => x.EH);
@@ -401,19 +401,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime2);
}
- var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%照明%'", jtime2);
+ var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%照明%'", jtime2);
var b2 = bll.IsExistsTable(date_base, "electricity_data_" + stime2);
if (b2 == false)
{
bll.CreateTable(stime2);
}
- var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && DeviceName like '%照明%'", stime2);
+ var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && Reserve2 like '%照明%'", stime2);
var q2 = bll.IsExistsTable(date_base, "electricity_data_" + qtime2);
if (q2 == false)
{
bll.CreateTable(qtime2);
}
- var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && DeviceName like '%照明%'", qtime2);
+ var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && Reserve2 like '%照明%'", qtime2);
var jnum2 = jlist2.Sum(x => x.EH);
var snum2 = slist2.Sum(x => x.EH);
var qnum2 = qlist2.Sum(x => x.EH);
@@ -466,19 +466,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%照明%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%照明%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && DeviceName like '%照明%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%照明%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && DeviceName like '%照明%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%照明%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
@@ -522,7 +522,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
if (name == "展陈")
{
- var list = bll.GetModelListDate(" DeviceName like '%展陈%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%展陈%'", time);
#region 峰值
decimal? anum = 0;
var time_count = Convert.ToInt32(now.Hour);
@@ -580,19 +580,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime1);
}
- var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && DeviceName like '%展陈%'", jtime1);
+ var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && Reserve2 like '%展陈%'", jtime1);
var b1 = bll.IsExistsTable(date_base, "electricity_data_" + stime1);
if (b1 == false)
{
bll.CreateTable(stime1);
}
- var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && DeviceName like '%展陈%'", stime1);
+ var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && Reserve2 like '%展陈%'", stime1);
var q1 = bll.IsExistsTable(date_base, "electricity_data_" + qtime1);
if (q1 == false)
{
bll.CreateTable(qtime1);
}
- var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && DeviceName like '%展陈%'", qtime1);
+ var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && Reserve2 like '%展陈%'", qtime1);
var jnum1 = jlist1.Sum(x => x.EH);
var snum1 = slist1.Sum(x => x.EH);
var qnum1 = qlist1.Sum(x => x.EH);
@@ -643,19 +643,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime2);
}
- var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%展陈%'", jtime2);
+ var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%展陈%'", jtime2);
var b2 = bll.IsExistsTable(date_base, "electricity_data_" + stime2);
if (b2 == false)
{
bll.CreateTable(stime2);
}
- var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && DeviceName like '%展陈%'", stime2);
+ var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && Reserve2 like '%展陈%'", stime2);
var q2 = bll.IsExistsTable(date_base, "electricity_data_" + qtime2);
if (q2 == false)
{
bll.CreateTable(qtime2);
}
- var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && DeviceName like '%展陈%'", qtime2);
+ var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && Reserve2 like '%展陈%'", qtime2);
var jnum2 = jlist2.Sum(x => x.EH);
var snum2 = slist2.Sum(x => x.EH);
var qnum2 = qlist2.Sum(x => x.EH);
@@ -708,19 +708,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%展陈%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%展陈%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && DeviceName like '%展陈%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%展陈%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && DeviceName like '%展陈%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%展陈%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
@@ -764,7 +764,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
if (name == "消防")
{
- var list = bll.GetModelListDate(" DeviceName like '%消防%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%消防%'", time);
#region 峰值
decimal? anum = 0;
var time_count = Convert.ToInt32(now.Hour);
@@ -822,19 +822,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime1);
}
- var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && DeviceName like '%消防%'", jtime1);
+ var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && Reserve2 like '%消防%'", jtime1);
var b1 = bll.IsExistsTable(date_base, "electricity_data_" + stime1);
if (b1 == false)
{
bll.CreateTable(stime1);
}
- var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && DeviceName like '%消防%'", stime1);
+ var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && Reserve2 like '%消防%'", stime1);
var q1 = bll.IsExistsTable(date_base, "electricity_data_" + qtime1);
if (q1 == false)
{
bll.CreateTable(qtime1);
}
- var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && DeviceName like '%消防%'", qtime1);
+ var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && Reserve2 like '%消防%'", qtime1);
var jnum1 = jlist1.Sum(x => x.EH);
var snum1 = slist1.Sum(x => x.EH);
var qnum1 = qlist1.Sum(x => x.EH);
@@ -885,19 +885,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime2);
}
- var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%消防%'", jtime2);
+ var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%消防%'", jtime2);
var b2 = bll.IsExistsTable(date_base, "electricity_data_" + stime2);
if (b2 == false)
{
bll.CreateTable(stime2);
}
- var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && DeviceName like '%消防%'", stime2);
+ var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && Reserve2 like '%消防%'", stime2);
var q2 = bll.IsExistsTable(date_base, "electricity_data_" + qtime2);
if (q2 == false)
{
bll.CreateTable(qtime2);
}
- var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && DeviceName like '%消防%'", qtime2);
+ var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && Reserve2 like '%消防%'", qtime2);
var jnum2 = jlist2.Sum(x => x.EH);
var snum2 = slist2.Sum(x => x.EH);
var qnum2 = qlist2.Sum(x => x.EH);
@@ -950,19 +950,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%消防%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%消防%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && DeviceName like '%消防%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%消防%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && DeviceName like '%消防%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%消防%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
@@ -1006,7 +1006,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
if (name == "电梯")
{
- var list = bll.GetModelListDate(" DeviceName like '%电梯%'", time);
+ var list = bll.GetModelListDate(" Reserve2 like '%梯%'", time);
#region 峰值
decimal? anum = 0;
var time_count = Convert.ToInt32(now.Hour);
@@ -1064,19 +1064,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime1);
}
- var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && DeviceName like '%电梯%'", jtime1);
+ var jlist1 = bll.GetModelListDate(" EntireTime='" + jdate1 + "' && Reserve2 like '%梯%'", jtime1);
var b1 = bll.IsExistsTable(date_base, "electricity_data_" + stime1);
if (b1 == false)
{
bll.CreateTable(stime1);
}
- var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && DeviceName like '%电梯%'", stime1);
+ var slist1 = bll.GetModelListDate(" EntireTime='" + sdate1 + "' && Reserve2 like '%梯%'", stime1);
var q1 = bll.IsExistsTable(date_base, "electricity_data_" + qtime1);
if (q1 == false)
{
bll.CreateTable(qtime1);
}
- var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && DeviceName like '%电梯%'", qtime1);
+ var qlist1 = bll.GetModelListDate(" EntireTime='" + qdate1 + "' && Reserve2 like '%梯%'", qtime1);
var jnum1 = jlist1.Sum(x => x.EH);
var snum1 = slist1.Sum(x => x.EH);
var qnum1 = qlist1.Sum(x => x.EH);
@@ -1127,19 +1127,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime2);
}
- var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%电梯%'", jtime2);
+ var jlist2 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%梯%'", jtime2);
var b2 = bll.IsExistsTable(date_base, "electricity_data_" + stime2);
if (b2 == false)
{
bll.CreateTable(stime2);
}
- var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && DeviceName like '%电梯%'", stime2);
+ var slist2 = bll.GetModelListDate(" EntireTime='" + sdate2 + "' && Reserve2 like '%梯%'", stime2);
var q2 = bll.IsExistsTable(date_base, "electricity_data_" + qtime2);
if (q2 == false)
{
bll.CreateTable(qtime2);
}
- var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && DeviceName like '%电梯%'", qtime2);
+ var qlist2 = bll.GetModelListDate(" EntireTime='" + qdate2 + "' && Reserve2 like '%梯%'", qtime2);
var jnum2 = jlist2.Sum(x => x.EH);
var snum2 = slist2.Sum(x => x.EH);
var qnum2 = qlist2.Sum(x => x.EH);
@@ -1192,19 +1192,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && DeviceName like '%电梯%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%电梯%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && DeviceName like '%电梯%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%电梯%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && DeviceName like '%电梯%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%电梯%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
index 6038f53..47146f1 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
@@ -37,16 +37,16 @@ namespace LonglslandExhibitionCenter.Controllers.api
var list = bll.GetModelListDate("", time);
var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
- var salist = list.Where(x => x.DeviceName.Contains("空调") && x.EntireTime == sdate).ToList();
- var sblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == sdate).ToList();
- var sclist = list.Where(x => x.DeviceName.Contains("消防") && x.EntireTime == sdate).ToList();
- var selist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == sdate).ToList();
- var sflist = list.Where(x => x.DeviceName.Contains("展陈") && x.EntireTime == sdate).ToList();
- var ealist = list.Where(x => x.DeviceName.Contains("空调") && x.EntireTime == edate).ToList();
- var eblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == edate).ToList();
- var eclist = list.Where(x => x.DeviceName.Contains("消防") && x.EntireTime == edate).ToList();
- var eelist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == edate).ToList();
- var eflist = list.Where(x => x.DeviceName.Contains("展陈") && x.EntireTime == edate).ToList();
+ var salist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == sdate).ToList();
+ var sblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == sdate).ToList();
+ var sclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == sdate).ToList();
+ var selist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == sdate).ToList();
+ var sflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == sdate).ToList();
+ var ealist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == edate).ToList();
+ var eblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == edate).ToList();
+ var eclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == edate).ToList();
+ var eelist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == edate).ToList();
+ var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
var model1 = new system_purgeData();
model1.name = "空调系统";
model1.CarbonEmission =Convert.ToDecimal(Math.Round(Convert.ToDouble( salist.Sum(x => x.EH) - ealist.Sum(x => x.EH))/1000*0.5703,3));
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
index e9834d3..9625dc4 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
@@ -37,16 +37,16 @@ namespace LonglslandExhibitionCenter.Controllers.api
var list = bll.GetModelListDate("", time);
var sdate =Convert.ToDateTime( DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate =Convert.ToDateTime( DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
- var salist = list.Where(x => x.DeviceName.Contains("空调") &&x.EntireTime==sdate).ToList();
- var sblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == sdate).ToList();
- var sclist = list.Where(x => x.DeviceName.Contains("消防") && x.EntireTime == sdate).ToList();
- var selist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == sdate).ToList();
- var sflist = list.Where(x => x.DeviceName.Contains("展陈") && x.EntireTime == sdate).ToList();
- var ealist = list.Where(x => x.DeviceName.Contains("空调") && x.EntireTime == edate).ToList();
- var eblist = list.Where(x => x.DeviceName.Contains("照明") && x.EntireTime == edate).ToList();
- var eclist = list.Where(x => x.DeviceName.Contains("消防") && x.EntireTime == edate).ToList();
- var eelist = list.Where(x => x.DeviceName.Contains("电梯") && x.EntireTime == edate).ToList();
- var eflist = list.Where(x => x.DeviceName.Contains("展陈") && x.EntireTime == edate).ToList();
+ var salist = list.Where(x => x.Reserve2.Contains("空调") &&x.EntireTime==sdate).ToList();
+ var sblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == sdate).ToList();
+ var sclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == sdate).ToList();
+ var selist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == sdate).ToList();
+ var sflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == sdate).ToList();
+ var ealist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == edate).ToList();
+ var eblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == edate).ToList();
+ var eclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == edate).ToList();
+ var eelist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == edate).ToList();
+ var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
var model1=new system_rankingData();
model1.name = "空调系统";
model1.EH = salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH);
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
index 16c8208..b1dae8e 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\林谷项目\长岛展览馆项目\后端\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
index b34c020..8f1ce89 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\林谷项目\长岛展览馆项目\发布文件</_PublishTargetUrl>
- <History>True|2024-03-04T06:37:08.7040845Z;True|2024-02-28T11:11:35.8506164+08:00;</History>
+ <History>True|2024-03-07T08:29:08.9381292Z;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@@ -88,10 +88,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>12/13/2023 14:16:07</publishTime>
</File>
<File Include="bin/LonglslandExhibitionCenter.dll">
- <publishTime>03/04/2024 14:37:07</publishTime>
+ <publishTime>03/07/2024 16:29:08</publishTime>
</File>
<File Include="bin/LonglslandExhibitionCenter.pdb">
- <publishTime>03/04/2024 14:37:07</publishTime>
+ <publishTime>03/07/2024 16:29:08</publishTime>
</File>
<File Include="bin/Maticsoft.Common.dll">
<publishTime>12/13/2023 14:16:06</publishTime>
@@ -352,7 +352,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/30/2024 18:21:25</publishTime>
</File>
<File Include="Controllers/api/GetAirconditioningLoadController.cs">
- <publishTime>02/28/2024 17:09:42</publishTime>
+ <publishTime>03/05/2024 14:08:23</publishTime>
</File>
<File Include="Controllers/api/GetBigScreenController.cs">
<publishTime>02/27/2024 17:31:07</publishTime>
@@ -364,7 +364,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/27/2024 15:21:00</publishTime>
</File>
<File Include="Controllers/api/GetCarbonFluxController.cs">
- <publishTime>02/22/2024 16:42:41</publishTime>
+ <publishTime>03/05/2024 14:24:07</publishTime>
</File>
<File Include="Controllers/api/GetCarbonIntensityController.cs">
<publishTime>02/26/2024 11:22:29</publishTime>
@@ -382,7 +382,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/21/2024 15:39:54</publishTime>
</File>
<File Include="Controllers/api/GetDisplayLoadController.cs">
- <publishTime>02/21/2024 15:39:54</publishTime>
+ <publishTime>03/05/2024 14:10:23</publishTime>
</File>
<File Include="Controllers/api/GetDrainHeadingController.cs">
<publishTime>02/28/2024 13:58:15</publishTime>
@@ -400,10 +400,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/27/2024 15:13:42</publishTime>
</File>
<File Include="Controllers/api/GetEnergyFlowController.cs">
- <publishTime>02/26/2024 16:21:14</publishTime>
+ <publishTime>03/05/2024 14:24:07</publishTime>
</File>
<File Include="Controllers/api/GetEnergyIndexingController.cs">
- <publishTime>02/26/2024 14:08:58</publishTime>
+ <publishTime>03/04/2024 14:52:19</publishTime>
</File>
<File Include="Controllers/api/GetFailureWarningController.cs">
<publishTime>02/28/2024 10:43:17</publishTime>
@@ -421,13 +421,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/28/2024 16:02:46</publishTime>
</File>
<File Include="Controllers/api/GetLightingLoadController.cs">
- <publishTime>02/23/2024 15:22:26</publishTime>
+ <publishTime>03/05/2024 14:12:48</publishTime>
</File>
<File Include="Controllers/api/GetLightingMonitoringController.cs">
<publishTime>02/23/2024 13:50:31</publishTime>
</File>
<File Include="Controllers/api/GetLoadClassificationController.cs">
- <publishTime>02/28/2024 17:06:12</publishTime>
+ <publishTime>03/05/2024 14:17:15</publishTime>
</File>
<File Include="Controllers/api/GetLoopRankingController.cs">
<publishTime>03/04/2024 14:14:25</publishTime>
@@ -436,7 +436,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/28/2024 10:45:48</publishTime>
</File>
<File Include="Controllers/api/GetMeteorologicalStationController.cs">
- <publishTime>02/22/2024 14:32:32</publishTime>
+ <publishTime>03/07/2024 16:27:52</publishTime>
</File>
<File Include="Controllers/api/GetMultiRateController.cs">
<publishTime>02/27/2024 10:46:37</publishTime>
@@ -445,7 +445,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/27/2024 17:42:23</publishTime>
</File>
<File Include="Controllers/api/GetPavilionLightingController.cs">
- <publishTime>02/23/2024 15:35:10</publishTime>
+ <publishTime>03/05/2024 14:24:07</publishTime>
</File>
<File Include="Controllers/api/GetPolicyEditingController.cs">
<publishTime>03/04/2024 11:29:09</publishTime>
@@ -460,16 +460,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/23/2024 16:36:55</publishTime>
</File>
<File Include="Controllers/api/GetSystemEnergyController.cs">
- <publishTime>02/27/2024 09:56:27</publishTime>
+ <publishTime>03/05/2024 14:24:04</publishTime>
</File>
<File Include="Controllers/api/GetSystemPurgeController.cs">
- <publishTime>02/23/2024 09:50:29</publishTime>
+ <publishTime>03/05/2024 14:26:31</publishTime>
</File>
<File Include="Controllers/api/GetSystemRankingController.cs">
- <publishTime>02/22/2024 15:26:42</publishTime>
+ <publishTime>03/05/2024 14:26:31</publishTime>
</File>
<File Include="Controllers/api/GetTotalEnergyController.cs">
- <publishTime>02/26/2024 13:44:56</publishTime>
+ <publishTime>03/04/2024 14:50:25</publishTime>
</File>
<File Include="Controllers/api/GetWaterDrainingController.cs">
<publishTime>02/27/2024 16:42:49</publishTime>
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll
index b6066e5..1330f5b 100644
Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb
index 0b69c39..e3ed1c2 100644
Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll
index b6066e5..0a3b13b 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb
index 0b69c39..323bf2b 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll
index 97c894f..1330f5b 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb
index 19f180e..e3ed1c2 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll
index 97c894f..1330f5b 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb
index 19f180e..e3ed1c2 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb differ
diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs
index 2c0bf05..81b6e3d 100644
--- a/Security/ServiceSecurity.cs
+++ b/Security/ServiceSecurity.cs
@@ -18,6 +18,7 @@ using System.Xml.Linq;
using System.Runtime.InteropServices;
using HslCommunication.DTU;
using System.Collections;
+using System.Data;
namespace Security
{
@@ -214,6 +215,7 @@ namespace Security
model.CreateTime = DateTime.Now;
model.EntireTime = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
model.Reserve1= svlist.Reserve1;
+ model.Reserve2= svlist.Reserve2;
bll.AddDate(model, date);
}
}
@@ -319,6 +321,7 @@ namespace Security
model.CreateTime = DateTime.Now;
model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model.Reserve1 = "配电室低压";
+ model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
bll.AddDate(model, date);
}
}
@@ -1523,7 +1526,94 @@ namespace Security
}
return list[code];
}
-
+ /// <summary>
+ /// 获取配电室分类
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public static string GetDeviceName4(int code)
+ {
+ var list = new Dictionary<int, string>();
+ list.Add(1, "普通照明");
+ list.Add(2, "展览用电");
+ list.Add(3, "展览用电");
+ list.Add(4, "展览用电");
+ list.Add(5, "展览用电");
+ list.Add(6, "夜景照明");
+ list.Add(7, "基站用电");
+ list.Add(8, "室分机房");
+ list.Add(9, "室分机房");
+ list.Add(10, "空调动力");
+ list.Add(11, "空调动力");
+ list.Add(12, "空调动力");
+ list.Add(13, "扶梯");
+ list.Add(14, "停车场");
+ list.Add(15, "普通电梯");
+ list.Add(16, "普通电梯");
+ list.Add(17, "货梯");
+ list.Add(18, "潜污泵");
+ list.Add(19, "弱电");
+ list.Add(20, "监控室");
+ list.Add(21, "消防控制室");
+ list.Add(22, "变配电室");
+ list.Add(23, "空调室外机");
+ list.Add(24, "展陈用电");
+ list.Add(25, "展陈用电");
+ list.Add(26, "展陈用电");
+ list.Add(27, "展陈用电");
+ list.Add(28, "展陈用电");
+ list.Add(29, "消防水泵房");
+ list.Add(30, "消防风机");
+ list.Add(31, "消防风机");
+ list.Add(32, "");
+ list.Add(33, "消防风机");
+ list.Add(34, "消防风机");
+ list.Add(35, "消防风机");
+ list.Add(36, "消防风机");
+ list.Add(37, "消防风机");
+ list.Add(38, "消防电梯");
+ list.Add(39, "负一层普通照明");
+ list.Add(40, "台球厅展览用电");
+ list.Add(41, "展览用电");
+ list.Add(42, "展览用电");
+ list.Add(43, "展览用电");
+ list.Add(44, "夜景照明");
+ list.Add(45, "基站用电");
+ list.Add(46, "室分机房");
+ list.Add(47, "室分机房");
+ list.Add(48, "空调动力");
+ list.Add(49, "空调动力");
+ list.Add(50, "空调动力");
+ list.Add(51, "普通电梯");
+ list.Add(52, "普通电梯");
+ list.Add(53, "货梯");
+ list.Add(54, "潜污泵");
+ list.Add(55, "弱电");
+ list.Add(56, "监控室");
+ list.Add(57, "消防控制室");
+ list.Add(58, "变配电室");
+ list.Add(59, "空调动力站");
+ list.Add(60, "电伴热");
+ list.Add(61, "景观用电");
+ list.Add(62, "展陈用电");
+ list.Add(63, "老海岛展陈用电");
+ list.Add(64, "喷泉");
+ list.Add(65, "消防水泵房");
+ list.Add(66, "消防风机");
+ list.Add(67, "消防风机");
+ list.Add(68, "");
+ list.Add(69, "消防风机");
+ list.Add(70, "消防风机");
+ list.Add(71, "消防风机");
+ list.Add(72, "消防风机");
+ list.Add(73, "消防风机");
+ list.Add(74, "消防电梯");
+ if (!list.ContainsKey(code))
+ {
+ return "未知";
+ }
+ return list[code];
+ }
}
public class IdName
{
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index 281d021..c4c0c8e 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>Qkn0LiTwj5mI0T5xfKrMQVBr9zl3MwEXfADHFcTPWWI=</dsig:DigestValue>
+ <dsig:DigestValue>twzBcuNTw8doKi+yt8Dcftn3tpRPyy8wXHPGyymirdU=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe
index 6b65490..2b4855f 100644
Binary files a/Security/bin/Debug/ServiceSecurity.exe and b/Security/bin/Debug/ServiceSecurity.exe differ
diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest
index 978dd7b..ab2bc81 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
- <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="40416">
+ <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="41952">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>pzjzyuffGLVWU8YCCRP3PySmpEQlhkwLEpS9+wldxJU=</dsig:DigestValue>
+ <dsig:DigestValue>PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb
index dfe0bcf..3dbc2b2 100644
Binary files a/Security/bin/Debug/ServiceSecurity.pdb and b/Security/bin/Debug/ServiceSecurity.pdb differ
diff --git a/Security/bin/Debug/app.publish/ServiceSecurity.exe b/Security/bin/Debug/app.publish/ServiceSecurity.exe
index 3e02691..6444bff 100644
Binary files a/Security/bin/Debug/app.publish/ServiceSecurity.exe and b/Security/bin/Debug/app.publish/ServiceSecurity.exe differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index 281d021..c4c0c8e 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>Qkn0LiTwj5mI0T5xfKrMQVBr9zl3MwEXfADHFcTPWWI=</dsig:DigestValue>
+ <dsig:DigestValue>twzBcuNTw8doKi+yt8Dcftn3tpRPyy8wXHPGyymirdU=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe
index 6b65490..2b4855f 100644
Binary files a/Security/obj/Debug/ServiceSecurity.exe and b/Security/obj/Debug/ServiceSecurity.exe differ
diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest
index 978dd7b..ab2bc81 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
- <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="40416">
+ <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="41952">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>pzjzyuffGLVWU8YCCRP3PySmpEQlhkwLEpS9+wldxJU=</dsig:DigestValue>
+ <dsig:DigestValue>PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb
index dfe0bcf..3dbc2b2 100644
Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ
diff --git a/Security/obj/Release/Security.csproj.AssemblyReference.cache b/Security/obj/Release/Security.csproj.AssemblyReference.cache
index 0e81b78..bd7b3e2 100644
Binary files a/Security/obj/Release/Security.csproj.AssemblyReference.cache and b/Security/obj/Release/Security.csproj.AssemblyReference.cache differ