From fcb995949081b6760f826359de8fa9ed297d90c2 Mon Sep 17 00:00:00 2001 From: zhaoaomin <18366680202@163.com> Date: Tue, 2 Jan 2024 10:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E7=8F=AD=E3=80=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87ping=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shangjian/.vs/BL/v17/.suo | Bin 1386496 -> 1369088 bytes .../bin/Debug/CentralControl.exe | Bin 105472 -> 105472 bytes .../bin/Debug/CentralControl.pdb | Bin 249344 -> 249344 bytes .../CentralControl/bin/Debug/XGL.Data.dll | Bin 394752 -> 395264 bytes .../CentralControl/bin/Debug/XGL.Data.pdb | Bin 421376 -> 421376 bytes ...tralControl.csproj.AssemblyReference.cache | Bin 22440 -> 22440 bytes .../obj/Debug/CentralControl.exe | Bin 105472 -> 105472 bytes .../obj/Debug/CentralControl.pdb | Bin 249344 -> 249344 bytes .../DBService/FormingMachineService.cs | 8 ++- shangjian/XGL/App.config | 2 +- shangjian/XGL/FormItem/Main.xaml.cs | 58 +++++++++++++++++- 11 files changed, 63 insertions(+), 5 deletions(-) diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 3ad06e2d0fe038d465bacfdf2c5324bdfbaab4df..6e364c0b42d4acaa5a1ede8faef8a226fbb925be 100644 GIT binary patch delta 19986 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 delta 29274 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 eC@HY`@5avHO+8PJ| delta 70 zcmZpe!{0E6e*=dHhtNZd|NR!X7$-9_88kb1v^#h(0x{Ee2M^{Wxf1=yyHgn%7#NO+ Zx-ls?eRtbcSs-TfsbTGQnQhEZ!~t^P8PEU# diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index a01740a6b54d49f8117d119a68331ee9b676a091..0c69d61fc26f18d6df34ab205f7c1b6a3131e11b 100644 GIT binary patch delta 19903 zcmch93w%|@@&C-8o7W{kPVOTQxOtF-JP1iHq7n^Ac+^H!H=PhW?JRv@N_Z0H>d zy;mfw>=hF+z1yI(Apl9-CUnL9n1yP^3z&|fD-L3xIClb#K!1wpe+3~>KHPwTK?O#2 z)!C4X7mQZ-j#fzjtL>weF{k&f4ydG-0{~1&?DoLb0GQ^T{cVPt^+Z}s#;XXeP zN4)}s<1!987{|{p&tiSAj2d9vd-iVy`)r(Gw@-}7XqFC%&e`v0sp>$YkrD;2yinNK zX>#_V>SGDUE2%H#X@h#e*x5G?6@vyF8{rpYj_SKwRD5-5v=P;l$9VgkF^nW5HT!mI zH}lV8FwU4=@-TFwcw_c`-|KoAv)B8phsGGOhB13n_3cSUX4H${s}s8$vkz83m1JCu zC#paAUyr*W*|^xiL25YGxH0{p0YZK~l8)1!t| zf16@>QqDC*q4|#tRezCcWDZ{Z6M&Sv08Z2AC<@4wvE{R;-+s#--3D}aW<3R12e z3mva0h@!fb%dfp+1bs&CRFF|UG0nIvf+&NVsw%2$(~LN)%tv0LKcUd(t;q<5pT)4u z_Kwf!3H2FVKhBFuq3{=x4I)Rya80a8zsORlAL^Y)eG^1JE;Wn1DY2nYo3)d6oC_y~ zIpO`RjgC;bweKsrJ>b(U%OcP(V_;?vcr%a77_~E@2b}0>Iig{9`q+L>_(l9ihZEjQ zV0kcwJHKx3OmM=j{kUePb91~Co{;))fa~}5=lVIRET7F}nd@Nrvedkm!{w_Id7S%+ zkmZEYv0SyBhH%0gR1O7$JVBj%og%qf7Wl z_rf)qtI4rmX*p7~N8_`@LgBL5oe5spmcBZy2e^_fM-NCB*~87AzRSmpVm+A6jsBKl zWO^Z1nwF;z?ni3>&V*MhC*N8og(Ln>{>HA ziTkXAqdAs|us4O#B6v1+iK(C{RqLwy6oCN^f)>HPp36)JB&F$=y<(RTS}JH2?9W@g<7{ihjnvp z)RFR@MR4FncE{9%W-P3|M58Cj!Lbl~sYYW`mY8v{+(zS4kD2ihJ6P*>kuDyV+vwZe zC1x)OAEI@UvDIO{VU3Nx$zEdmzqGgyVu%!L+o1c@d1dLJyjochUnd~_j<7_ZTbnaR<^py&ohi{Ree?C9Z8K1HKDQZI-e0SBfsS_MydE{Prq zLyI*!Oz3i0Z===mZ<<#?hmGDy92z|errxGoZp*nc`YM=FVQH9_Iz4&}g#SXLZmD+= zIx%0Pvg}KuuYp;=)M#b&3pfr^@6xCw^{(h~aKawtPnq{bUkg(y8#1-Q@ynyHgZFKe zPG~%gUZ8bPr#%!s0ro8f?n%c$&YI|nFm#DlUY!*%C&4}&tw||@>tX19T6bOKQ_+*b zu~egZkuBQJ7(IqfzoknYOTBC1({Hg`aqKux9` zO1A4^N}Yb!op5A_M#DUVTyvn|MU9xu&mr$6jU2wqTytT@PL0}fe&niv)LorujB8#O zGV|fU8>~BOiEHM=X@Q!|e2CnwJF;hf33F{!>YU=b3yw5t-7wG1E(_NDK_ez}H$?5x z$l<%qRS75dYSflf?)nwX*w=|H*MjfJSiFY!z=`)*sdL;tFyk+}>FeoB%tdg-Mtvh6 zaNP@w4`|()ZV$QchvPPij$C3s08{^}b%P208ur-e7DCHl#6hi#qvLrwG}!1-%dy0) zf`K1sp0=AfaQW#0q4J!@V<>W|E+>Shq>h{;QY55rrC(| zUkxm_5$C^$;r%1JrR2Ydq0NSz{~m#&kF=8W-(xV>Mx6g1ht)RX{P#F?2-5j)ElfSi z{dE3Y3%hK@`EM=V+qI7K-&$B{BgucHJg$`&&?5v?FycG3 z&h-qGv}zqE&TVkOMw=*gJP)%z*E-IW+rjaLMw}_@VZMzxQ@#jMr?rkV+p*zziF4s%(J0HsVy-03~1PmYgYHhP^i8O!+(5@wL`*rrZg=+ZgFgxf7<@ zh%@D@u+2uCDRNna1XUadoazQ#%?t#-b;!OER zSbWAdPnq&9i0ZH{P^R1qGrmLJqW=Wh)>*CORJjkf0TR@yaz7Lp8gZ(87j}hc#F_Fv zI1#Q9XUg~CR1ZcvQwE_oT~irxru;K3jMgnVQ~m{x+lVveUtyHX(n?O1AHaH-Mw}`? zgz!X-I8`17cR!6dQyzmY*&1=CJO(RsG~!Ho9Aa}d;!OE5?6DDN%8y~CU+XwiegfeG z(USRcsyqRA57bIdl_#OiMw}`?h4~k09cRkV;P@pPai%;4^DotiGi56rw-IN`&tcPG zt>aAj1#GxXBhHkkp{Njb{^L~nB^)2Fm7FTSf`vcQh*Ra)aKJ{KDchi-Nb5LLw!_{Z zYs8uI8;HGDBhHi^-yO4j%Ki;@U&lI~fc^%D7+Ijt{J%k)C^-Q=>pBZ1_+>(iY>gt9^ z=4gXVG!iHLTqB3?OILR+ze|t>Z8;sT9yoM?R<`AYxqEgYV`AiD)@d>(rV7$zOe_$j z$wcD@8iZ78##Q>xc%6Bx7M}gY;zC5rGM;1 zuedMhLgqs3_!H|inG4bV4kJzGLd+JV$ygWRY8#e1|LDFLqu%AFOlF^Z5S9eB2_}<| z@7u`X`-}S$9C%pk+HyX0Uy4O7o#>>y04IN@(a!iY?jgANYmGwsE6-)v(b0*zdxly# zSt&BO2zXZx>oSYsxJq<-7Q=CiAU%uWxZCc>=fwydXy{Q&oxMCGakqmJPoj_KN4P6g z>v$5E=SI&pcp{?{P4|rL zLgreWpTjy$=2~1SNRzo1Hwn^YuEW?|JxZzb=brI6H;)mMxyv&FV+UAT$!sR#(g7Md zeD`=JVfe)wwdE}JT#utK=|t6@$z90Yh->KCXD68(aho7b=0@BjNRyd@gNEo)N}a#) zOvU4uDb9b)W|OBF!-r`llldvmw~@p5oaZK7T-0g)MNbJfjOs+c_x!92nOpGmXx3@Z z+=7u~7-=%MV5%TZW*ROhMD{t!yyKaUv17R@llimfR%{!mO)!~KoN=v24qvlp2JV=o zQCrS&&uw`3jh*NV&+T2v%)+9dvQCqkg;ND-GP7_lBmMpFSyvez5hasB?`)i0!X24R zxc3fBy;+-JGUd41Mh;(3@10m)s&#ESUhf<{eS0TL_Wm5pXKR$4+3c$5LTw)YUUZh` zHV+R7)ZFIbX}cqDu3zBPJM=K6&Rp+&oO>rDrgo9{mpF8;)?JJbx$eR(Ho7zHA=llQ zRH1dtdai?C;S3vDJs)!Y3J+*x0mcpXF2t$xbW@(;y|~Xt4&MmxV%+&Ft#kOU^e(|o z_i2>vTVmda+4pO-IBbb|KW?&7Th2A!r8waMt!vAh3esV+91B+HVM?8)-YQ(Pk`d2-w)a6SSfzDLdj)Q>k;7NvU5VL`XkA;*-QI_= z{IO1SzjxL5WGuQEt;U_Ttkg@f8s8VB$*jgxf;5>Locx3yrqo&EeHgc_XT)UIdLO|( zPiY;KS%X72Xyouc<$V-8wrJFr^Q`wV-1R~yvg*B$f6s=<)Z)?xR%$Y}xL%MZQ;Q9P zG?^zb`(-^$sq+o*I^6U-jfQ#N@~+4E^t%V|Ehh6DJZ&R~Z@>3R?08M<+H#sL*Hc~0 zZ@?+LSgFl#z`267`3<;SkTze39X2X;9`HVmcfa0g{;+o=7VZAt{3dL$(WL&>Vb7qu zN$VWGkGrtR zd4G#VdppUjgXeIqjU2vjz0X^rM{C@nPV@0GFXHhdohU8lr7mP%#`!I* z(_~)8m4Y;xmvNIIP3CtP`>`IS)OkV7E4cI%Moi|Cn4LK4q}FjS_=(^tQ`Xe5<(V6~pV&1~}p;~uS z;yTycSQMsFox3vTU0iRYjfs;W*kuwyj0iV4|LIwfGMqc=Sp;#AAU%se<9ZvFIv2hV!31$85&OMXAX& z;|@WZOf&AaJ90kw5DQE_OsVtHn8TRoV#MpaKIRDS_GlfG`3MWV8aaF$V~*kupGIvt zzl}MDJNgjf{MVNAa?J5AuK5@n(sk2M=xNT!xIROp*BpO{`2=TVYV@IhiFvY1zfbXq zt(%wfp7|-R>8D!){XlaH!?QKIjvhjt!g4|M{cmdDKgFCvcYm$C-?PO00+-t8>fBT2 zY0S>iI(~NdHLkYNH<=eX+VFsl=JpN7wBwOn-7-Gp!ddN3a zMW`7XS@4jrJ;tea6=>z~)OFxi;|6OqEv0*`TSX4h=vdrCu3l=Eji#l<$NJQ$%e3wp zUrKC}${4EAWb#^yT4|#`#xgTiL7~>Y)q~Lt8(F{iUF1kr=YIQ5`vK~ZrVHp%u&Z}9h0F8F}-NQw3$q>I1dIR<({7}2d!`ka$$98 zL3b`&`lB_9!3L?)G9a`PX_g9fIaA7MGQ_`IM$j$24j!M&ol`v~;~%!N*uXK8#F`wa z;D|KR!n9(MuIk}CN+Pq$GE!W8soJ&iWb^W;uO=Y_Op0oA}ek$hmK)K0G?lAer zus!snST@YGx`vys(eisL3NFv&mjA4m)j8aM*6sYg^f==r09h({mtxC+d0 zBF_T)ftEO)D|JYI*q7_I)SK-*Tj)RDK|HZT>{06?`Q_ zjOxMV?y^j8#qlgZp@<2QxrV}@$ygZd4`X9L+>o>tt#kIGCh>o}6)FA^?7c`c_&?u@ z9RKHr-v9Mhr1<~AjwC`{({(HUvn}+m_JW??c}B48-TdF|-SZnhkFkGX%VKu_&O!0N zF!m2@@yYz3oMq?p(?50cKbUtX6^Z|U-(8*EnDqao7stO&5C8oc{{OQy6#v?F=gzEF zZUg6=-xEDKVoK%Meoo4JV%Q(L{&A{7NHV!i3`qmHO(#V?vYx8cTekY|Nu1C8|JF~| zzfO^z+%?62PV4U6@8^1M`*Uvt=hkojPvifen?K*~IDap>v;IA6&GG4K-!(>zwZqLX zquxjN$S`Q2B}GYX`VMLUYyZ_|_KFv@bm)a{kK^tnY@nlng82JB9߅sG5-b`qxXwwu3@lV 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 ZBVub~cNOtBLoL3%(Ts@rD^?do{vVoOm)!sW diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb index f0809a64e5766750d6f23358b60f138f7f0fb457..45ec895fdc70859983baed0c4bfedaa81bc5716e 100644 GIT binary patch delta 2094 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 diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index ed78be87892b9bf758539630d38f59a2cc1a220e..748a3eec5aee6f2687c11c1c7af61305d407ad1d 100644 GIT binary patch delta 21 dcmZ3no^i!`#tjafY_EDd--mE)cH>O)0{~^g2(17B delta 21 dcmZ3no^i!`#tjafY|9Q6D=uf-?8ceo2LNB{2nzrJ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index 9aa4d82c0d1398f1c41d4140f46a471266997478..c6ce99940b4bd275bd8e7dc24653ec7d367eb9ed 100644 GIT binary patch delta 74 zcmZqJ!Pc;YZ9)h0@)>=N-CMgEL(2u!HM2f;$cehGV0QF4_wi%k_7CNZHzYwSrk|e3 eC@HY`@5avHO+8PJ| delta 70 zcmZpe!{0E6e*=dHhtNZd|NR!X7$-9_88kb1v^#h(0x{Ee2M^{Wxf1=yyHgn%7#NO+ Zx-ls?eRtbcSs-TfsbTGQnQhEZ!~t^P8PEU# diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 36d24e4..bc08dd1 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -142,7 +142,7 @@ namespace XGL.Data.DBService public DataTable GetFormingMachineState(string devicecode) { - string sql = $@"select status from base_equipment where equipment_code = '{devicecode}'; "; + string sql = $@"select status,plc_ip from base_equipment where equipment_code = '{devicecode}'; "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) @@ -537,11 +537,13 @@ VALUES return sqlList;//> 0 ? true : false; } - public void ChangeShiftsInfo() + public bool ChangeShiftsInfo() { // string sql = $@"INSERT INTO [dbo].[mes_changeshift_info] ([id], [shift_code], [change_time], [create_time], [create_by], [last_update], [update_by], [work_date]) - VALUES ('1', NULL, NULL, NULL, NULL, NULL, NULL, NULL);"; + VALUES ('{Common.GetUUID()}', '{LoginUser.ShiftCode}', GetDate(), GetDate(), '{LoginUser.UserName}', GetDate(), '{LoginUser.UserName}', '{LoginUser.WorkDate}');"; + int ret = Utils.netClientDBHelper.executeUpdate(sql); + return ret > 0 ? true : false; } diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 872a6c6..0f4164b 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -12,7 +12,7 @@ - + diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs index 5e2badc..a2a8f99 100644 --- a/shangjian/XGL/FormItem/Main.xaml.cs +++ b/shangjian/XGL/FormItem/Main.xaml.cs @@ -81,7 +81,7 @@ namespace XGL.FormItem this.myTb.SetBinding(TextBlock.TextProperty, textBinding); InitPage(); - GetServiceDelay(Utils.GetServerIP()); + GetServiceDelay(Utils.GetServerIP()); } private void InitPage() @@ -177,6 +177,9 @@ namespace XGL.FormItem timerDeciveState.Elapsed += TimerDeciveState_Elapsed; timerDeciveState.Start(); this.lbVersion.Content = LoginUser.Version; + FormingMachineService formingMachineService = new FormingMachineService(); + DataTable dtDeviceIP = formingMachineService.GetFormingMachineState(deviceCode); + GetDevicePingResult(dtDeviceIP.Rows[0][1].ToString()); } @@ -243,6 +246,59 @@ namespace XGL.FormItem }, 1, 0, 2000); } + public void GetDevicePingResult(string serviceIp) + { + Time = new System.Threading.Timer((s) => + { + try + { + PingTest(serviceIp); + } + catch (Exception) + { + + } + }, 1, 0, 2000); + } + + + static void PingTest(string ip) + { + string ipAddress = ip;//"192.168.1.1"; // 你要 ping 的 IP 地址 + + Ping pingSender = new Ping(); + PingOptions options = new PingOptions(); + + options.DontFragment = true; + + string data = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + byte[] buffer = System.Text.Encoding.ASCII.GetBytes(data); + int timeout = 120; + + while (true) + { + PingReply reply = pingSender.Send(ipAddress, timeout, buffer, options); + if (reply.Status != IPStatus.Success) + { + // 记录日志 + string logMessage = $"Ping failed to {ipAddress} at {DateTime.Now}. Reason: {reply.Status}"; + //WriteToLogFile(logMessage); + LogHelper.instance.log.Error(logMessage); + + // 这里你可以添加其他处理逻辑,或者退出循环 + // break; + } + else + { + Console.WriteLine($"Ping successful to {ipAddress}. Reply time: {reply.RoundtripTime}ms"); + } + + // 可以设定一个间隔时间,然后再次 ping + //System.Threading.Thread.Sleep(5000); // 5 秒 + } + } + + SerialHelper serialHelper = new SerialHelper(); int time = 0; private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e)