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

修改bug

This commit is contained in:
曾艳 2024-08-05 11:16:59 +08:00
parent 2dbc73a83b
commit ceea212db0
10 changed files with 150 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config
View File

@ -155,7 +155,7 @@
</site> </site>
<site name="LonglslandExhibitionCenter" id="2"> <site name="LonglslandExhibitionCenter" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\林谷项目\长岛展览馆项目\后端\LonglslandExhibitionCenter\LonglslandExhibitionCenter" /> <virtualDirectory path="/" physicalPath="F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:15586:localhost" /> <binding protocol="http" bindingInformation="*:15586:localhost" />

BIN
.vs/LonglslandExhibitionCenterAPI/v17/.suo
View File

Binary file not shown.

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

Binary file not shown.

BIN
DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

2
LonglslandExhibitionCenter/Controllers/api/SetFullSwitchController.cs
View File

@ -88,7 +88,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var mqqt = new MqttClientService(); var mqqt = new MqttClientService();
data controlData = new data(); data controlData = new data();
controlData.h = new HeaderData(); controlData.h = new HeaderData();
controlData.h.rt = Number; controlData.h.rt = Number;//设备代码
// 如果需要同时设置多个数据项，可以使用字典 // 如果需要同时设置多个数据项，可以使用字典
controlData.b = new BodyData(); controlData.b = new BodyData();

BIN
LonglslandExhibitionCenter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

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

Binary file not shown.

288
Security/ServiceSecurity.cs
View File

@ -58,12 +58,12 @@ namespace Security
MqttConnectionOptions options = new MqttConnectionOptions() MqttConnectionOptions options = new MqttConnectionOptions()
{ {
IpAddress = "127.0.0.1", //IpAddress = "127.0.0.1",
//IpAddress = "192.168.1.202", IpAddress = "192.168.100.202",
Port = 1883, Port = 1883,
ClientId = "Service-" + Guid.NewGuid().ToString("N"), ClientId = "Service-" + Guid.NewGuid().ToString("N"),
}; };
options.Credentials = new MqttCredential("dev", "12345"); //options.Credentials = new MqttCredential("dev", "12345");
mqtt_client = new MqttClient(options); mqtt_client = new MqttClient(options);
log.Info("开始"); log.Info("开始");
// 接收到数据的时候进行触发 // 接收到数据的时候进行触发
@ -258,7 +258,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -310,7 +310,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -335,10 +335,7 @@ namespace Security
} }
} }
} }
} }
//配电室高压 //配电室高压
if (topic.Contains("/9b841d78-68ca-45e5-ba5a-35dc43560c39")) if (topic.Contains("/9b841d78-68ca-45e5-ba5a-35dc43560c39"))
@ -363,15 +360,21 @@ namespace Security
} }
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate = Convert.ToDateTime(now); var ddate = Convert.ToDateTime(now);
var dtime = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
var sddate = Convert.ToDateTime(ddate.AddHours(-1));
var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList(); var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList();
if (list.Count < 84) if (list.Count < 84)
{ {
var list1 = list.Select(x => x.DeviceName).ToList(); var list1 = list.Select(x => x.DeviceName).ToList();
var list2 = bll_info.GetModelLists(list1); var list2 = bll_info.GetModelLists(list1);
var vlist = bll.GetModelListDate(" ", date); var vlist = bll.GetModelListDate(" ", date);
if (vlist.Count == 0)
{
vlist = bll.GetModelListDate("", dtime);
}
foreach (var aitem in list2) foreach (var aitem in list2)
{ {
var svlist = vlist.FirstOrDefault(x => x.DeviceName == aitem.DeviceName); var svlist = vlist.Where(x => x.DeviceName == aitem.DeviceName).OrderByDescending(x => x.EntireTime).FirstOrDefault();
var model = new DataService.Model.electricity_data(); var model = new DataService.Model.electricity_data();
model.ElectricityId = Guid.NewGuid().ToString("N"); model.ElectricityId = Guid.NewGuid().ToString("N");
model.DeviceName = aitem.DeviceName; model.DeviceName = aitem.DeviceName;
@ -424,7 +427,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -476,7 +479,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -527,15 +530,21 @@ namespace Security
} }
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate = Convert.ToDateTime(now); var ddate = Convert.ToDateTime(now);
var dtime = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
var sddate = Convert.ToDateTime(ddate.AddHours(-1));
var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList(); var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList();
if (list.Count < 84) if (list.Count < 84)
{ {
var list1 = list.Select(x => x.DeviceName).ToList(); var list1 = list.Select(x => x.DeviceName).ToList();
var list2 = bll_info.GetModelLists(list1); var list2 = bll_info.GetModelLists(list1);
var vlist = bll.GetModelListDate(" ", date); var vlist = bll.GetModelListDate(" ", date);
if (vlist.Count == 0)
{
vlist = bll.GetModelListDate("", dtime);
}
foreach (var aitem in list2) foreach (var aitem in list2)
{ {
var svlist = vlist.FirstOrDefault(x => x.DeviceName == aitem.DeviceName); var svlist = vlist.Where(x => x.DeviceName == aitem.DeviceName).OrderByDescending(x => x.EntireTime).FirstOrDefault();
var model = new DataService.Model.electricity_data(); var model = new DataService.Model.electricity_data();
model.ElectricityId = Guid.NewGuid().ToString("N"); model.ElectricityId = Guid.NewGuid().ToString("N");
model.DeviceName = aitem.DeviceName; model.DeviceName = aitem.DeviceName;
@ -588,7 +597,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -640,7 +649,7 @@ namespace Security
} }
if (item.dl.ContainsKey("01020002")) if (item.dl.ContainsKey("01020002"))
{ {
model.Ib = item.dl["01020001"]; model.Ib = item.dl["01020002"];
} }
if (item.dl.ContainsKey("01020003")) if (item.dl.ContainsKey("01020003"))
{ {
@ -694,7 +703,6 @@ namespace Security
{ {
if (name == "460") if (name == "460")
{ {
#region GP01#水泵 #region GP01#水泵
var model1 = new DataService.Model.pollution_discharge(); var model1 = new DataService.Model.pollution_discharge();
model1.PollutionDischargeId = Guid.NewGuid().ToString("N"); model1.PollutionDischargeId = Guid.NewGuid().ToString("N");
@ -765,11 +773,11 @@ namespace Security
model5.PollutionDischargeName = "GP03-1#水泵"; model5.PollutionDischargeName = "GP03-1#水泵";
if (item.dl.ContainsKey("1DI9")) if (item.dl.ContainsKey("1DI9"))
{ {
model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI1"]); model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI9"]);
} }
if (item.dl.ContainsKey("1DI10")) if (item.dl.ContainsKey("1DI10"))
{ {
model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI2"]); model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI10"]);
} }
model5.CreateTime = DateTime.Now; model5.CreateTime = DateTime.Now;
model5.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model5.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -780,11 +788,11 @@ namespace Security
model6.PollutionDischargeName = "GP03-2#水泵"; model6.PollutionDischargeName = "GP03-2#水泵";
if (item.dl.ContainsKey("1DI11")) if (item.dl.ContainsKey("1DI11"))
{ {
model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI12"]); model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI11"]);
} }
if (item.dl.ContainsKey("1DI12")) if (item.dl.ContainsKey("1DI12"))
{ {
model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI13"]); model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI12"]);
} }
model6.CreateTime = DateTime.Now; model6.CreateTime = DateTime.Now;
model6.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model6.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -829,7 +837,7 @@ namespace Security
model9.PollutionDischargeName = "GP05-1#水泵"; model9.PollutionDischargeName = "GP05-1#水泵";
if (item.dl.ContainsKey("1DI17")) if (item.dl.ContainsKey("1DI17"))
{ {
model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI517"]); model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI17"]);
} }
if (item.dl.ContainsKey("1DI18")) if (item.dl.ContainsKey("1DI18"))
{ {
@ -855,70 +863,6 @@ namespace Security
model10.Reserve1 = "460"; model10.Reserve1 = "460";
bll_pollution.Add(model10); bll_pollution.Add(model10);
#endregion #endregion
#region GP06#水泵
var model11 = new DataService.Model.pollution_discharge();
model11.PollutionDischargeId = Guid.NewGuid().ToString("N");
model11.PollutionDischargeName = "GP06-1#水泵";
if (item.dl.ContainsKey("1DI21"))
{
model11.PollutionDischargeState = Convert.ToInt32(item.dl["1DI21"]);
}
if (item.dl.ContainsKey("1DI22"))
{
model11.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI22"]);
}
model11.CreateTime = DateTime.Now;
model11.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model11.Reserve1 = "460";
bll_pollution.Add(model11);
var model12 = new DataService.Model.pollution_discharge();
model12.PollutionDischargeId = Guid.NewGuid().ToString("N");
model12.PollutionDischargeName = "GP06-2#水泵";
if (item.dl.ContainsKey("1DI23"))
{
model12.PollutionDischargeState = Convert.ToInt32(item.dl["1DI23"]);
}
if (item.dl.ContainsKey("1DI24"))
{
model12.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI24"]);
}
model12.CreateTime = DateTime.Now;
model12.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model12.Reserve1 = "460";
bll_pollution.Add(model12);
#endregion
#region GP07#水泵
var model13 = new DataService.Model.pollution_discharge();
model13.PollutionDischargeId = Guid.NewGuid().ToString("N");
model13.PollutionDischargeName = "GP07-1#水泵";
if (item.dl.ContainsKey("1DI25"))
{
model3.PollutionDischargeState = Convert.ToInt32(item.dl["1DI25"]);
}
if (item.dl.ContainsKey("1DI26"))
{
model3.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI26"]);
}
model13.CreateTime = DateTime.Now;
model13.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model13.Reserve1 = "460";
bll_pollution.Add(model13);
var model14 = new DataService.Model.pollution_discharge();
model14.PollutionDischargeId = Guid.NewGuid().ToString("N");
model14.PollutionDischargeName = "GP07-2#水泵";
if (item.dl.ContainsKey("1DI27"))
{
model14.PollutionDischargeState = Convert.ToInt32(item.dl["1DI127"]);
}
if (item.dl.ContainsKey("1DI28"))
{
model14.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI128"]);
}
model14.CreateTime = DateTime.Now;
model14.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model14.Reserve1 = "460";
bll_pollution.Add(model14);
#endregion
} }
} }
@ -954,17 +898,81 @@ namespace Security
{ {
if (name == "465") if (name == "465")
{ {
#region GP06#水泵
var model17 = new DataService.Model.pollution_discharge();
model17.PollutionDischargeId = Guid.NewGuid().ToString("N");
model17.PollutionDischargeName = "GP06-1#水泵";
if (item.dl.ContainsKey("1DI1"))
{
model17.PollutionDischargeState = Convert.ToInt32(item.dl["1DI1"]);
}
if (item.dl.ContainsKey("1DI2"))
{
model17.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI2"]);
}
model17.CreateTime = DateTime.Now;
model17.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model17.Reserve1 = "465";
bll_pollution.Add(model17);
var model18 = new DataService.Model.pollution_discharge();
model18.PollutionDischargeId = Guid.NewGuid().ToString("N");
model18.PollutionDischargeName = "GP06-2#水泵";
if (item.dl.ContainsKey("1DI3"))
{
model18.PollutionDischargeState = Convert.ToInt32(item.dl["1DI3"]);
}
if (item.dl.ContainsKey("1DI4"))
{
model18.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI4"]);
}
model18.CreateTime = DateTime.Now;
model18.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model18.Reserve1 = "465";
bll_pollution.Add(model18);
#endregion
#region GP07#水泵
var model15 = new DataService.Model.pollution_discharge();
model15.PollutionDischargeId = Guid.NewGuid().ToString("N");
model15.PollutionDischargeName = "GP07-1#水泵";
if (item.dl.ContainsKey("1DI5"))
{
model15.PollutionDischargeState = Convert.ToInt32(item.dl["1DI5"]);
}
if (item.dl.ContainsKey("1DI6"))
{
model15.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI6"]);
}
model15.CreateTime = DateTime.Now;
model15.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model15.Reserve1 = "465";
bll_pollution.Add(model15);
var model16 = new DataService.Model.pollution_discharge();
model16.PollutionDischargeId = Guid.NewGuid().ToString("N");
model16.PollutionDischargeName = "GP07-2#水泵";
if (item.dl.ContainsKey("1DI7"))
{
model16.PollutionDischargeState = Convert.ToInt32(item.dl["1DI7"]);
}
if (item.dl.ContainsKey("1DI8"))
{
model16.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI8"]);
}
model16.CreateTime = DateTime.Now;
model16.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
model16.Reserve1 = "465";
bll_pollution.Add(model16);
#endregion
#region GP08#水泵 #region GP08#水泵
var model1 = new DataService.Model.pollution_discharge(); var model1 = new DataService.Model.pollution_discharge();
model1.PollutionDischargeId = Guid.NewGuid().ToString("N"); model1.PollutionDischargeId = Guid.NewGuid().ToString("N");
model1.PollutionDischargeName = "GP08-1#水泵"; model1.PollutionDischargeName = "GP08-1#水泵";
if (item.dl.ContainsKey("1DI1")) if (item.dl.ContainsKey("1DI9"))
{ {
model1.PollutionDischargeState = Convert.ToInt32(item.dl["1DI1"]); model1.PollutionDischargeState = Convert.ToInt32(item.dl["1DI9"]);
} }
if (item.dl.ContainsKey("1DI2")) if (item.dl.ContainsKey("1DI10"))
{ {
model1.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI2"]); model1.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI10"]);
} }
model1.CreateTime = DateTime.Now; model1.CreateTime = DateTime.Now;
model1.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model1.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -973,13 +981,13 @@ namespace Security
var model2 = new DataService.Model.pollution_discharge(); var model2 = new DataService.Model.pollution_discharge();
model2.PollutionDischargeId = Guid.NewGuid().ToString("N"); model2.PollutionDischargeId = Guid.NewGuid().ToString("N");
model2.PollutionDischargeName = "GP08-2#水泵"; model2.PollutionDischargeName = "GP08-2#水泵";
if (item.dl.ContainsKey("1DI3")) if (item.dl.ContainsKey("1DI11"))
{ {
model2.PollutionDischargeState = Convert.ToInt32(item.dl["1DI3"]); model2.PollutionDischargeState = Convert.ToInt32(item.dl["1DI11"]);
} }
if (item.dl.ContainsKey("1DI4")) if (item.dl.ContainsKey("1DI12"))
{ {
model2.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI4"]); model2.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI12"]);
} }
model2.CreateTime = DateTime.Now; model2.CreateTime = DateTime.Now;
model2.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model2.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -990,13 +998,13 @@ namespace Security
var model3 = new DataService.Model.pollution_discharge(); var model3 = new DataService.Model.pollution_discharge();
model3.PollutionDischargeId = Guid.NewGuid().ToString("N"); model3.PollutionDischargeId = Guid.NewGuid().ToString("N");
model3.PollutionDischargeName = "GP09-1#水泵"; model3.PollutionDischargeName = "GP09-1#水泵";
if (item.dl.ContainsKey("1DI5")) if (item.dl.ContainsKey("1DI13"))
{ {
model3.PollutionDischargeState = Convert.ToInt32(item.dl["1DI5"]); model3.PollutionDischargeState = Convert.ToInt32(item.dl["1DI13"]);
} }
if (item.dl.ContainsKey("1DI6")) if (item.dl.ContainsKey("1DI14"))
{ {
model3.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI6"]); model3.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI14"]);
} }
model3.CreateTime = DateTime.Now; model3.CreateTime = DateTime.Now;
model3.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model3.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1005,13 +1013,13 @@ namespace Security
var model4 = new DataService.Model.pollution_discharge(); var model4 = new DataService.Model.pollution_discharge();
model4.PollutionDischargeId = Guid.NewGuid().ToString("N"); model4.PollutionDischargeId = Guid.NewGuid().ToString("N");
model4.PollutionDischargeName = "GP09-2#水泵"; model4.PollutionDischargeName = "GP09-2#水泵";
if (item.dl.ContainsKey("1DI7")) if (item.dl.ContainsKey("1DI15"))
{ {
model4.PollutionDischargeState = Convert.ToInt32(item.dl["1DI7"]); model4.PollutionDischargeState = Convert.ToInt32(item.dl["1DI15"]);
} }
if (item.dl.ContainsKey("1DI8")) if (item.dl.ContainsKey("1DI16"))
{ {
model4.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI8"]); model4.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI16"]);
} }
model4.CreateTime = DateTime.Now; model4.CreateTime = DateTime.Now;
model4.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model4.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1022,13 +1030,13 @@ namespace Security
var model5 = new DataService.Model.pollution_discharge(); var model5 = new DataService.Model.pollution_discharge();
model5.PollutionDischargeId = Guid.NewGuid().ToString("N"); model5.PollutionDischargeId = Guid.NewGuid().ToString("N");
model5.PollutionDischargeName = "GP10-1#水泵"; model5.PollutionDischargeName = "GP10-1#水泵";
if (item.dl.ContainsKey("1DI9")) if (item.dl.ContainsKey("1DI17"))
{ {
model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI1"]); model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI17"]);
} }
if (item.dl.ContainsKey("1DI10")) if (item.dl.ContainsKey("1DI18"))
{ {
model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI2"]); model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI18"]);
} }
model5.CreateTime = DateTime.Now; model5.CreateTime = DateTime.Now;
model5.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model5.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1037,13 +1045,13 @@ namespace Security
var model6 = new DataService.Model.pollution_discharge(); var model6 = new DataService.Model.pollution_discharge();
model6.PollutionDischargeId = Guid.NewGuid().ToString("N"); model6.PollutionDischargeId = Guid.NewGuid().ToString("N");
model6.PollutionDischargeName = "GP10-2#水泵"; model6.PollutionDischargeName = "GP10-2#水泵";
if (item.dl.ContainsKey("1DI11")) if (item.dl.ContainsKey("1DI19"))
{ {
model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI12"]); model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI19"]);
} }
if (item.dl.ContainsKey("1DI12")) if (item.dl.ContainsKey("1DI20"))
{ {
model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI13"]); model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI20"]);
} }
model6.CreateTime = DateTime.Now; model6.CreateTime = DateTime.Now;
model6.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model6.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1054,13 +1062,13 @@ namespace Security
var model7 = new DataService.Model.pollution_discharge(); var model7 = new DataService.Model.pollution_discharge();
model7.PollutionDischargeId = Guid.NewGuid().ToString("N"); model7.PollutionDischargeId = Guid.NewGuid().ToString("N");
model7.PollutionDischargeName = "GP11-1#水泵"; model7.PollutionDischargeName = "GP11-1#水泵";
if (item.dl.ContainsKey("1DI13")) if (item.dl.ContainsKey("1DI21"))
{ {
model7.PollutionDischargeState = Convert.ToInt32(item.dl["1DI13"]); model7.PollutionDischargeState = Convert.ToInt32(item.dl["1DI21"]);
} }
if (item.dl.ContainsKey("1DI14")) if (item.dl.ContainsKey("1DI22"))
{ {
model7.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI14"]); model7.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI22"]);
} }
model7.CreateTime = DateTime.Now; model7.CreateTime = DateTime.Now;
model7.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model7.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1069,13 +1077,13 @@ namespace Security
var model8 = new DataService.Model.pollution_discharge(); var model8 = new DataService.Model.pollution_discharge();
model8.PollutionDischargeId = Guid.NewGuid().ToString("N"); model8.PollutionDischargeId = Guid.NewGuid().ToString("N");
model8.PollutionDischargeName = "GP12-2#水泵"; model8.PollutionDischargeName = "GP12-2#水泵";
if (item.dl.ContainsKey("1DI15")) if (item.dl.ContainsKey("1DI23"))
{ {
model8.PollutionDischargeState = Convert.ToInt32(item.dl["1DI16"]); model8.PollutionDischargeState = Convert.ToInt32(item.dl["1DI23"]);
} }
if (item.dl.ContainsKey("1DI16")) if (item.dl.ContainsKey("1DI24"))
{ {
model8.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI17"]); model8.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI24"]);
} }
model8.CreateTime = DateTime.Now; model8.CreateTime = DateTime.Now;
model8.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model8.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1086,13 +1094,13 @@ namespace Security
var model9 = new DataService.Model.pollution_discharge(); var model9 = new DataService.Model.pollution_discharge();
model9.PollutionDischargeId = Guid.NewGuid().ToString("N"); model9.PollutionDischargeId = Guid.NewGuid().ToString("N");
model9.PollutionDischargeName = "GP12-1#水泵"; model9.PollutionDischargeName = "GP12-1#水泵";
if (item.dl.ContainsKey("1DI17")) if (item.dl.ContainsKey("1DI25"))
{ {
model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI517"]); model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI25"]);
} }
if (item.dl.ContainsKey("1DI18")) if (item.dl.ContainsKey("1DI26"))
{ {
model9.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI18"]); model9.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI26"]);
} }
model9.CreateTime = DateTime.Now; model9.CreateTime = DateTime.Now;
model9.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model9.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1101,13 +1109,13 @@ namespace Security
var model10 = new DataService.Model.pollution_discharge(); var model10 = new DataService.Model.pollution_discharge();
model10.PollutionDischargeId = Guid.NewGuid().ToString("N"); model10.PollutionDischargeId = Guid.NewGuid().ToString("N");
model10.PollutionDischargeName = "GP12-2#水泵"; model10.PollutionDischargeName = "GP12-2#水泵";
if (item.dl.ContainsKey("1DI19")) if (item.dl.ContainsKey("1DI27"))
{ {
model10.PollutionDischargeState = Convert.ToInt32(item.dl["1DI19"]); model10.PollutionDischargeState = Convert.ToInt32(item.dl["1DI27"]);
} }
if (item.dl.ContainsKey("1DI20")) if (item.dl.ContainsKey("1DI28"))
{ {
model10.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI20"]); model10.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI28"]);
} }
model10.CreateTime = DateTime.Now; model10.CreateTime = DateTime.Now;
model10.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model10.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1118,13 +1126,13 @@ namespace Security
var model11 = new DataService.Model.pollution_discharge(); var model11 = new DataService.Model.pollution_discharge();
model11.PollutionDischargeId = Guid.NewGuid().ToString("N"); model11.PollutionDischargeId = Guid.NewGuid().ToString("N");
model11.PollutionDischargeName = "GP13-1#水泵"; model11.PollutionDischargeName = "GP13-1#水泵";
if (item.dl.ContainsKey("1DI21")) if (item.dl.ContainsKey("1DI29"))
{ {
model11.PollutionDischargeState = Convert.ToInt32(item.dl["1DI21"]); model11.PollutionDischargeState = Convert.ToInt32(item.dl["1DI29"]);
} }
if (item.dl.ContainsKey("1DI22")) if (item.dl.ContainsKey("1DI30"))
{ {
model11.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI22"]); model11.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI30"]);
} }
model11.CreateTime = DateTime.Now; model11.CreateTime = DateTime.Now;
model11.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model11.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1133,13 +1141,13 @@ namespace Security
var model12 = new DataService.Model.pollution_discharge(); var model12 = new DataService.Model.pollution_discharge();
model12.PollutionDischargeId = Guid.NewGuid().ToString("N"); model12.PollutionDischargeId = Guid.NewGuid().ToString("N");
model12.PollutionDischargeName = "GP13-2#水泵"; model12.PollutionDischargeName = "GP13-2#水泵";
if (item.dl.ContainsKey("1DI23")) if (item.dl.ContainsKey("1DI31"))
{ {
model12.PollutionDischargeState = Convert.ToInt32(item.dl["1DI23"]); model12.PollutionDischargeState = Convert.ToInt32(item.dl["1DI31"]);
} }
if (item.dl.ContainsKey("1DI24")) if (item.dl.ContainsKey("1DI32"))
{ {
model12.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI24"]); model12.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI32"]);
} }
model12.CreateTime = DateTime.Now; model12.CreateTime = DateTime.Now;
model12.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model12.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1150,13 +1158,13 @@ namespace Security
var model13 = new DataService.Model.pollution_discharge(); var model13 = new DataService.Model.pollution_discharge();
model13.PollutionDischargeId = Guid.NewGuid().ToString("N"); model13.PollutionDischargeId = Guid.NewGuid().ToString("N");
model13.PollutionDischargeName = "GP14-1#水泵"; model13.PollutionDischargeName = "GP14-1#水泵";
if (item.dl.ContainsKey("1DI25")) if (item.dl.ContainsKey("1DI33"))
{ {
model3.PollutionDischargeState = Convert.ToInt32(item.dl["1DI25"]); model3.PollutionDischargeState = Convert.ToInt32(item.dl["1DI33"]);
} }
if (item.dl.ContainsKey("1DI26")) if (item.dl.ContainsKey("1DI34"))
{ {
model3.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI26"]); model3.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI34"]);
} }
model13.CreateTime = DateTime.Now; model13.CreateTime = DateTime.Now;
model13.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model13.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
@ -1165,13 +1173,13 @@ namespace Security
var model14 = new DataService.Model.pollution_discharge(); var model14 = new DataService.Model.pollution_discharge();
model14.PollutionDischargeId = Guid.NewGuid().ToString("N"); model14.PollutionDischargeId = Guid.NewGuid().ToString("N");
model14.PollutionDischargeName = "GP14-2#水泵"; model14.PollutionDischargeName = "GP14-2#水泵";
if (item.dl.ContainsKey("1DI27")) if (item.dl.ContainsKey("1DI35"))
{ {
model14.PollutionDischargeState = Convert.ToInt32(item.dl["1DI127"]); model14.PollutionDischargeState = Convert.ToInt32(item.dl["1DI35"]);
} }
if (item.dl.ContainsKey("1DI28")) if (item.dl.ContainsKey("1DI36"))
{ {
model14.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI128"]); model14.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI36"]);
} }
model14.CreateTime = DateTime.Now; model14.CreateTime = DateTime.Now;
model14.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); model14.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));

BIN
Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

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

Binary file not shown.