From ceea212db0a33890187fce57d9ecd4d5230689e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E8=89=B3?= <2836604403@qq.com> Date: Mon, 5 Aug 2024 11:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/applicationhost.config | 2 +- .vs/LonglslandExhibitionCenterAPI/v17/.suo | Bin 475136 -> 454656 bytes ...DataService.csproj.AssemblyReference.cache | Bin 10695 -> 13882 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7097 -> 7036 bytes .../api/SetFullSwitchController.cs | 2 +- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 18685 -> 16234 bytes ...itionCenter.csproj.AssemblyReference.cache | Bin 39499 -> 61584 bytes Security/ServiceSecurity.cs | 288 +++++++++--------- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 8171 -> 8048 bytes .../Security.csproj.AssemblyReference.cache | Bin 17735 -> 22867 bytes 10 files changed, 150 insertions(+), 142 deletions(-) diff --git a/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config b/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config index 1be09bb..f49cf6e 100644 --- a/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config +++ b/.vs/LonglslandExhibitionCenterAPI/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index 9b69f1c69c8d79af67495fdd7ed1de4cc0120663..221b602eac4d6a7bed51195567620ed1e36aaf86 100644 GIT binary patch delta 21915 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 delta 6773 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 diff --git a/DataService/obj/Debug/DataService.csproj.AssemblyReference.cache b/DataService/obj/Debug/DataService.csproj.AssemblyReference.cache index c5f6e5b81e2c51f23cefd0758f7b9db0f8134893..0b0f1d005647e6579bc8dae425916e326aea10e2 100644 GIT binary patch delta 447 zcmX>eyeo%;jZu_=fq^k`@&>igjj>sptc;OvRxy)5u!wQQyj-~R`RsKulP|DJP1a)- znXJXg&%SSOxc2iccP2Y9+VCW%W#*(>>FeveS?Ny>;1Xlkhv=BRk@4E(1OcAOt2iux zG|OZ?A>PS**dc5g0glN!%r=t)#91a6Fk4MF;tT?_|MT%o7GZ&?31Kmx+|Ob^`4Wo= zOAHR@sIlMTjsQC)n$?~s1-Dc5C;wwz3wFk4HowWN?0%EO*#jnDX7U7!{b6^R?7|U- z;#_1WnsNF~{vggd`8EqTOE3igjj>sp078`pBLDyZ diff --git a/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1354a3d9ea6f9c53339ea65b667abafb9ed956ed..8172f52045c8dccb92910b363b87e718518d7a6e 100644 GIT binary patch delta 134 zcmdmK{>N;?5^k1iH>;S*>$%0)V_q)Y`F!@e$^Us|Ccoo;!V-xoVaF1KDX2erChrTD aU`z?M%~$x!Iaz`*Wk442Y+fKC$qWGH(>rDN5@?~h+@K6-(!P&Z1x4{*W^3^k3TH3|iE%*4I8Q7hqit;aW2D7fn@ zDk@G}9d-%>aMWI)!f|_8g$pT<Z2^f5p$IiOW>HI zz$gXYDIp*ZIRNL)YC|>fhZ=<$3KXLZZv`UM$Oa0i2Nk$XS8Dh=sIj}2R}>A4Q4Oa; zNw{cN8qoswzOOWm-L&=rQoVv*Ee+$n74z4NEjCEU^J?;J2oR_9WLQY zeUja?snal{w>Z>p>Pfg{H_*ziAe^Nk!%Tx8j+vnnGpc6_?ry%imJf_G|LpW!2j@MU zpS0HQ5w*RX<*jTG#;iXka4i;wAu}*k9eW%7kfXr!#t@89pt&hb?`SHadi(iQq+KQ+ zqWe7Mz;ZugvZjPigC`u2vC!1qK*!Q*a}3T=XAwz|OIE>@9o$Gt)M0hZwWMkAiGx#= zT{#;?Xvy^WWkF3%$Lz!f_b|W6aeEsPv9)Dojw^}y*_p8(jJEpVjM+|!WqqR82zMaX z%)r*P&$`%rKe3n&!m!y+Jlfk%FJ{_&Fik@V7u$Bj1Ob=ZTdjF1{)86WgKUlXYDKRq z9M~)2pY|_o*-_Eoc?f2SrrctM3L)VwmDV%sm5#=8>1&s(lHGRbE#u*yu74;#bHzhP zkNMtyxJJ(}u0TdTn|7WQpJfNxb%!QJw&Xy?F%qcvNqA#lfDGU5=h#*%?7@Het@VAg YzI%C-q|&ebOK$65E8mLJ)`39fUtlOk literal 18685 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 delta 23 fcmbR6kooi$CJr`6GX@3*#>B~rZJ`@u-^~O7Rq_YH diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs index 74a7f9d..5a41dae 100644 --- a/Security/ServiceSecurity.cs +++ b/Security/ServiceSecurity.cs @@ -58,12 +58,12 @@ namespace Security MqttConnectionOptions options = new MqttConnectionOptions() { - IpAddress = "127.0.0.1", - //IpAddress = "192.168.1.202", + //IpAddress = "127.0.0.1", + IpAddress = "192.168.100.202", Port = 1883, ClientId = "Service-" + Guid.NewGuid().ToString("N"), }; - options.Credentials = new MqttCredential("dev", "12345"); + //options.Credentials = new MqttCredential("dev", "12345"); mqtt_client = new MqttClient(options); log.Info("开始"); // 接收到数据的时候进行触发 @@ -258,7 +258,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } if (item.dl.ContainsKey("01020003")) { @@ -310,7 +310,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } if (item.dl.ContainsKey("01020003")) { @@ -335,10 +335,7 @@ namespace Security } } - - } - } //配电室高压 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 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(); if (list.Count < 84) { var list1 = list.Select(x => x.DeviceName).ToList(); var list2 = bll_info.GetModelLists(list1); var vlist = bll.GetModelListDate(" ", date); + if (vlist.Count == 0) + { + vlist = bll.GetModelListDate("", dtime); + } 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(); model.ElectricityId = Guid.NewGuid().ToString("N"); model.DeviceName = aitem.DeviceName; @@ -424,7 +427,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } if (item.dl.ContainsKey("01020003")) { @@ -476,7 +479,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } 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 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(); if (list.Count < 84) { var list1 = list.Select(x => x.DeviceName).ToList(); var list2 = bll_info.GetModelLists(list1); var vlist = bll.GetModelListDate(" ", date); + if (vlist.Count == 0) + { + vlist = bll.GetModelListDate("", dtime); + } 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(); model.ElectricityId = Guid.NewGuid().ToString("N"); model.DeviceName = aitem.DeviceName; @@ -588,7 +597,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } if (item.dl.ContainsKey("01020003")) { @@ -640,7 +649,7 @@ namespace Security } if (item.dl.ContainsKey("01020002")) { - model.Ib = item.dl["01020001"]; + model.Ib = item.dl["01020002"]; } if (item.dl.ContainsKey("01020003")) { @@ -694,7 +703,6 @@ namespace Security { if (name == "460") { - #region GP01#水泵 var model1 = new DataService.Model.pollution_discharge(); model1.PollutionDischargeId = Guid.NewGuid().ToString("N"); @@ -765,11 +773,11 @@ namespace Security model5.PollutionDischargeName = "GP03-1#水泵"; if (item.dl.ContainsKey("1DI9")) { - model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI1"]); + model5.PollutionDischargeState = Convert.ToInt32(item.dl["1DI9"]); } if (item.dl.ContainsKey("1DI10")) { - model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI2"]); + model5.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI10"]); } model5.CreateTime = DateTime.Now; model5.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); @@ -780,11 +788,11 @@ namespace Security model6.PollutionDischargeName = "GP03-2#水泵"; if (item.dl.ContainsKey("1DI11")) { - model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI12"]); + model6.PollutionDischargeState = Convert.ToInt32(item.dl["1DI11"]); } if (item.dl.ContainsKey("1DI12")) { - model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI13"]); + model6.PollutionDischargeAlarm = Convert.ToInt32(item.dl["1DI12"]); } model6.CreateTime = DateTime.Now; model6.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); @@ -829,7 +837,7 @@ namespace Security model9.PollutionDischargeName = "GP05-1#水泵"; if (item.dl.ContainsKey("1DI17")) { - model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI517"]); + model9.PollutionDischargeState = Convert.ToInt32(item.dl["1DI17"]); } if (item.dl.ContainsKey("1DI18")) { @@ -855,70 +863,6 @@ namespace Security model10.Reserve1 = "460"; bll_pollution.Add(model10); #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") { + #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#水泵 var model1 = new DataService.Model.pollution_discharge(); model1.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model2.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model3.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model4.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model5.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model6.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model7.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model8.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model9.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model10.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model11.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model12.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model13.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.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(); model14.PollutionDischargeId = Guid.NewGuid().ToString("N"); 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.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); diff --git a/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 27e0d861f39c873521ccfc173285c7e8431d3c59..09331a9d49f44493dc4aa8a139608f6bbfff7862 100644 GIT binary patch delta 272 zcmaED|G{p<5^k0XH>;S*hP-0zF)tVHd_H^K{({Ji`F-^QoEC+;mV71TiRJmsnY$`~d|| z2cF0Q9-0{JRYjq;OMtfx4+aYo0g7d{2u+h2F1`lOY6G+OE3tejv*P|{T48WCB*zzEExT=jD=aLh%%c3^ewxppeW9@ qPAr?O`t`pupWd6Y<-|(XA$NZ%u~Zi?CEl?QBi%A3=j<+fI=%p{-`{Ki delta 23 ecmcb-iSc+BBL^F!3