diff --git a/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config b/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config
index ca18ff0..1caa87e 100644
--- a/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config
+++ b/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config
@@ -161,6 +161,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo
index 9d9336d..e0c91a0 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ
diff --git a/DataService/obj/Release/DataService.csproj.AssemblyReference.cache b/DataService/obj/Release/DataService.csproj.AssemblyReference.cache
index 3578f96..8c5c82c 100644
Binary files a/DataService/obj/Release/DataService.csproj.AssemblyReference.cache and b/DataService/obj/Release/DataService.csproj.AssemblyReference.cache differ
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
index 88f7a7e..b8e340c 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetAirconditioningLoadController.cs
@@ -37,7 +37,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var data=new List();
var list = bll.GetModelListDate(" Reserve2 like '%空调%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var date = DateTime.Now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(date)).ToList();
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
index 2aacfee..74a68db 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonEmissionController.cs
@@ -50,17 +50,17 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_emissionData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
- CarbonEmission =Convert.ToDecimal( Math.Round(Convert.ToDouble(num1 - num2)/1000* 0.5703,3))
+ CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2) / 1000 * 0.5703, 3))
};
if (model.CarbonEmission < 0)
{
@@ -93,11 +93,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddYears(-i+1).ToString("yyyy-01-01 00:00:00");
+ sdate = now.AddYears(-i + 1).ToString("yyyy-01-01 00:00:00");
}
var edate = now.AddYears(-i).ToString("yyyy-01-01 00:00:00");
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_emissionData()
@@ -112,7 +112,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
@@ -127,7 +127,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
res.code = 500;
- res.msg ="失败:"+ex.Message;
+ res.msg = "失败:" + ex.Message;
}
HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
return result;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
index e15f99c..79b9c2c 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonFluxController.cs
@@ -35,7 +35,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
#region 电
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
index f1867b8..55136de 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonIntensityController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Month);
for (int i = 0; i < time_count; i++)
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
index 3e45202..90bbee1 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonOverviewController.cs
@@ -44,8 +44,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_overviewData()
@@ -77,8 +77,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new carbon_overviewData()
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
index 14640fe..6d70271 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetCarbonTrendController.cs
@@ -18,7 +18,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_carbon_trend();
#region 表是否存在
@@ -34,9 +34,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
- var now=DateTime.Now;
- if(!string.IsNullOrEmpty(date))
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
+ var now = DateTime.Now;
+ if (!string.IsNullOrEmpty(date))
{
if (date == "日")
{
@@ -50,7 +50,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
+ sdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
}
var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
@@ -79,7 +79,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
//sdate = Convert.ToDateTime(sdate1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
@@ -91,12 +91,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
string stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
var c = bll.IsExistsTable(date_base, "electricity_data_" + stime);
- if(c == false)
+ if (c == false)
{
bll.CreateTable(stime);
}
- var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var blist=bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var model = new carbon_trendData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
@@ -112,10 +112,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- res.code= 201;
+ res.code = 201;
res.msg = "参数不能为空";
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
index 5dde551..4746ae6 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
@@ -26,7 +26,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var date_base = ConfigurationManager.AppSettings["MySQLDataBase"].ToString();
try
{
- var data=new List();
+ var data = new List();
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Hour);
var time = DateTime.Now.ToString("yyyyMM");
@@ -35,19 +35,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(time);
}
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
- for (int i = 0; i < time_count; i++)
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
+ for (int i = 1; i <= time_count; i++)
{
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
- var sdate = now.AddHours(-(i + 1)).ToString("yyyy-MM-dd HH:00:00");
+ var sdate = now.AddHours(-(i - 1)).ToString("yyyy-MM-dd HH:00:00");
var jlist = list.Where(x => x.EntireTime == Convert.ToDateTime(jdate)).ToList();
- var slist=list.Where(x=>x.EntireTime==Convert.ToDateTime(sdate)).ToList();
+ var slist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
var num1 = jlist.Sum(x => x.EH);
var num2 = slist.Sum(x => x.EH);
var model = new daily_electricityData
{
- time = DateTime.Now.AddHours(-(i + 1)).ToString("HH:00"),
- EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
+ time = now.AddHours(-i).ToString("HH:00"),
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num2 - num1), 3))
};
if (model.EH < 0)
{
@@ -55,7 +55,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
data.Add(model);
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
index 48984ae..1fd5f17 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDisplayLoadController.cs
@@ -36,7 +36,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var data = new List();
var list = bll.GetModelListDate(" Reserve2 like '%展陈%'", time);
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var date = DateTime.Now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(date)).ToList();
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
index 4f5c12f..9ccfb9a 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
@@ -18,13 +18,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/();
- var now=DateTime.Now;
+ var now = DateTime.Now;
if (!string.IsNullOrEmpty(date))
{
if (date == "月")
@@ -35,12 +35,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
string sdate;
if (i == 0)
{
- sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+ sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
- //sdate = stime1.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
@@ -55,10 +54,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='"+edate+ "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
- decimal? num2=elist.Sum(x => x.EH);
+ decimal? num2 = elist.Sum(x => x.EH);
var model = new electricity_consumptionData()
{
time = DateTime.Now.AddMonths(-i).ToString("MM月"),
@@ -71,7 +70,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- if(date == "年")
+ if (date == "年")
{
var time_count = Convert.ToInt32(DateTime.Now.Year) - 2023;
for (int i = 0; i < time_count; i++)
@@ -98,14 +97,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var slist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var elist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
decimal? num1 = slist.Sum(x => x.EH);
decimal? num2 = elist.Sum(x => x.EH);
var model = new electricity_consumptionData()
{
time = DateTime.Now.AddYears(-i).ToString("yyyy年"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2), 3))
};
if (model.EH < 0)
{
@@ -114,7 +113,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
@@ -128,7 +127,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
catch (Exception ex)
{
res.code = 500;
- res.msg ="失败:"+ex.Message;
+ res.msg = "失败:" + ex.Message;
}
HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
return result;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
index ccfca3f..08b24a4 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
@@ -46,12 +46,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
bll.CreateTable(btime);
}
var list = new List();
- var list1 = bll.GetModelListDate(" Reserve1='配电室高压'", atime);
+ var list1 = bll.GetModelListDate(" Reserve1='配电室低压'", atime);
if (list1.Count() > 0)
{
list.AddRange(list1);
}
- var list2 = bll.GetModelListDate(" Reserve1='配电室高压'", btime);
+ var list2 = bll.GetModelListDate(" Reserve1='配电室低压'", btime);
if (list2.Count() > 0)
{
list.AddRange(list2);
@@ -78,7 +78,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var model = new electricity_consumptionData()
{
time = stime.AddDays(-i).ToString("dd"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble((anum - bnum) * Convert.ToDecimal(1.229)), 3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble((anum - bnum) / 10000 * Convert.ToDecimal(1.229)), 3))
};
data.Add(model);
}
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
index 0830635..accdcea 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
@@ -60,13 +60,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve1!='配电室高压' and Reserve1!='电能-室外箱变' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and EntireTime='" + eedate + "'", etime);
num += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
var model = new energy_flowData()
{
- Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(num) * 1.229, 3))
+ Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(num) / 10000 * 1.229, 3))
};
#endregion
#region 空调
@@ -95,13 +95,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%空调%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%空调%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%空调%' and EntireTime='" + eedate + "'", etime);
knum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
var adata = new List();
var amodel = new energy_flow();
- amodel.AirConditioner = Convert.ToDecimal(Math.Round(Convert.ToDouble(knum) * 1.229, 3));
+ amodel.AirConditioner = Convert.ToDecimal(Math.Round(Convert.ToDouble(knum) / 10000 * 1.229, 3));
#endregion
#region 照明
decimal? znum = 0;
@@ -129,11 +129,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%照明%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%照明%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%照明%' and EntireTime='" + eedate + "'", etime);
znum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
- amodel.Illumination = Convert.ToDecimal(Math.Round(Convert.ToDouble(znum) * 1.229, 3));
+ amodel.Illumination = Convert.ToDecimal(Math.Round(Convert.ToDouble(znum) / 10000 * 1.229, 3));
#endregion
#region 电梯
decimal? dnum = 0;
@@ -161,11 +161,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + ssdate + "'", stime);
- var blist = bll.GetModelListDate(" Reserve2 like '%电梯%' and EntireTime='" + eedate + "'", etime);
+ var alist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%电梯%' and EntireTime='" + ssdate + "'", stime);
+ var blist = bll.GetModelListDate(" Reserve1='配电室低压' and Reserve2 like '%电梯%' and EntireTime='" + eedate + "'", etime);
dnum += Convert.ToDecimal(alist.Sum(x => x.EH) - blist.Sum(x => x.EH));
}
- amodel.Elevator = Convert.ToDecimal(Math.Round(Convert.ToDouble(dnum) * 1.229, 3));
+ amodel.Elevator = Convert.ToDecimal(Math.Round(Convert.ToDouble(dnum) / 10000 * 1.229, 3));
#endregion
adata.Add(amodel);
model.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
index da9bd28..299b465 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
@@ -64,13 +64,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new energy_indexingData()
{
time = now.AddMonths(-i).ToString("MM月"),
- EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num * Convert.ToDecimal(1.229)) / 26010), 3))
+ EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num / 10000 * Convert.ToDecimal(1.229)) / 26010), 3))
};
data.Add(model);
}
@@ -102,13 +102,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new energy_indexingData()
{
time = now.AddYears(-i).ToString("yyyy"),
- EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num * Convert.ToDecimal(1.229)) / 26010), 3))
+ EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble((num / 10000 * Convert.ToDecimal(1.229)) / 26010), 3))
};
data.Add(model);
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
index 498c5c3..c43d166 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLightingLoadController.cs
@@ -17,7 +17,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
public class GetLightingLoadController : ApiController
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_lighting_load();
#region 表是否存在
@@ -33,19 +33,19 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var now=DateTime.Now;
+ var now = DateTime.Now;
var list = bll.GetModelListDate("", time);
if (!string.IsNullOrEmpty(date))
{
if (date == "日")
{
var time_count = Convert.ToInt32(now.Hour);
- for (int i = 0; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddDays(-1).AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
- var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)&&x.Reserve2.Contains("照明")).ToList();
- var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate) && x.Reserve2.Contains("照明")).ToList();
+ var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate) && x.Reserve2.Contains("照明")).ToList();
+ var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = Convert.ToDateTime(sdate).ToString("HH:00"),
@@ -61,7 +61,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
for (int i = 0; i < time_count; i++)
{
var tsdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
- var tedate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
+ var tedate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
var ysdate = now.AddMonths(-1).AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var yedate = now.AddMonths(-1).AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
var ytime = now.AddMonths(-1).ToString("yyyyMM");
@@ -72,7 +72,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var list1 = bll.GetModelListDate("", ytime);
var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(tsdate) && x.EntireTime < Convert.ToDateTime(tedate) && x.Reserve2.Contains("照明")).ToList();
- var blist= list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.Reserve2.Contains("照明")).ToList();
+ var blist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(ysdate) && x.EntireTime < Convert.ToDateTime(yedate) && x.Reserve2.Contains("照明")).ToList();
var model = new lighting_loadData()
{
time = now.AddDays(-i).ToString("MM-dd"),
@@ -125,7 +125,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
res.code = 201;
res.msg = "参数不能为空";
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
index 3ec50d4..3b6b9a8 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLoadClassificationController.cs
@@ -27,7 +27,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
- var edate = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
+ var edate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
var time = DateTime.Now.ToString("yyyyMM");
var a = bll.IsExistsTable(date_base, "electricity_data_" + time);
if (a == false)
@@ -36,13 +36,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var list = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
//一级
- var alist = list.Where(x=>x.Reserve2.Contains("梯")).ToList();
+ var alist = list.Where(x => x.Reserve2.Contains("梯")).ToList();
decimal? num1 = alist.Sum(x => x.P);
//二级
var blist = list.Where(x => x.Reserve2.Contains("潜污泵")).ToList();
decimal? num2 = blist.Sum(x => x.P);
//三级
- var clist = list.Where(x =>!x.Reserve2.Contains("梯")&&!x.Reserve2.Contains("潜污泵")).ToList();
+ var clist = list.Where(x => !x.Reserve2.Contains("梯") && !x.Reserve2.Contains("潜污泵")).ToList();
decimal? num3 = clist.Sum(x => x.P);
var model = new load_classifcationData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
index fd1f7bd..5e963eb 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetPavilionLightingController.cs
@@ -35,9 +35,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
var list = bll.GetModelListDate(" Reserve2 like '%照明%'", time);
- var now=DateTime.Now;
+ var now = DateTime.Now;
var sdate = now.ToString("yyyy-MM-dd 00:00:00");
- var edate = now.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
+ var edate = now.ToString("yyyy-MM-dd HH:00:00");
var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
var model = new pavilion_lightingData()
{
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
index e7e2e2e..9517d0b 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetRealLoadController.cs
@@ -29,7 +29,7 @@ namespace LonglslandExhibitionCenter.Controllers
var time = DateTime.Now.ToString("yyyyMM");
var now = DateTime.Now;
var time_count = Convert.ToInt32(DateTime.Now.Hour);
- for (int i = 1; i < time_count; i++)
+ for (int i = 1; i <= time_count; i++)
{
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
// 只处理今天的数据
@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers
{
bll.CreateTable(jtime);
}
- var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "' and Reserve1='配电室高压'", jtime);
+ var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "' and Reserve1='配电室低压'", jtime);
if (jlist.Count == 0)
{
var model = new real_loadData
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
index cfa2ecc..7313e30 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetRealtimeLoadController.cs
@@ -14,8 +14,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
/// 总览-实时负荷
///
public class GetRealtimeLoadController : ApiController
- { DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
- // GET api/();
var now = DateTime.Now;
var time = DateTime.Now.ToString("yyyyMM");
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var stime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var etime = now.ToString("yyyy-MM-dd 00:00:00");
- var alist=list.Where(x=>x.EntireTime>=Convert.ToDateTime(etime)&&x.EntireTime<=Convert.ToDateTime(stime)).ToList();
- var p = alist.Sum(x => x.P);
+ var alist = list.Where(x => x.EntireTime >= Convert.ToDateTime(etime) && x.EntireTime <= Convert.ToDateTime(stime)).ToList();
var list1 = list.Where(x => x.EntireTime == Convert.ToDateTime(stime)).ToList();
- var list2=list.Where(x=>x.EntireTime==Convert.ToDateTime(etime)).ToList();
+ var p = list1.Sum(x => x.P);
+ var list2 = list.Where(x => x.EntireTime == Convert.ToDateTime(etime)).ToList();
var num1 = list1.Sum(x => x.EH);
- var num2=list2.Sum(x => x.EH);
+ var num2 = list2.Sum(x => x.EH);
var model = new realtime_loadData()
{
Amount = 3,
- P= p,
- EH=num1-num2
+ P = p,
+ EH = num1 - num2
};
data.Add(model);
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
index a910e67..b9714db 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemEnergyController.cs
@@ -79,8 +79,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -114,8 +114,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -139,11 +139,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -177,8 +177,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -202,11 +202,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -242,8 +242,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -267,11 +267,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -321,8 +321,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -356,8 +356,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -381,11 +381,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -419,8 +419,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -444,11 +444,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -484,8 +484,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -509,11 +509,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -563,8 +563,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -598,8 +598,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -623,11 +623,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -661,8 +661,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -686,11 +686,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -726,8 +726,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -751,11 +751,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -805,8 +805,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -840,8 +840,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -865,11 +865,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -903,8 +903,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -928,11 +928,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -968,8 +968,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -993,11 +993,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
@@ -1047,8 +1047,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
var model = new system_energyData()
{
- DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum * Convert.ToDecimal(1.229)), 3)),
- MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum * Convert.ToDecimal(1.229)), 3)),
+ DayPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum / 10000 * Convert.ToDecimal(1.229)), 3)),
+ MonthPeak = Convert.ToDecimal(Math.Round(Convert.ToDouble(cnum / 10000 * Convert.ToDecimal(1.229)), 3)),
};
#endregion
var adata = new List();
@@ -1082,8 +1082,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum1 = qlist1.Sum(x => x.EH);
var amodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum1 - snum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum1 - qnum1) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (amodel.This < 0)
{
@@ -1107,11 +1107,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (amodel.This > amodel.Last)
{
- amodel.Year = ((amodel.This / amodel.Last) * 100) - 100;
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((amodel.This / amodel.Last) * 100) - 100), 3));
}
else if (amodel.This < amodel.Last)
{
- amodel.Year = 100 - ((amodel.This / amodel.Last) * 100);
+ amodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((amodel.This / amodel.Last) * 100)), 3));
}
adata.Add(amodel);
#endregion
@@ -1145,8 +1145,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
var qnum2 = qlist2.Sum(x => x.EH);
var bmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum2 - snum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum2 - qnum2) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (bmodel.This < 0)
{
@@ -1170,11 +1170,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (bmodel.This > bmodel.Last)
{
- bmodel.Year = ((bmodel.This / bmodel.Last) * 100) - 100;
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((bmodel.This / bmodel.Last) * 100) - 100), 3));
}
else if (bmodel.This < bmodel.Last)
{
- bmodel.Year = 100 - ((bmodel.This / bmodel.Last) * 100);
+ bmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((bmodel.This / bmodel.Last) * 100)), 3));
}
adata.Add(bmodel);
model.data = adata;
@@ -1192,26 +1192,26 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(jtime3);
}
- var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%电梯%'", jtime3);
+ var jlist3 = bll.GetModelListDate(" EntireTime='" + jdate2 + "' && Reserve2 like '%梯%'", jtime3);
var b3 = bll.IsExistsTable(date_base, "electricity_data_" + stime3);
if (b3 == false)
{
bll.CreateTable(stime3);
}
- var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%电梯%'", stime3);
+ var slist3 = bll.GetModelListDate(" EntireTime='" + sdate3 + "' && Reserve2 like '%梯%'", stime3);
var q3 = bll.IsExistsTable(date_base, "electricity_data_" + qtime3);
if (q3 == false)
{
bll.CreateTable(qtime3);
}
- var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%电梯%'", qtime3);
+ var qlist3 = bll.GetModelListDate(" EntireTime='" + qdate3 + "' && Reserve2 like '%梯%'", qtime3);
var jnum3 = jlist3.Sum(x => x.EH);
var snum3 = slist3.Sum(x => x.EH);
var qnum3 = qlist3.Sum(x => x.EH);
var cmodel = new system_energy()
{
- This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) * Convert.ToDecimal(1.229)), 3)),
- Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) * Convert.ToDecimal(1.229)), 3)),
+ This = Convert.ToDecimal(Math.Round(Convert.ToDouble((jnum3 - snum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
+ Last = Convert.ToDecimal(Math.Round(Convert.ToDouble((snum3 - qnum3) / 10000 * Convert.ToDecimal(1.229)), 3)),
};
if (cmodel.This < 0)
{
@@ -1235,11 +1235,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else if (cmodel.This > cmodel.Last)
{
- cmodel.Year = ((cmodel.This / cmodel.Last) * 100) - 100;
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(((cmodel.This / cmodel.Last) * 100) - 100), 3));
}
else if (cmodel.This < cmodel.Last)
{
- cmodel.Year = 100 - ((cmodel.This / cmodel.Last) * 100);
+ cmodel.Year = Convert.ToDecimal(Math.Round(Convert.ToDouble(100 - ((cmodel.This / cmodel.Last) * 100)), 3));
}
adata.Add(cmodel);
model.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
index 47146f1..3ff8e7d 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemPurgeController.cs
@@ -34,7 +34,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
try
{
var data = new List();
- var list = bll.GetModelListDate("", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压' ", time);
var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
var salist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == sdate).ToList();
@@ -49,7 +49,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
var model1 = new system_purgeData();
model1.name = "空调系统";
- model1.CarbonEmission =Convert.ToDecimal(Math.Round(Convert.ToDouble( salist.Sum(x => x.EH) - ealist.Sum(x => x.EH))/1000*0.5703,3));
+ model1.CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH) - ealist.Sum(x => x.EH)) / 1000 * 0.5703, 3));
if (model1.CarbonEmission < 0)
{
model1.CarbonEmission = 0;
@@ -57,7 +57,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model1);
var model2 = new system_purgeData();
model2.name = "照明系统";
- model2.CarbonEmission =Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH))/1000*0.5703,3));
+ model2.CarbonEmission = Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH)) / 1000 * 0.5703, 3));
if (model2.CarbonEmission < 0)
{
model2.CarbonEmission = 0;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
index e61796c..5bd2c67 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
@@ -35,9 +35,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
var data = new List();
var list = bll.GetModelListDate("", time);
- var sdate =Convert.ToDateTime( DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
- var edate =Convert.ToDateTime( DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
- var salist = list.Where(x => x.Reserve2.Contains("空调") &&x.EntireTime==sdate).ToList();
+ var sdate = Convert.ToDateTime(DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"));
+ var edate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+ var salist = list.Where(x => x.Reserve2.Contains("空调") && x.EntireTime == sdate).ToList();
var sblist = list.Where(x => x.Reserve2.Contains("照明") && x.EntireTime == sdate).ToList();
var sclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == sdate).ToList();
var selist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == sdate).ToList();
@@ -47,40 +47,40 @@ namespace LonglslandExhibitionCenter.Controllers.api
var eclist = list.Where(x => x.Reserve2.Contains("消防") && x.EntireTime == edate).ToList();
var eelist = list.Where(x => x.Reserve2.Contains("电梯") && x.EntireTime == edate).ToList();
var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
- var model1=new system_rankingData();
+ var model1 = new system_rankingData();
model1.name = "空调系统";
- model1.EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH)),3));
+ model1.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH) - ealist.Sum(x => x.EH)), 3));
if (model1.EH < 0)
{
- model1.EH = 0;
+ model1.EH = 0;
}
data.Add(model1);
- var model2=new system_rankingData();
+ var model2 = new system_rankingData();
model2.name = "照明系统";
- model2.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH)),3));
- if(model2.EH < 0)
+ model2.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x => x.EH) - eblist.Sum(x => x.EH)), 3));
+ if (model2.EH < 0)
{
model2.EH = 0;
}
data.Add(model2);
- var model3=new system_rankingData();
+ var model3 = new system_rankingData();
model3.name = "消防系统";
- model3.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH)),3));
+ model3.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x => x.EH) - eclist.Sum(x => x.EH)), 3));
if (model3.EH < 0)
{
model3.EH = 0;
}
- var model4=new system_rankingData();
+ var model4 = new system_rankingData();
model4.name = "电梯系统";
- model4.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH)),3));
+ model4.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x => x.EH) - eelist.Sum(x => x.EH)), 3));
if (model4.EH < 0)
{
model4.EH = 0;
}
data.Add(model4);
- var model5=new system_rankingData();
+ var model5 = new system_rankingData();
model5.name = "展陈系统";
- model5.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH)),3));
+ model5.EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x => x.EH) - eflist.Sum(x => x.EH)), 3));
if (model5.EH < 0)
{
model5.EH = 0;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
index 09cafc0..ce313f2 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
@@ -18,7 +18,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
// GET api/
- public HttpResponseMessage Get(string date="")
+ public HttpResponseMessage Get(string date = "")
{
var res = new get_total_energy();
#region 表是否存在
@@ -33,11 +33,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
#endregion
try
{
- if(!string.IsNullOrEmpty(date))
+ if (!string.IsNullOrEmpty(date))
{
var data = new List();
var now = DateTime.Now;
- var list = bll.GetModelListDate(" Reserve1='配电室高压'", time);
+ var list = bll.GetModelListDate(" Reserve1='配电室低压'", time);
if (date == "日")
{
var time_count = Convert.ToInt32(DateTime.Now.Day);
@@ -46,21 +46,21 @@ namespace LonglslandExhibitionCenter.Controllers.api
string sdate;
if (i == 0)
{
- sdate= now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+ sdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
}
else
{
- sdate = now.AddDays(-i+1).ToString("yyyy-MM-dd 00:00:00");
-
+ sdate = now.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
+
}
var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
- var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate)).ToList();
- var num= alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
+ var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
+ var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new total_energyData()
{
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
- EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num* Convert.ToDecimal(1.229)),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num / 10000 * Convert.ToDecimal(1.229)), 3))
};
if (model.EH < 0)
{
@@ -81,9 +81,9 @@ namespace LonglslandExhibitionCenter.Controllers.api
}
else
{
- sdate = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
+ sdate = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
}
- var edate=now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
+ var edate = now.AddMonths(-i).ToString("yyyy-MM-01 00:00:00");
var stime = Convert.ToDateTime(sdate).ToString("yyyyMM");
var etime = Convert.ToDateTime((edate)).ToString("yyyyMM");
var b = bll.IsExistsTable(date_base, "electricity_data_" + stime);
@@ -96,13 +96,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
{
bll.CreateTable(etime);
}
- var alist = bll.GetModelListDate(" EntireTime='"+sdate+ "' and Reserve1='配电室高压'", stime);
- var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室高压'", etime);
+ var alist = bll.GetModelListDate(" EntireTime='" + sdate + "' and Reserve1='配电室低压'", stime);
+ var blist = bll.GetModelListDate(" EntireTime='" + edate + "' and Reserve1='配电室低压'", etime);
var num = alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
var model = new total_energyData()
{
time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
- EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num*Convert.ToDecimal(1.229)),3))
+ EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num / 10000 * Convert.ToDecimal(1.229)), 3))
};
if (model.EH < 0)
{
@@ -111,7 +111,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
data.Add(model);
}
}
- var adata=data.OrderBy(x=>x.time).ToList();
+ var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = adata;
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
index ea1456f..d32425e 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj
@@ -320,7 +320,7 @@
True
15586
/
- https://localhost:44396/
+ http://localhost:44396/
False
False
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
index d90d2a4..4a694b4 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
@@ -8,8 +8,8 @@
- Debug|Any CPU
- E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml
+ Release|Any CPU
+ F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml
diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
index f30ea3b..9f3cbf5 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
Release
Any CPU
FileSystem
- E:\项目\长岛展览馆\发布文件
+ F:\项目\长岛展览馆\发布文件
FileSystem
<_TargetId>Folder
diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1dc7b94..04b6811 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,352 +4,352 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
- <_PublishTargetUrl>E:\项目\长岛展览馆\发布文件
- True|2024-08-11T12:53:54.5556138Z;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;
+ <_PublishTargetUrl>F:\项目\长岛展览馆\发布文件
+ True|2024-08-15T05:20:14.7663530Z;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:44
- 08/10/2024 15:24:24
+ 08/13/2024 17:44:43
- 08/10/2024 15:24:24
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/11/2024 20:53:53
+ 08/14/2024 11:25:28
- 08/11/2024 20:53:53
+ 08/14/2024 11:25:28
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:53
+ 08/13/2024 17:44:45
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:52
+ 08/13/2024 17:44:44
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
03/25/2024 14:45:01
@@ -493,73 +493,73 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/30/2024 18:21:28
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
02/23/2024 18:15:19
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:01:51
+ 08/13/2024 17:44:43
- 08/06/2024 16:16:41
+ 08/14/2024 09:50:14
\ No newline at end of file
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll
index 4c6fc3c..53b7d7a 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 5866c6d..6186fa5 100644
Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache
index 15f17b3..6591b2e 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
index 49357c2..8a74568 100644
--- a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
+++ b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-25482d9d8c50f9879f8b4dc4ea1f0fcef36c6ff1
+3c414877e6233b26aedcbe943e2fe15a5b51469f
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
index 7bbe39a..224784a 100644
--- a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
+++ b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
@@ -204,3 +204,106 @@ E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibition
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.csproj.CopyComplete
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.dll
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.dll.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CSharp.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Managed.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.VisualBasic.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Win32.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.AppContext.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Collections.Immutable.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Console.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.DiagnosticSource.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.FileVersionInfo.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.StackTrace.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Globalization.Calendars.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.Compression.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.Compression.ZipFile.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.FileSystem.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.FileSystem.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Net.Http.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Net.Sockets.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Reflection.Metadata.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Algorithms.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Encoding.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.X509Certificates.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Text.Encoding.CodePages.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Threading.Tasks.Extensions.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.ValueTuple.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.ReaderWriter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XmlDocument.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XPath.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XPath.XDocument.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\VBCSCompiler.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\VBCSCompiler.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Antlr3.Runtime.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\DataService.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.Web.Infrastructure.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MQTTnet.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Newtonsoft.Json.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Net.Http.Formatting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Helpers.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.WebHost.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Mvc.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Optimization.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Razor.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Deployment.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Razor.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\WebGrease.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MySql.Data.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Maticsoft.DBUtility.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Maticsoft.Common.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\DataService.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\log4net.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MQTTnet.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Newtonsoft.Json.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Net.Http.Formatting.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Helpers.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.WebHost.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Mvc.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Optimization.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Razor.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Deployment.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Razor.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Antlr3.Runtime.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Net.Http.Formatting.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Helpers.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Http.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Http.WebHost.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Mvc.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Optimization.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Razor.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.csproj.AssemblyReference.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.csproj.CopyComplete
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Debug\LonglslandExhibitionCenter.pdb
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll
index 5155b8a..49fd744 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 ee86a70..c5cbace 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache
index 57e70c0..be526e8 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
index 9a0639e..27e3a70 100644
--- a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
+++ b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-1240b023f6682313fa4ea6f092db06b44dec9257
+e20b1c4d1af1413f48bb2ff86382b72fcdf40e4e
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
index c0f1ba4..5ae062f 100644
--- a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
+++ b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.FileListAbsolute.txt
@@ -204,3 +204,106 @@ E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibition
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.csproj.CopyComplete
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.dll
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.dll.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\LonglslandExhibitionCenter.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csc.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\csi.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.CSharp.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Managed.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.VisualBasic.Core.targets
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\Microsoft.Win32.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.AppContext.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Collections.Immutable.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Console.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.DiagnosticSource.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.FileVersionInfo.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Diagnostics.StackTrace.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Globalization.Calendars.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.Compression.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.Compression.ZipFile.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.FileSystem.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.IO.FileSystem.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Net.Http.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Net.Sockets.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Reflection.Metadata.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Runtime.InteropServices.RuntimeInformation.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Algorithms.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Encoding.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.Primitives.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Security.Cryptography.X509Certificates.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Text.Encoding.CodePages.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Threading.Tasks.Extensions.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.ValueTuple.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.ReaderWriter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XmlDocument.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XPath.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\System.Xml.XPath.XDocument.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\vbc.rsp
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\VBCSCompiler.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\roslyn\VBCSCompiler.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Antlr3.Runtime.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\DataService.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.Web.Infrastructure.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MQTTnet.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Newtonsoft.Json.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Net.Http.Formatting.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Helpers.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.WebHost.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Mvc.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Optimization.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Razor.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Deployment.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Razor.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\WebGrease.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MySql.Data.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Maticsoft.DBUtility.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Maticsoft.Common.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\DataService.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\log4net.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\MQTTnet.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Newtonsoft.Json.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Net.Http.Formatting.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Helpers.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Http.WebHost.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Mvc.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Optimization.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.Razor.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Deployment.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\System.Web.WebPages.Razor.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Antlr3.Runtime.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Net.Http.Formatting.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Helpers.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Http.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Http.WebHost.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Mvc.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Optimization.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.Razor.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.csproj.AssemblyReference.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.csproj.CopyComplete
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\obj\Release\LonglslandExhibitionCenter.pdb
diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll
index 4c6fc3c..53b7d7a 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 5866c6d..6186fa5 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 4c6fc3c..53b7d7a 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 5866c6d..6186fa5 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/LonglslandExhibitionCenter/obj/Release/_WPPLastBuildInfo.txt b/LonglslandExhibitionCenter/obj/Release/_WPPLastBuildInfo.txt
index e765fad..7ae70d3 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/_WPPLastBuildInfo.txt and b/LonglslandExhibitionCenter/obj/Release/_WPPLastBuildInfo.txt differ
diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs
index 3dffe31..0e40998 100644
--- a/Security/ServiceSecurity.cs
+++ b/Security/ServiceSecurity.cs
@@ -550,7 +550,7 @@ namespace Security
}
if (!string.IsNullOrEmpty(name))
{
- log.Info("电能-室外箱变：" + msg);
+ //log.Info("电能-室外箱变：" + msg);
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate = Convert.ToDateTime(now);
var dtime = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
@@ -872,7 +872,7 @@ namespace Security
}
}
- if (item.dl.ContainsKey("光照度高16位"))
+ if (item.dl.ContainsKey("光照度低16位"))
{
var meteorological_name = "光照度";
var model = list.Where(x => x.MeteorologicalName == meteorological_name).FirstOrDefault();
@@ -880,7 +880,7 @@ namespace Security
{
var is_update = false;
decimal? number;
- var stringnumber = item.dl["光照度高16位"];
+ var stringnumber = item.dl["光照度低16位"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
@@ -917,7 +917,7 @@ namespace Security
model.MeteorologicalNumber = name;
model.MeteorologicalName = "光照度";
decimal? number;
- var stringnumber = item.dl["光照度高16位"];
+ var stringnumber = item.dl["光照度低16位"];
char delimiters = ':'; // 分隔符
int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
if (lastDotIndexs != -1) // 如果找到分隔符
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index 883e8b4..298be8e 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- zWiyGjDmxLNE5Cmqyjg+lrZoGbCru9yYvYmS3TryJnA=
+ cVESGyLcnbCniX0BSs1Pybl1+kduWurzDbuU+fD3kP4=
diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe
index 5a2be60..97f89e9 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 eddac06..d64347e 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -145,7 +145,7 @@
- +mUxixAuYLF2AerPbZrwk2YvZ855/Icd3/Wa/1EKKT0=
+ uU7KmmhQEnNwdQxHU5xLv6w0ryLzshDrQvsWtpaW6Rc=
diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb
index 10cd823..1dc2c9e 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 e218fd7..aa015b0 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/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache
index f6bb1f5..723503c 100644
Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ
diff --git a/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache b/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache
index 8cf6bb4..0a7181d 100644
--- a/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache
+++ b/Security/obj/Debug/Security.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-861e78bdb92a2ba9c8cb73fb388e5c3725ba919e
+4c5efd15455a61e26655993356716e3cb4ae8d75
diff --git a/Security/obj/Debug/Security.csproj.FileListAbsolute.txt b/Security/obj/Debug/Security.csproj.FileListAbsolute.txt
index d46149b..3453104 100644
--- a/Security/obj/Debug/Security.csproj.FileListAbsolute.txt
+++ b/Security/obj/Debug/Security.csproj.FileListAbsolute.txt
@@ -133,3 +133,30 @@ E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\S
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.CopyComplete
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.exe
E:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\ServiceSecurity.exe.config
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\ServiceSecurity.exe.manifest
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\ServiceSecurity.application
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\ServiceSecurity.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\ServiceSecurity.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\DataService.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\HslCommunication.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\LitJSON.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\log4net.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\Newtonsoft.Json.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\MySql.Data.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\Maticsoft.DBUtility.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\Maticsoft.Common.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\DataService.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\HslCommunication.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\log4net.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\bin\Debug\Newtonsoft.Json.xml
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.AssemblyReference.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.SuggestedBindingRedirects.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.ProjectInstaller.resources
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.GenerateResource.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.CoreCompileInputs.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.exe.manifest
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.application
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\Security.csproj.CopyComplete
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.exe
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\Security\obj\Debug\ServiceSecurity.pdb
diff --git a/Security/obj/Debug/Security.csproj.GenerateResource.cache b/Security/obj/Debug/Security.csproj.GenerateResource.cache
index 84912b5..3637401 100644
Binary files a/Security/obj/Debug/Security.csproj.GenerateResource.cache and b/Security/obj/Debug/Security.csproj.GenerateResource.cache differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index 883e8b4..298be8e 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- zWiyGjDmxLNE5Cmqyjg+lrZoGbCru9yYvYmS3TryJnA=
+ cVESGyLcnbCniX0BSs1Pybl1+kduWurzDbuU+fD3kP4=
diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe
index 5a2be60..97f89e9 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 eddac06..d64347e 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -145,7 +145,7 @@
- +mUxixAuYLF2AerPbZrwk2YvZ855/Icd3/Wa/1EKKT0=
+ uU7KmmhQEnNwdQxHU5xLv6w0ryLzshDrQvsWtpaW6Rc=
diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb
index 10cd823..1dc2c9e 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 ef3138d..db4fc00 100644
Binary files a/Security/obj/Release/Security.csproj.AssemblyReference.cache and b/Security/obj/Release/Security.csproj.AssemblyReference.cache differ
diff --git a/Supplement/obj/Release/Supplement.csproj.AssemblyReference.cache b/Supplement/obj/Release/Supplement.csproj.AssemblyReference.cache
index 0f01734..123f9df 100644
Binary files a/Supplement/obj/Release/Supplement.csproj.AssemblyReference.cache and b/Supplement/obj/Release/Supplement.csproj.AssemblyReference.cache differ