From 267460dfa801c3de4fe463b265e2f16307412c93 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 12 Jan 2024 13:57:25 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=B8=8D=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E5=BC=80=E5=A7=8B=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BAClient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v17/.suo | Bin 352768 -> 376832 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 12800 -> 12800 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 54784 -> 54784 bytes HighWayIot.Repository/domain/RFIDState.cs | 3 - .../obj/Debug/HighWayIot.Repository.dll | Bin 12800 -> 12800 bytes .../obj/Debug/HighWayIot.Repository.pdb | Bin 54784 -> 54784 bytes HighWayIot.TouchSocket/BufferAnalysis.cs | 1 - .../HighWayIot.TouchSocket.csproj | 2 +- .../{TcpServer.cs => TcpClient.cs} | 54 +- .../bin/Debug/HighWayIot.TouchSocket.dll | Bin 13312 -> 13312 bytes .../bin/Debug/HighWayIot.TouchSocket.pdb | Bin 42496 -> 42496 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7406 -> 7452 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 26163 -> 9796 bytes .../obj/Debug/HighWayIot.TouchSocket.dll | Bin 13312 -> 13312 bytes .../obj/Debug/HighWayIot.TouchSocket.pdb | Bin 42496 -> 42496 bytes RFIDSocket/DataAnalysis.cs | 67 +- ...t.Repository.domain.RFIDContent.datasource | 10 + RFIDSocket/RFIDLog.Designer.cs | 612 ++++++++++++++---- RFIDSocket/RFIDLog.cs | 67 +- RFIDSocket/RFIDSocket.Designer.cs | 195 ++++-- RFIDSocket/RFIDSocket.cs | 83 ++- RFIDSocket/RFIDSocket.csproj | 5 +- RFIDSocket/RFIDSocket.resx | 8 +- 23 files changed, 785 insertions(+), 322 deletions(-) rename HighWayIot.TouchSocket/{TcpServer.cs => TcpClient.cs} (66%) create mode 100644 RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index eee881a826d4ee08000b282b1c38fedcaa017372..bc81352216fded8bfc4e92935a5cc92997598e2e 100644 GIT binary patch delta 24788 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 H&GY;pz-L>1 diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index a5f37172ebbeab7113f01a39b44ebf35beafd46c..f22cd6b532d9b689c172e68a4d7c42597d70dfdb 100644 GIT binary patch delta 2100 zcmZXVe@s2eP{2PffoynTXh3R?)M+91J;3#Cg3Y`Ae5OJ2U3YsDX~O`jQMht zC>56M7O~(2dFrUAVZg@oVW6)F5VAW`mAKES6`mkq-Ex*EUNzfHd=$PE1&F= z^4xG&vfm1t+D@zTmBjO9y|>c2N7WX{E^m&2+~=L+UP=RsyJ+ch)SDRsm7NvjY+R4C zbglqhP;uSH=qmcXM0`|U_bwF>IC^BzZzvIUqsB5nO3@<%C?P9~ zTr7nd3ZRl&M5)(wD!|<^X{Kr!MIox?xs*mZE43l*q>+P#IAtuxd7PCUsdvQA8wSck zG!ead39mzYzKCfc@3{9%$|a96d(gc&jo|%m8uhzB8fx+C7_-Mc*QU`$&ke&$rYP6x z-Zbpnbi!jtOdD@;!*1_hUyAAA1Exu#8al9MtJ#x+8p;)E1ua>o2V1qL+InzIlWOb1 zO--t;7e#Yab@IYoEMii9W|}UlnI?r=l8Zh~v?O^Vt!iG_Ou^sDYHxtHG6jy>cl3HY z&4`%_zotI3QqJ^O#lof^cWF<}_hY4|7Mec;4Vv1_N}}~i;tdbrVV(OK4MqU1ntq3% z8@NrAE5c?vIy9*c>FCn*7s4?!1HBpzN@n0?O-r2yBNMM^s&fP~F{Ei0<+AXGrZUQ9 z;cZQ)+_0IAlL~Y3wWecKn2R4YslCX-VoLt`g7DG9|L^?^B9p0y_NB@UqDIqltT6K<*vyzLEX32(3JbAwI?3F? z{=_?hNfFy*RnUFiZdTBiJVRQ51Ej?`L^==elP+Xk##+mMBSy$y&(1@vE%Z*Sz>_fO zZ0(p~^fsTI5Nm=z`e zpw-NNGy5&%cUq6DQ&`>XceCF^{%)(E{CsQ$5ms1gP7!N0YZGgnb%=F>6*kXgt!8avjk6Bft5tf0VS*J7 z7qC{dHnGN8hge5gCs^U3`SM0qam+{m(gVKL^bS1WTg&86qLTlv8poY<7v{1IzXRCgC0wdJe1w&DWynYuDq7rl4#0#FfHJW z?fZ84r*|0pD%tPFM=BEY@xA=zK*Np{<7jg`I__#M}G6w$xnW&|1|bQ wl^ieIka0nOz*WgFDlQrbkzV<$7^w980~NcIXaE2J delta 2151 zcmZXV3v3is6o&t~cV>2H+ith-H+I=}+pQEK5X-Z)vPkAG-;zIfFXu#qY#y}7zn7Sgv3CAga%t7YGNWjg3ohLM^bc>`_K9QbI-kJ z@9ylxnq$rT`t&D@za1Ian=jf{4jg^Lo4*ox40J_+%W}YIVQ;oP* z5I<|YqUFpGJG?ZhY^IPqouD)Tcwo1<`s*p1^>5Y*rm|(TJC@RNF|`5JI_CS3?bN8J zE065r@~mLjR0GRsY6rFHDURjY74A9t)v7lCzS?_>*t^|D)_m$E&;<h<+xPXX0BWPVn8f$1gL&J1N8r=i&g;rQBPDThl znh(Wfg^`UVkbWQL&=z6j-beYUf~1*h%P0b)1kG31S>up(Z5qKnF^&4I?}TbqU1yDRt~=A{itDb>r&5&LVf`(P zd-S2pEe#y=E2G=J-{X}gK4O~GXuk$wLZ7LUlbYJl#2TjF?6}*63lSz&m?d3kab~J! zTo`dkHRHk`4pB39Yf@f8p|ns{G_|s7$wHq))RO&9QiT?>uP5atm&-(W)#;+w-6!YS zF0aZg^X5cPTZ?2eRynx~RtAz$?@*I0mp*KCs9nw@YMvtQJO!;z?gy+ADd=?Q4m6~o z%OOh($yD?@M{umkP7-y+b2Zn2nzuQfHBaKOItM zkpq*Sa5_;wi(Di#4P>8mUlzH@yDwM7)I;Y|DRZ&bp(UuDCG+sYw88@HnpRkVJ=4ja zNIqcK`ONr>zDX_Gtj|UQw#(UcWV=Z7FiaZ2QPKx-hLj!!(#5Pb?61aWt%zlZ!myO5(p}Y)JB54@?eLZtknyxBJA~nLph;7LNo@2`Nlr&j@bU zWg&!pFj%3>Qi%8$!TnlJwnpU*UQbPXOJ{4_qm8Xkn;qL4w{>>dke&`Fo~1EDuh9{^I27=`7n~~_`ah^T)b>V8aP5^bdwr-Owbps{tCCGBE*$V@in^8Y VuS4gwxOdiFDV|#pPbvFF`v(IFqF?|3 diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index caeaac5d954baad0556377c2fcd0032dd12b0577..e5bf73aec74037acef0a721ffdc2ad68ec0035a6 100644 GIT binary patch delta 2995 zcmeH|e@s(X6vyvuM8%RqMgEE0#>LX8i+%&?G~A!On$T&-HM@($&cw$2L#w= zhHQUGj~XD5s9}j&U=f}!*`gB@+1x~jhW*Gg6IhlEmzd$g64)}c?`w~LF7c23>1#gs z`_8%No^#*5efPBuMzjq^oO7?V1*q`r6aClUyw~zl*L%Ld#0^KGm*(`1d6W}Oyla4n^He=McCEHvc$l}6oWI_0*-rHXVh zCxkG8+6Xkb)>6g`j^Qmea^%JFsN{4-h;6_J-UWT&BA5j8K*gvex?f^9<_Qs5M-4mU zXyc9;S*I24SRsx1aQ4BuWtrZsh)D4VO5k498HAAdWss%xNt)W3D*Gt9bo-J#B=mxV z;CRGvL9YxtZN?Ogo}px?-I$8I->JfBC)=(V>UFN9Qs_-*Bu(zJQpYX}$+A^+5t7g3JaaC zKpyCwiluUf65RNf%4pD`GD@b5<*su+pI(yXu11o8m&|* zP-&%OZUfC$nrQ&{@g9{XpoJb)NeYM6!QoYAOr#xmV#r-vpDmT)t$^@E2;O20k z&8yN6=(KqaRO~gA!E2>}SC!?VzyYtS>Ag}|S6JA5GDt^Nt7Wpdp3CsaAHYEw< zfl^Ql-UWT&JQxQvKu|$d+G=a05bMA;-~-LzI2Z(1!4#MWu~A(Gl_R^;4a?J`5Dk2w z4RnL^U>rIQok zSQm5lBRr~y?IN!BGFSVQALkxdY3K1J>>uLUoM6pntqyCeFg^_6#QB_fnhRF5e=+-q z*?)lx`MK~IKgcxaTgLvQtjXM;fnC%ee>#-6RfxNsxai?TIPf$NyuzBzPvmDU;t5E$ z_j2MJoG*@7E|L3NIKPGCw(5%dq1l9H#0mf83B<9z5Sl4=o)e6*J;wI8TQeTS-o%%7wYFk)okD5nfDuMb)7>hT?Mh!SeFLTHv_?;xtj!iUbjgq z^q_8q9+6q^k|sJ_ze)<~um9dMi?CRfv4M1uOGg?uMX$r~a^RyI4R097F{NKpD{oe-^zxAJ`7$5bm v|049(2ag%ztK7MFah8b;r)Bb^*(Y3d{WteFt^3z&*6}&xe;x_9UyJw`g90oL delta 3282 zcmeH}ZA_C_6vyvv`#_l;X$8i+RsoB=450!-+?0s4EMp2Xd8-R-;zXHLCx%z4aa#&u zi*UfG(?v5(mI+QMPF-B4Mx8E5!0g2(bJ5Kum`QZgO-*pw|0#!TUzY5{vQIwbcmMaC zd(OG%d7kzbSFhI9t36_$ZJro8-(b5Nt6v{+tj%yQE;(`_aQBa&*Pl85*8BG#EdOj- zf7UKJ5MBP1ZrjpMmuGdR)8LmP;!FaUp04IZQ+{!PTui2-07|f#sI_?7tTbM4l4_I? zzLVk|=Lq35M!)4m$>VB{Vu5{|l5KajGsJAN*yn1agoS=Ci7^EU;lf<}io9rWo3`1) zWf0}rgRx(w-Rhs95yB42L6fEWuTSc6~)+yXi+^1(t-4(dQV{gR)gJd3@z z(#91*lvyxcZuR69%#_L^I1j$tn>Y$;;7CHjWhmJv8q2>}3orV@eA3}FPlS?c#1g$EuC>iL!hPq4A zl}yaG&}d1Nyia|$aB|v=R96}S)zN;NfqF1MwM0iln2+%M0p=6xywpgsWf5ey>*!9Y zfeJAXDKpA=8Z8Z{>@uUqs-wfUFmjd|=?WH|Whh!^Ae|$EE+8=18+Z?a`ICWWhmqV^ zG&^*(++m0F6X@mw*SYXG7k-fw4{+jX)_r_Oqf>XrcU;BxMXs01 zb`Uob$@ZISUFB6t86R0@hI0z z#QF>BCb^t=kOMDqLCJy2l%L}sB1z55;3spAZN-P4sIhir1yMmwyu`sC@FccCF`+|* zUPJHIERur0ubJsxB$Lwyv&0!Cb=2(q#-vA7ATWaj;GoKli~J%`AQn7NeH&j_PNA18 z6tl^yxKMkS$JD!B4s8Bf(hrT(J!7>Y8pVK2U%J{D9Oj*gd1>=-rKAcGCStt5f7z0T zYr{gb)xfFcw7-^JBl%{eYTARblD=rLBL0tt6x!8jpoNXG8f!AGX|&1|+Jn(b!x-n2rYT9LQVPa2 zdKqInbz)pVXPT@sgMP2f>B-xkq>#aFq;|J~V%`7`rCq)fgMI4xq?hP%QQ|c zZP+=(&xLoJfb!Qo-8((L|L(ty{d$AnFsiH9Fy72E4gd3TxJUc=oSgj5JU%Cn@+tE8 zoczDfNj^P3u_*uH>2W?->D-|UIWd;op`J(|%}Lf4wjNvj?uNb9a|*sa?THw=r~Kp5 Ia(TV>PkV+-UH||9 diff --git a/HighWayIot.Repository/domain/RFIDState.cs b/HighWayIot.Repository/domain/RFIDState.cs index a8002d6..64b39bc 100644 --- a/HighWayIot.Repository/domain/RFIDState.cs +++ b/HighWayIot.Repository/domain/RFIDState.cs @@ -14,9 +14,6 @@ namespace HighWayIot.Repository.domain [SugarColumn(ColumnName = "ip")] public string IP { get; set; } - [SugarColumn(ColumnName = "status")] - public bool Status { get; set; } - [SugarColumn(ColumnName = "logtime")] public DateTime LogTime { get; set; } } diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index a5f37172ebbeab7113f01a39b44ebf35beafd46c..f22cd6b532d9b689c172e68a4d7c42597d70dfdb 100644 GIT binary patch delta 2100 zcmZXVe@s2eP{2PffoynTXh3R?)M+91J;3#Cg3Y`Ae5OJ2U3YsDX~O`jQMht zC>56M7O~(2dFrUAVZg@oVW6)F5VAW`mAKES6`mkq-Ex*EUNzfHd=$PE1&F= z^4xG&vfm1t+D@zTmBjO9y|>c2N7WX{E^m&2+~=L+UP=RsyJ+ch)SDRsm7NvjY+R4C zbglqhP;uSH=qmcXM0`|U_bwF>IC^BzZzvIUqsB5nO3@<%C?P9~ zTr7nd3ZRl&M5)(wD!|<^X{Kr!MIox?xs*mZE43l*q>+P#IAtuxd7PCUsdvQA8wSck zG!ead39mzYzKCfc@3{9%$|a96d(gc&jo|%m8uhzB8fx+C7_-Mc*QU`$&ke&$rYP6x z-Zbpnbi!jtOdD@;!*1_hUyAAA1Exu#8al9MtJ#x+8p;)E1ua>o2V1qL+InzIlWOb1 zO--t;7e#Yab@IYoEMii9W|}UlnI?r=l8Zh~v?O^Vt!iG_Ou^sDYHxtHG6jy>cl3HY z&4`%_zotI3QqJ^O#lof^cWF<}_hY4|7Mec;4Vv1_N}}~i;tdbrVV(OK4MqU1ntq3% z8@NrAE5c?vIy9*c>FCn*7s4?!1HBpzN@n0?O-r2yBNMM^s&fP~F{Ei0<+AXGrZUQ9 z;cZQ)+_0IAlL~Y3wWecKn2R4YslCX-VoLt`g7DG9|L^?^B9p0y_NB@UqDIqltT6K<*vyzLEX32(3JbAwI?3F? z{=_?hNfFy*RnUFiZdTBiJVRQ51Ej?`L^==elP+Xk##+mMBSy$y&(1@vE%Z*Sz>_fO zZ0(p~^fsTI5Nm=z`e zpw-NNGy5&%cUq6DQ&`>XceCF^{%)(E{CsQ$5ms1gP7!N0YZGgnb%=F>6*kXgt!8avjk6Bft5tf0VS*J7 z7qC{dHnGN8hge5gCs^U3`SM0qam+{m(gVKL^bS1WTg&86qLTlv8poY<7v{1IzXRCgC0wdJe1w&DWynYuDq7rl4#0#FfHJW z?fZ84r*|0pD%tPFM=BEY@xA=zK*Np{<7jg`I__#M}G6w$xnW&|1|bQ wl^ieIka0nOz*WgFDlQrbkzV<$7^w980~NcIXaE2J delta 2151 zcmZXV3v3is6o&t~cV>2H+ith-H+I=}+pQEK5X-Z)vPkAG-;zIfFXu#qY#y}7zn7Sgv3CAga%t7YGNWjg3ohLM^bc>`_K9QbI-kJ z@9ylxnq$rT`t&D@za1Ian=jf{4jg^Lo4*ox40J_+%W}YIVQ;oP* z5I<|YqUFpGJG?ZhY^IPqouD)Tcwo1<`s*p1^>5Y*rm|(TJC@RNF|`5JI_CS3?bN8J zE065r@~mLjR0GRsY6rFHDURjY74A9t)v7lCzS?_>*t^|D)_m$E&;<h<+xPXX0BWPVn8f$1gL&J1N8r=i&g;rQBPDThl znh(Wfg^`UVkbWQL&=z6j-beYUf~1*h%P0b)1kG31S>up(Z5qKnF^&4I?}TbqU1yDRt~=A{itDb>r&5&LVf`(P zd-S2pEe#y=E2G=J-{X}gK4O~GXuk$wLZ7LUlbYJl#2TjF?6}*63lSz&m?d3kab~J! zTo`dkHRHk`4pB39Yf@f8p|ns{G_|s7$wHq))RO&9QiT?>uP5atm&-(W)#;+w-6!YS zF0aZg^X5cPTZ?2eRynx~RtAz$?@*I0mp*KCs9nw@YMvtQJO!;z?gy+ADd=?Q4m6~o z%OOh($yD?@M{umkP7-y+b2Zn2nzuQfHBaKOItM zkpq*Sa5_;wi(Di#4P>8mUlzH@yDwM7)I;Y|DRZ&bp(UuDCG+sYw88@HnpRkVJ=4ja zNIqcK`ONr>zDX_Gtj|UQw#(UcWV=Z7FiaZ2QPKx-hLj!!(#5Pb?61aWt%zlZ!myO5(p}Y)JB54@?eLZtknyxBJA~nLph;7LNo@2`Nlr&j@bU zWg&!pFj%3>Qi%8$!TnlJwnpU*UQbPXOJ{4_qm8Xkn;qL4w{>>dke&`Fo~1EDuh9{^I27=`7n~~_`ah^T)b>V8aP5^bdwr-Owbps{tCCGBE*$V@in^8Y VuS4gwxOdiFDV|#pPbvFF`v(IFqF?|3 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index caeaac5d954baad0556377c2fcd0032dd12b0577..e5bf73aec74037acef0a721ffdc2ad68ec0035a6 100644 GIT binary patch delta 2995 zcmeH|e@s(X6vyvuM8%RqMgEE0#>LX8i+%&?G~A!On$T&-HM@($&cw$2L#w= zhHQUGj~XD5s9}j&U=f}!*`gB@+1x~jhW*Gg6IhlEmzd$g64)}c?`w~LF7c23>1#gs z`_8%No^#*5efPBuMzjq^oO7?V1*q`r6aClUyw~zl*L%Ld#0^KGm*(`1d6W}Oyla4n^He=McCEHvc$l}6oWI_0*-rHXVh zCxkG8+6Xkb)>6g`j^Qmea^%JFsN{4-h;6_J-UWT&BA5j8K*gvex?f^9<_Qs5M-4mU zXyc9;S*I24SRsx1aQ4BuWtrZsh)D4VO5k498HAAdWss%xNt)W3D*Gt9bo-J#B=mxV z;CRGvL9YxtZN?Ogo}px?-I$8I->JfBC)=(V>UFN9Qs_-*Bu(zJQpYX}$+A^+5t7g3JaaC zKpyCwiluUf65RNf%4pD`GD@b5<*su+pI(yXu11o8m&|* zP-&%OZUfC$nrQ&{@g9{XpoJb)NeYM6!QoYAOr#xmV#r-vpDmT)t$^@E2;O20k z&8yN6=(KqaRO~gA!E2>}SC!?VzyYtS>Ag}|S6JA5GDt^Nt7Wpdp3CsaAHYEw< zfl^Ql-UWT&JQxQvKu|$d+G=a05bMA;-~-LzI2Z(1!4#MWu~A(Gl_R^;4a?J`5Dk2w z4RnL^U>rIQok zSQm5lBRr~y?IN!BGFSVQALkxdY3K1J>>uLUoM6pntqyCeFg^_6#QB_fnhRF5e=+-q z*?)lx`MK~IKgcxaTgLvQtjXM;fnC%ee>#-6RfxNsxai?TIPf$NyuzBzPvmDU;t5E$ z_j2MJoG*@7E|L3NIKPGCw(5%dq1l9H#0mf83B<9z5Sl4=o)e6*J;wI8TQeTS-o%%7wYFk)okD5nfDuMb)7>hT?Mh!SeFLTHv_?;xtj!iUbjgq z^q_8q9+6q^k|sJ_ze)<~um9dMi?CRfv4M1uOGg?uMX$r~a^RyI4R097F{NKpD{oe-^zxAJ`7$5bm v|049(2ag%ztK7MFah8b;r)Bb^*(Y3d{WteFt^3z&*6}&xe;x_9UyJw`g90oL delta 3282 zcmeH}ZA_C_6vyvv`#_l;X$8i+RsoB=450!-+?0s4EMp2Xd8-R-;zXHLCx%z4aa#&u zi*UfG(?v5(mI+QMPF-B4Mx8E5!0g2(bJ5Kum`QZgO-*pw|0#!TUzY5{vQIwbcmMaC zd(OG%d7kzbSFhI9t36_$ZJro8-(b5Nt6v{+tj%yQE;(`_aQBa&*Pl85*8BG#EdOj- zf7UKJ5MBP1ZrjpMmuGdR)8LmP;!FaUp04IZQ+{!PTui2-07|f#sI_?7tTbM4l4_I? zzLVk|=Lq35M!)4m$>VB{Vu5{|l5KajGsJAN*yn1agoS=Ci7^EU;lf<}io9rWo3`1) zWf0}rgRx(w-Rhs95yB42L6fEWuTSc6~)+yXi+^1(t-4(dQV{gR)gJd3@z z(#91*lvyxcZuR69%#_L^I1j$tn>Y$;;7CHjWhmJv8q2>}3orV@eA3}FPlS?c#1g$EuC>iL!hPq4A zl}yaG&}d1Nyia|$aB|v=R96}S)zN;NfqF1MwM0iln2+%M0p=6xywpgsWf5ey>*!9Y zfeJAXDKpA=8Z8Z{>@uUqs-wfUFmjd|=?WH|Whh!^Ae|$EE+8=18+Z?a`ICWWhmqV^ zG&^*(++m0F6X@mw*SYXG7k-fw4{+jX)_r_Oqf>XrcU;BxMXs01 zb`Uob$@ZISUFB6t86R0@hI0z z#QF>BCb^t=kOMDqLCJy2l%L}sB1z55;3spAZN-P4sIhir1yMmwyu`sC@FccCF`+|* zUPJHIERur0ubJsxB$Lwyv&0!Cb=2(q#-vA7ATWaj;GoKli~J%`AQn7NeH&j_PNA18 z6tl^yxKMkS$JD!B4s8Bf(hrT(J!7>Y8pVK2U%J{D9Oj*gd1>=-rKAcGCStt5f7z0T zYr{gb)xfFcw7-^JBl%{eYTARblD=rLBL0tt6x!8jpoNXG8f!AGX|&1|+Jn(b!x-n2rYT9LQVPa2 zdKqInbz)pVXPT@sgMP2f>B-xkq>#aFq;|J~V%`7`rCq)fgMI4xq?hP%QQ|c zZP+=(&xLoJfb!Qo-8((L|L(ty{d$AnFsiH9Fy72E4gd3TxJUc=oSgj5JU%Cn@+tE8 zoczDfNj^P3u_*uH>2W?->D-|UIWd;op`J(|%}Lf4wjNvj?uNb9a|*sa?THw=r~Kp5 Ia(TV>PkV+-UH||9 diff --git a/HighWayIot.TouchSocket/BufferAnalysis.cs b/HighWayIot.TouchSocket/BufferAnalysis.cs index ba80751..8408001 100644 --- a/HighWayIot.TouchSocket/BufferAnalysis.cs +++ b/HighWayIot.TouchSocket/BufferAnalysis.cs @@ -45,7 +45,6 @@ namespace HighWayIot.TouchSocket RFIDState rFIDState = new RFIDState() { IP = ip, - Status = true, LogTime = DateTime.Now, }; sql.AddStateInfo(rFIDState); diff --git a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj index 0f47b99..8de118c 100644 --- a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj +++ b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj @@ -54,7 +54,7 @@ - + diff --git a/HighWayIot.TouchSocket/TcpServer.cs b/HighWayIot.TouchSocket/TcpClient.cs similarity index 66% rename from HighWayIot.TouchSocket/TcpServer.cs rename to HighWayIot.TouchSocket/TcpClient.cs index 057986a..c35bb09 100644 --- a/HighWayIot.TouchSocket/TcpServer.cs +++ b/HighWayIot.TouchSocket/TcpClient.cs @@ -11,47 +11,45 @@ using TouchSocket.Sockets; namespace HighWayIot.TouchSocket { - public class TcpServer + public class TcpClient { - private static readonly Lazy lazy = new Lazy(() => new TcpServer()); - public static TcpServer Instance => lazy.Value; private static LogHelper logHelper = LogHelper.Instance; - public ServerState State + public bool State { - get => service.ServerState; + get => client.Online; private set => State = value; } - TcpService service = new TcpService(); + global::TouchSocket.Sockets.TcpClient client = new global::TouchSocket.Sockets.TcpClient(); - public bool ServerStart(string ip, string port) + public bool ClientStart(string ip, string port) { try { - service.Connecting = (client, e) => + client.Connecting = (client, e) => { - logHelper.Info($"客户端{client.IP}正在连接"); + logHelper.Info($"正在连接 {client.IP} 客户端"); return EasyTask.CompletedTask; };//有客户端正在连接 - service.Connected = (client, e) => + client.Connected = (client, e) => { - logHelper.Info($"客户端{client.IP}成功连接"); + logHelper.Info($"成功连接 {client.IP} 客户端"); return EasyTask.CompletedTask; };//有客户端成功连接 - service.Disconnecting = (client, e) => + client.Disconnecting = (client, e) => { - logHelper.Info($"客户端{client.IP}正在断开连接"); + logHelper.Info($"正在断开连接 {client.IP} 客户端"); return EasyTask.CompletedTask; };//有客户端正在断开连接，只有当主动断开时才有效。 - service.Disconnected = (client, e) => + client.Disconnected = (client, e) => { - logHelper.Info($"客户端{client.IP}断开连接"); + logHelper.Info($"断开连接 {client.IP} 客户端"); return EasyTask.CompletedTask; };//有客户端断开连接 - service.Received = (client, e) => + client.Received = (client, e) => { ////从客户端收到信息 //var mes = Encoding.ASCII.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len @@ -62,18 +60,8 @@ namespace HighWayIot.TouchSocket return EasyTask.CompletedTask; }; - service.Setup(new TouchSocketConfig()//载入配置 - .SetListenOptions(option => - { - option.Add(new TcpListenOption() - { - IpHost = ip + ":" + port, - Name = "Server",//名称用于区分监听 - ServiceSslOption = null,//可以针对当前监听，单独启用ssl加密 - Adapter = () => new NormalDataHandlingAdapter(),//可以单独对当前地址监听，配置适配器 - //还有其他可配置项，都是单独对当前地址有效。 - }); - }) + client.Setup(new TouchSocketConfig()//载入配置 + .SetRemoteIPHost($"{ip}:{port}") .ConfigureContainer(a =>//容器的配置顺序应该在最前面 { a.AddConsoleLogger();//添加一个控制台日志注入（注意：在maui中控制台日志不可用） @@ -82,7 +70,7 @@ namespace HighWayIot.TouchSocket { //a.Add();//此处可以添加插件 })); - service.Start();//启动 + client.Connect();//启动 logHelper.Info("监听服务启动成功"); return true; } @@ -93,11 +81,11 @@ namespace HighWayIot.TouchSocket } } - public bool ServerStop() + public bool ClientStop() { try { - service.Stop(); + client.Close(); logHelper.Info("监听服务关闭成功！"); return true; } @@ -108,11 +96,11 @@ namespace HighWayIot.TouchSocket } } - public bool ServerDispose() + public bool ClientDispose() { try { - service.Dispose(); + client.Dispose(); logHelper.Info("监听服务释放成功！"); return true; } diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll index 1c9c164abe74ecfaf8473ca30cae2ebb5d7e643f..34a453b62cd8cf9206db5fed10e0a85b8c39aabf 100644 GIT binary patch delta 2076 zcmb7FU2GIp6h8B_cV~ZEJG5+JOI_M^x6_?%Z7bLoTBsnP7&cKU? z-6cd*5~AJQgqX;qiC{?lSxq1sBZ)8i04Bbm0ve+~!(yB4usy2`xX_MNgC>c@I7Uiv4qA;(Ap$H4|2c?rCs%z6JrV?pHCb@Vq z99A8LXdhn;--2g54**(?fKj7+5Dcl#{M!)+8n9M{n}k}eQ;0t#9cIT(##7P_lBt_P zOTof6PlLfaj5on)xpcY0WLX2y5}Wm89+iiy17t5GGvJ_-eR$L0lC@B%l*lw{w^bXa zVd~rlHLF*L&2Y;{ZWbV=@fJKNr8=nQuKIbaPa~C2W5YIo*rz+obRO$?e4EeD?E-K2 zXfwb&e0|{Wbh1nQ5sxmnd5QER)b*A;oBOOz?*Bi^yRYgTw0YnEC=i3NRF;bVD&kt8 zdFi7Pv4~B0M^m08zX-5FTn=+ zoV?@4BJrb9w@O~WnprIp?4FiG#O}G2QNx+R%iguD2xTMKMGc}bh!ci$!&5|WsIF38 z+m;H$2`DmH>bA#BFBoPDrVORQN6##V5tt zh~51rZbdQ&7MGz5^Pe2q@4UEo(v@rWEX3jAgOVH_p;K`p3@9bnjSgV?=~I!4u2d#V zJELQI{tIlH=ooz#snTlbX0nXFjn-;0s>f%T=(PnGLyY2-_E2%bPoV}aP8}XPW}H=1 zKr70T#tH2fBG-H9kny3Gfwrxz(e`M&R!3E7FDK0yXQ-a`=Y2S>NqE6ShwxX>snyfl z_`cs>K0&8FR9-$om*=3Xb0Yun&|wtPt0gFF$t;Iyhz7I<+TkNp8P$?>TpouMTLDw_ zjW3>5CbTB{&PQCC1p3)WN0q&rMKeB9=z!Ktzj>(Kr)Ik8Ypax(q4k&Q=bceX7pt#m zm8=DYg6w*78rKDpJ&N$qu{- zc9)P4nqXudf)DcO12vc!R~|4*zz2V#@mYg51``PhN2q!!TnN&J)na6pC<52x>NAsyr=3 zD@>+hhP{J$3mEuOxecNH=gA6FZPNf--2o+4Ks0(RMA>>WLwUq^5F0fvSUc;h$kgK7 zVw$O$3U327rNneoZ~w$;2e4$G!-Fg-k635L&z}rvTv0$H;Vkb6=q{fwz>mkz4|rrc z`;<lb>of6a@8Y*6=mqDGGxUE#mOd!*>{sP)1B5g;02u?Q8H%-oxy z)Z}6A zSI_WHA7m&|XVqB)+3t6T!*vDB20}vjDmH4Rk5xjN zGZ+$#tf{ma$Q|>H!e;xlnPG3Q(DEVXnGZ*-*F=K;4ZyA{$e|wkfXr-^oFUk}DSBeM zbU)@~;2k*lpbBT}SyD3zX9vVgnq+$?gmeZ&k#KOK>dYWetV1RA9U(;%O=5~P zcEMWVyRq_NEVY6Bf{?|_K;?TN$~-Fk+w(vW(&#nfi$_3M(vd2hlHZNEq$4qLph(w# z5et6_3t9OQ==jT?T+R2oZyAZISAeYI9GLTcLcvGfOGdWmoI#WtLwp#eZcI;V@KApL zfqf1_rrvs#9(%3AVSMis()xe~wn8S08h&T{^Fry_>1Y18|gxeXX?36(iIQ+?vwP}edx}8miIh# z9Dyv8leEwlryQsCG$1$8>j5&^kes6TZB#`lbAT3I3zQRVL~fz$0pe^Q(5(QSVh3cK zZU>0bVY!w5@{oT|twi{WGgq=Vpxacgsk+4E5u>L3ZS1BT?W1w(qwi^g?y&L~@ek%y zc8y=$dNnk!|KvpJ?GMk}*UCrJKPWZhtKa!moP+-;dKJGj1Ngc7v#H8kb*n!8vZQag xtPHoTyLaJt_gr>MMH+9m=})iwcea6bmK)k`u=1STU0Hg5N!jeY%}O2Ne*hkSS?T}) diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb index fffd3bd95fb3684bea4e92e0e2ac663bcc2613d0..2e74317150cce782fc9d6d732027c78a76eb8a9c 100644 GIT binary patch delta 1460 zcmds%T})eL7{}k|z$xqOW@{ZC9&tlL3N}Iu1;W-+O5Fx_htgI)5=6HUq=PM{P~tvZ z=#rshOBUv1EXxujPPZk~YZ zV3eYKKR80KvfkQE*Lb@1Dz)&lAva`C=uM3ML+CDg`65nUZF6otU4dHag~--`4V-V= zfngkBZE6>MvhLkr2^a)r-M{|!Fk20_ntehbazz^$2JvOvO+F9G{Qaig10t5~1tZ`v z_#F6(8Bc>U|D+InJ#3xYgV;2Dd%-hi>@2ts_BpTve9QE|19rmBftWY@J{ScroAD1p z9rhKl3tR+a;4QEl`~sBo+&1~OT&i5mw{XOTIC~ho@gfqAfYLt>z65&$d>L_@BE%@{ zE#Mfq4Lr<~?FM$fCZbim1|L$zQE(G@40M9WK^J&}ha)?1KFfa1crS8#vodSpt?@Dr zbqy;E8|rGRn7`~gsH~fj*f2SGzIQt>#zrVm(1P6q)LzhT9kTG}-95MuGNUR!Ksuj_ z_t7kWACJ)j*Cb-J&c`4fybKxOrKHCGq}|$%^OpD2%JDuYA4pbXjG1IJ>BdrWNTKA$ zM7=|lgVqQ8kKP#NjLyD@hMSchcUdY?XsN>I$4gQC(zvE3aP=RNA$72zEls#o`5bHv z4bQ+gp~+`3p{X_%=ODeRe0c>8?`t0MeqKa;%pycpq1P-sG8zhza$QQrQNp#EC)5De zZ((1?g`GH+(bOnxMcS(VPoz8v4Og$wp#IzB3FSDS@emp1lMn1xl4pfRhU1OD6!ZTw rbM(>wSEZMJQnsJZ|9(T3e>X5{zrXO2KJ(SysntY>Zan$!y^_BHHtCL5 delta 1458 zcmds%ZA@EL7{||Z;g(&5SyrUfD{fOsA&tZP z>k?7f5)<|$gT-WkW}C@0LGK3>6EFldYqCUGqR|h&B)a%viteMyeEFYJ{p@E?a-QGw za^9YM&U14&mE28bxzD`k_9wNM?~NMoe16oO&EI(L#>TgEyZ)GQ_Ui4=+{%6x^1kn% zrw?}ZmH)Sa51T7Xy&aXBQSC67P>SoD?36M>O;Mtgywp5KS=O9mG|dxEJLDy22mQuh zI1Q@i8P}tb@42kh%CqiKZg4ly2uIv@+lVRz2_b4kN!77ZA(qh}ft|&;^R&oyEq2HQ zEzPvTQ!T6{O+47UkH2r;!G}G2D9z)Z1kRH8IJA=`aw!rOyy>y9*=xpu_Ie#SO2~T$ z+i$k&{6uRO8*jGG(V}s@?K){m)Al4wVUn}mOlia49xfp_&vv#!<~y&EgD1M|ke9j! zD9X3H#^?nOb+^$nPj_D<7^c><8ue!$ms=1`v;fK`;d# z0G}-R z22;xVwz_ewl-CE3DqF=!I7K#Iir4Z=c#MJtt!pSj{RM6HxQRa;it%G{8`nn?6yvjz zVVdW!BVk(S#v@_c;?s~e&O-)yEvmC8YS#L3+wzra92vH7GTML_H4|;4n6VZeRVcB& zO?;FVpbf+RJsze7RLiP$t#GbQ4RHlS@T?#(UFLhTT&{vGH%K|s0ML< z6T322e223cU5&z4q^-vOiPR;a;Q}>Hl0C_~^6Q^3ZDOQ}%&-@BU&ubos}!zX9evjpP6T diff --git a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e9f9c8e600c790ea0c130b6c35ef16c94280e339..169b85856f89299b9b90da519cd3298ac4f51968 100644 GIT binary patch delta 39 tcmaE7Imc?l0v<;5$qTu41riGi^pf-Q(lXQ8q!<_&Y(RpW@A3!=000ur40r$l delta 43 xcmbPZ_0Dp`0v<+%$qTu~1QH7h^pf-Q(lXQ8q!<_&R6&B14TL#13-fXc0022G3@HEr diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index b0e6cb62c5a107d56f261ba5b7cce25f6074de24..91c3f93e99622d2c4702d33818c0e409d1faa78f 100644 GIT binary patch delta 93 zcmdmdhVh6G2OFaR0|Nu2=j4TfiW@bpnRr6Q7wu{hy2HW9$S68F&_Hx^E7KF!$qqs+ wldUCuC+n+DnHnUl<%L8zi0rL7kE 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 diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll index 1c9c164abe74ecfaf8473ca30cae2ebb5d7e643f..34a453b62cd8cf9206db5fed10e0a85b8c39aabf 100644 GIT binary patch delta 2076 zcmb7FU2GIp6h8B_cV~ZEJG5+JOI_M^x6_?%Z7bLoTBsnP7&cKU? z-6cd*5~AJQgqX;qiC{?lSxq1sBZ)8i04Bbm0ve+~!(yB4usy2`xX_MNgC>c@I7Uiv4qA;(Ap$H4|2c?rCs%z6JrV?pHCb@Vq z99A8LXdhn;--2g54**(?fKj7+5Dcl#{M!)+8n9M{n}k}eQ;0t#9cIT(##7P_lBt_P zOTof6PlLfaj5on)xpcY0WLX2y5}Wm89+iiy17t5GGvJ_-eR$L0lC@B%l*lw{w^bXa zVd~rlHLF*L&2Y;{ZWbV=@fJKNr8=nQuKIbaPa~C2W5YIo*rz+obRO$?e4EeD?E-K2 zXfwb&e0|{Wbh1nQ5sxmnd5QER)b*A;oBOOz?*Bi^yRYgTw0YnEC=i3NRF;bVD&kt8 zdFi7Pv4~B0M^m08zX-5FTn=+ zoV?@4BJrb9w@O~WnprIp?4FiG#O}G2QNx+R%iguD2xTMKMGc}bh!ci$!&5|WsIF38 z+m;H$2`DmH>bA#BFBoPDrVORQN6##V5tt zh~51rZbdQ&7MGz5^Pe2q@4UEo(v@rWEX3jAgOVH_p;K`p3@9bnjSgV?=~I!4u2d#V zJELQI{tIlH=ooz#snTlbX0nXFjn-;0s>f%T=(PnGLyY2-_E2%bPoV}aP8}XPW}H=1 zKr70T#tH2fBG-H9kny3Gfwrxz(e`M&R!3E7FDK0yXQ-a`=Y2S>NqE6ShwxX>snyfl z_`cs>K0&8FR9-$om*=3Xb0Yun&|wtPt0gFF$t;Iyhz7I<+TkNp8P$?>TpouMTLDw_ zjW3>5CbTB{&PQCC1p3)WN0q&rMKeB9=z!Ktzj>(Kr)Ik8Ypax(q4k&Q=bceX7pt#m zm8=DYg6w*78rKDpJ&N$qu{- zc9)P4nqXudf)DcO12vc!R~|4*zz2V#@mYg51``PhN2q!!TnN&J)na6pC<52x>NAsyr=3 zD@>+hhP{J$3mEuOxecNH=gA6FZPNf--2o+4Ks0(RMA>>WLwUq^5F0fvSUc;h$kgK7 zVw$O$3U327rNneoZ~w$;2e4$G!-Fg-k635L&z}rvTv0$H;Vkb6=q{fwz>mkz4|rrc z`;<lb>of6a@8Y*6=mqDGGxUE#mOd!*>{sP)1B5g;02u?Q8H%-oxy z)Z}6A zSI_WHA7m&|XVqB)+3t6T!*vDB20}vjDmH4Rk5xjN zGZ+$#tf{ma$Q|>H!e;xlnPG3Q(DEVXnGZ*-*F=K;4ZyA{$e|wkfXr-^oFUk}DSBeM zbU)@~;2k*lpbBT}SyD3zX9vVgnq+$?gmeZ&k#KOK>dYWetV1RA9U(;%O=5~P zcEMWVyRq_NEVY6Bf{?|_K;?TN$~-Fk+w(vW(&#nfi$_3M(vd2hlHZNEq$4qLph(w# z5et6_3t9OQ==jT?T+R2oZyAZISAeYI9GLTcLcvGfOGdWmoI#WtLwp#eZcI;V@KApL zfqf1_rrvs#9(%3AVSMis()xe~wn8S08h&T{^Fry_>1Y18|gxeXX?36(iIQ+?vwP}edx}8miIh# z9Dyv8leEwlryQsCG$1$8>j5&^kes6TZB#`lbAT3I3zQRVL~fz$0pe^Q(5(QSVh3cK zZU>0bVY!w5@{oT|twi{WGgq=Vpxacgsk+4E5u>L3ZS1BT?W1w(qwi^g?y&L~@ek%y zc8y=$dNnk!|KvpJ?GMk}*UCrJKPWZhtKa!moP+-;dKJGj1Ngc7v#H8kb*n!8vZQag xtPHoTyLaJt_gr>MMH+9m=})iwcea6bmK)k`u=1STU0Hg5N!jeY%}O2Ne*hkSS?T}) diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb index fffd3bd95fb3684bea4e92e0e2ac663bcc2613d0..2e74317150cce782fc9d6d732027c78a76eb8a9c 100644 GIT binary patch delta 1460 zcmds%T})eL7{}k|z$xqOW@{ZC9&tlL3N}Iu1;W-+O5Fx_htgI)5=6HUq=PM{P~tvZ z=#rshOBUv1EXxujPPZk~YZ zV3eYKKR80KvfkQE*Lb@1Dz)&lAva`C=uM3ML+CDg`65nUZF6otU4dHag~--`4V-V= zfngkBZE6>MvhLkr2^a)r-M{|!Fk20_ntehbazz^$2JvOvO+F9G{Qaig10t5~1tZ`v z_#F6(8Bc>U|D+InJ#3xYgV;2Dd%-hi>@2ts_BpTve9QE|19rmBftWY@J{ScroAD1p z9rhKl3tR+a;4QEl`~sBo+&1~OT&i5mw{XOTIC~ho@gfqAfYLt>z65&$d>L_@BE%@{ zE#Mfq4Lr<~?FM$fCZbim1|L$zQE(G@40M9WK^J&}ha)?1KFfa1crS8#vodSpt?@Dr zbqy;E8|rGRn7`~gsH~fj*f2SGzIQt>#zrVm(1P6q)LzhT9kTG}-95MuGNUR!Ksuj_ z_t7kWACJ)j*Cb-J&c`4fybKxOrKHCGq}|$%^OpD2%JDuYA4pbXjG1IJ>BdrWNTKA$ zM7=|lgVqQ8kKP#NjLyD@hMSchcUdY?XsN>I$4gQC(zvE3aP=RNA$72zEls#o`5bHv z4bQ+gp~+`3p{X_%=ODeRe0c>8?`t0MeqKa;%pycpq1P-sG8zhza$QQrQNp#EC)5De zZ((1?g`GH+(bOnxMcS(VPoz8v4Og$wp#IzB3FSDS@emp1lMn1xl4pfRhU1OD6!ZTw rbM(>wSEZMJQnsJZ|9(T3e>X5{zrXO2KJ(SysntY>Zan$!y^_BHHtCL5 delta 1458 zcmds%ZA@EL7{||Z;g(&5SyrUfD{fOsA&tZP z>k?7f5)<|$gT-WkW}C@0LGK3>6EFldYqCUGqR|h&B)a%viteMyeEFYJ{p@E?a-QGw za^9YM&U14&mE28bxzD`k_9wNM?~NMoe16oO&EI(L#>TgEyZ)GQ_Ui4=+{%6x^1kn% zrw?}ZmH)Sa51T7Xy&aXBQSC67P>SoD?36M>O;Mtgywp5KS=O9mG|dxEJLDy22mQuh zI1Q@i8P}tb@42kh%CqiKZg4ly2uIv@+lVRz2_b4kN!77ZA(qh}ft|&;^R&oyEq2HQ zEzPvTQ!T6{O+47UkH2r;!G}G2D9z)Z1kRH8IJA=`aw!rOyy>y9*=xpu_Ie#SO2~T$ z+i$k&{6uRO8*jGG(V}s@?K){m)Al4wVUn}mOlia49xfp_&vv#!<~y&EgD1M|ke9j! zD9X3H#^?nOb+^$nPj_D<7^c><8ue!$ms=1`v;fK`;d# z0G}-R z22;xVwz_ewl-CE3DqF=!I7K#Iir4Z=c#MJtt!pSj{RM6HxQRa;it%G{8`nn?6yvjz zVVdW!BVk(S#v@_c;?s~e&O-)yEvmC8YS#L3+wzra92vH7GTML_H4|;4n6VZeRVcB& zO?;FVpbf+RJsze7RLiP$t#GbQ4RHlS@T?#(UFLhTT&{vGH%K|s0ML< z6T322e223cU5&z4q^-vOiPR;a;Q}>Hl0C_~^6Q^3ZDOQ}%&-@BU&ubos}!zX9evjpP6T diff --git a/RFIDSocket/DataAnalysis.cs b/RFIDSocket/DataAnalysis.cs index ba70014..5a9678b 100644 --- a/RFIDSocket/DataAnalysis.cs +++ b/RFIDSocket/DataAnalysis.cs @@ -17,49 +17,62 @@ namespace RFIDSocket public static DataAnalysis Instance => lazy.Value; public List rFIDContents = new List(); + public List NearContents = new List(); public List rFIDHeartbeats = new List(); public List HeartbeatsState = new List(); public List rFIDStates = new List(); public List AlarmState = new List(); + BaseContentServiceImpl baseContentServiceImpl = new BaseContentServiceImpl(); + BaseHeartbeatServiceImpl baseHeartbeatServiceImpl = new BaseHeartbeatServiceImpl(); + BaseStateServiceImpl baseStateServiceImpl = new BaseStateServiceImpl(); public void GetData() { - //BaseContentServiceImpl baseContentServiceImpl = new BaseContentServiceImpl(); - //BaseHeartbeatServiceImpl baseHeartbeatServiceImpl = new BaseHeartbeatServiceImpl(); - //BaseStateServiceImpl baseStateServiceImpl = new BaseStateServiceImpl(); - //rFIDContents = baseContentServiceImpl.GetContentInfos().Reverse().Take(200).ToList(); + rFIDContents = baseContentServiceImpl.GetContentInfos(); - //rFIDStates = baseStateServiceImpl.GetStateInfos(); + NearContents = rFIDContents.Reverse().Take(200).ToList(); - //var StateGroup = rFIDStates.GroupBy(x => x.DeviceNo); + rFIDStates = baseStateServiceImpl.GetStateInfos(); - //AlarmState.Clear(); + var StateGroup = rFIDStates.GroupBy(x => x.IP); - //foreach(var a in StateGroup) - //{ - // var b = a.LastOrDefault(); - // if (b.DeviceState) - // { - // AlarmState.Add(b); - // } - //} + AlarmState.Clear(); - //rFIDHeartbeats = baseHeartbeatServiceImpl.GetHeartbeatInfos(); + foreach (var a in StateGroup) + { + var b = a.LastOrDefault(); + if (b.LogTime > rFIDContents.Where(x => x.IP == b.IP).LastOrDefault().LogTime) + { + AlarmState.Add(b); + } + } + + rFIDHeartbeats = baseHeartbeatServiceImpl.GetHeartbeatInfos(); - //var HeartBeatGroup = rFIDHeartbeats.GroupBy(x => x.DeviceNo); + var HeartBeatGroup = rFIDHeartbeats.GroupBy(x => x.IP); - //HeartbeatsState.Clear(); + HeartbeatsState.Clear(); + + foreach (var a in HeartBeatGroup) + { + var b = a.LastOrDefault(); + if (DateTime.Now - b.BeatTime > TimeSpan.FromSeconds(10)) + { + HeartbeatsState.Add(b); + } + } + } - //foreach (var a in HeartBeatGroup) - //{ - // var b = a.LastOrDefault(); - // if (DateTime.Now - b.BeatTime > TimeSpan.FromSeconds(10)) - // { - // b.TimeSpan = SecondToTime(Convert.ToInt32((DateTime.Now - b.BeatTime).TotalSeconds)); - // HeartbeatsState.Add(b); - // } - //} + public List GetAllIP() + { + var groups = baseContentServiceImpl.GetContentInfos().GroupBy(x => x.IP); + List result = new List(); + foreach (var group in groups) + { + result.Add(group.Key); + } + return result; } private string SecondToTime(int t) diff --git a/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource b/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource new file mode 100644 index 0000000..6aeca0b --- /dev/null +++ b/RFIDSocket/Properties/DataSources/HighWayIot.Repository.domain.RFIDContent.datasource @@ -0,0 +1,10 @@ + + + + HighWayIot.Repository.domain.RFIDContent, HighWayIot.Repository, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/RFIDSocket/RFIDLog.Designer.cs b/RFIDSocket/RFIDLog.Designer.cs index 5c88deb..b40aeed 100644 --- a/RFIDSocket/RFIDLog.Designer.cs +++ b/RFIDSocket/RFIDLog.Designer.cs @@ -32,28 +32,57 @@ this.StartTime = new System.Windows.Forms.DateTimePicker(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.EndTime = new System.Windows.Forms.DateTimePicker(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.ReadKind = new System.Windows.Forms.ComboBox(); - this.ReadKindSelect = new System.Windows.Forms.Button(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.DeviceNo = new System.Windows.Forms.TextBox(); - this.DeviceNoSelect = new System.Windows.Forms.Button(); this.LogContent = new System.Windows.Forms.DataGridView(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.Content = new System.Windows.Forms.TextBox(); - this.ContentSelect = new System.Windows.Forms.Button(); + this.SelectByCondition = new System.Windows.Forms.Button(); + this.ShortCount = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.MultiCount = new System.Windows.Forms.Label(); + this.NearCount = new System.Windows.Forms.Label(); + this.NoReadCount = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.WarningCount = new System.Windows.Forms.Label(); + this.NormalCount = new System.Windows.Forms.Label(); + this.TotalCount = new System.Windows.Forms.Label(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.label8 = new System.Windows.Forms.Label(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.label7 = new System.Windows.Forms.Label(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.label6 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label1 = new System.Windows.Forms.Label(); + this.MinLength = new System.Windows.Forms.TextBox(); + this.MaxLength = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.MaxInterval = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.MinInterval = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.StatusText = new System.Windows.Forms.ComboBox(); + this.TipsText = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); + this.SNText = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.EPCText = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); this.SelectAll = new System.Windows.Forms.Button(); + this.label16 = new System.Windows.Forms.Label(); + this.AllAddress = new System.Windows.Forms.ComboBox(); this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.LogContent)).BeginInit(); - this.groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // TimeSelect // this.TimeSelect.Location = new System.Drawing.Point(56, 95); - this.TimeSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TimeSelect.Margin = new System.Windows.Forms.Padding(4); this.TimeSelect.Name = "TimeSelect"; this.TimeSelect.Size = new System.Drawing.Size(163, 60); this.TimeSelect.TabIndex = 0; @@ -66,7 +95,7 @@ this.StartTime.CustomFormat = "yyyy-MM-dd hh:mm:ss"; this.StartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.StartTime.Location = new System.Drawing.Point(33, 25); - this.StartTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.StartTime.Margin = new System.Windows.Forms.Padding(4); this.StartTime.Name = "StartTime"; this.StartTime.Size = new System.Drawing.Size(209, 25); this.StartTime.TabIndex = 1; @@ -76,10 +105,10 @@ this.groupBox1.Controls.Add(this.EndTime); this.groupBox1.Controls.Add(this.StartTime); this.groupBox1.Controls.Add(this.TimeSelect); - this.groupBox1.Location = new System.Drawing.Point(16, 15); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Location = new System.Drawing.Point(13, 66); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); this.groupBox1.Size = new System.Drawing.Size(277, 164); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; @@ -90,154 +119,427 @@ this.EndTime.CustomFormat = "yyyy-MM-dd hh:mm:ss"; this.EndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.EndTime.Location = new System.Drawing.Point(33, 61); - this.EndTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.EndTime.Margin = new System.Windows.Forms.Padding(4); this.EndTime.Name = "EndTime"; this.EndTime.Size = new System.Drawing.Size(209, 25); this.EndTime.TabIndex = 2; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.ReadKind); - this.groupBox2.Controls.Add(this.ReadKindSelect); - this.groupBox2.Location = new System.Drawing.Point(16, 186); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox2.Size = new System.Drawing.Size(277, 164); - this.groupBox2.TabIndex = 5; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "读码结果查询"; - // - // ReadKind - // - this.ReadKind.FormattingEnabled = true; - this.ReadKind.Location = new System.Drawing.Point(56, 38); - this.ReadKind.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.ReadKind.Name = "ReadKind"; - this.ReadKind.Size = new System.Drawing.Size(161, 23); - this.ReadKind.TabIndex = 1; - this.ReadKind.Text = " "; - // - // ReadKindSelect - // - this.ReadKindSelect.Location = new System.Drawing.Point(56, 81); - this.ReadKindSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.ReadKindSelect.Name = "ReadKindSelect"; - this.ReadKindSelect.Size = new System.Drawing.Size(163, 60); - this.ReadKindSelect.TabIndex = 0; - this.ReadKindSelect.Text = "读码结果查询"; - this.ReadKindSelect.UseVisualStyleBackColor = true; - this.ReadKindSelect.Click += new System.EventHandler(this.ReadKindSelect_Click); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.DeviceNo); - this.groupBox3.Controls.Add(this.DeviceNoSelect); - this.groupBox3.Location = new System.Drawing.Point(16, 358); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox3.Size = new System.Drawing.Size(277, 164); - this.groupBox3.TabIndex = 6; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "设备编号查询"; - // - // DeviceNo - // - this.DeviceNo.Location = new System.Drawing.Point(56, 36); - this.DeviceNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.DeviceNo.Name = "DeviceNo"; - this.DeviceNo.Size = new System.Drawing.Size(161, 25); - this.DeviceNo.TabIndex = 1; - // - // DeviceNoSelect - // - this.DeviceNoSelect.Location = new System.Drawing.Point(56, 81); - this.DeviceNoSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.DeviceNoSelect.Name = "DeviceNoSelect"; - this.DeviceNoSelect.Size = new System.Drawing.Size(163, 60); - this.DeviceNoSelect.TabIndex = 0; - this.DeviceNoSelect.Text = "设备编号查询"; - this.DeviceNoSelect.UseVisualStyleBackColor = true; - this.DeviceNoSelect.Click += new System.EventHandler(this.DeviceNoSelect_Click); - // // LogContent // this.LogContent.ColumnHeadersHeight = 20; this.LogContent.Location = new System.Drawing.Point(301, 15); - this.LogContent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.LogContent.Margin = new System.Windows.Forms.Padding(4); this.LogContent.Name = "LogContent"; this.LogContent.RowHeadersVisible = false; this.LogContent.RowHeadersWidth = 51; this.LogContent.RowTemplate.Height = 18; - this.LogContent.Size = new System.Drawing.Size(667, 1124); + this.LogContent.Size = new System.Drawing.Size(667, 1230); this.LogContent.TabIndex = 7; // - // groupBox4 - // - this.groupBox4.Controls.Add(this.Content); - this.groupBox4.Controls.Add(this.ContentSelect); - this.groupBox4.Location = new System.Drawing.Point(16, 529); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox4.Size = new System.Drawing.Size(277, 164); - this.groupBox4.TabIndex = 7; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "条码内容查询"; - // - // Content - // - this.Content.Location = new System.Drawing.Point(56, 36); - this.Content.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.Content.Name = "Content"; - this.Content.Size = new System.Drawing.Size(161, 25); - this.Content.TabIndex = 1; - // - // ContentSelect - // - this.ContentSelect.Location = new System.Drawing.Point(56, 81); - this.ContentSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.ContentSelect.Name = "ContentSelect"; - this.ContentSelect.Size = new System.Drawing.Size(163, 60); - this.ContentSelect.TabIndex = 0; - this.ContentSelect.Text = "条码内容查询"; - this.ContentSelect.UseVisualStyleBackColor = true; - this.ContentSelect.Click += new System.EventHandler(this.ContentSelect_Click); + // SelectByCondition + // + this.SelectByCondition.Location = new System.Drawing.Point(7, 220); + this.SelectByCondition.Margin = new System.Windows.Forms.Padding(4); + this.SelectByCondition.Name = "SelectByCondition"; + this.SelectByCondition.Size = new System.Drawing.Size(260, 60); + this.SelectByCondition.TabIndex = 2; + this.SelectByCondition.Text = "条件查询"; + this.SelectByCondition.UseVisualStyleBackColor = true; + this.SelectByCondition.Click += new System.EventHandler(this.SelectAll_Click); + // + // ShortCount + // + this.ShortCount.AutoSize = true; + this.ShortCount.Font = new System.Drawing.Font("宋体", 12F); + this.ShortCount.Location = new System.Drawing.Point(180, 1092); + this.ShortCount.Name = "ShortCount"; + this.ShortCount.Size = new System.Drawing.Size(39, 20); + this.ShortCount.TabIndex = 56; + this.ShortCount.Text = "NAN"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Font = new System.Drawing.Font("宋体", 12F); + this.label13.Location = new System.Drawing.Point(65, 1092); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(89, 20); + this.label13.TabIndex = 55; + this.label13.Text = "包过短："; + // + // MultiCount + // + this.MultiCount.AutoSize = true; + this.MultiCount.Font = new System.Drawing.Font("宋体", 12F); + this.MultiCount.Location = new System.Drawing.Point(180, 1124); + this.MultiCount.Name = "MultiCount"; + this.MultiCount.Size = new System.Drawing.Size(39, 20); + this.MultiCount.TabIndex = 54; + this.MultiCount.Text = "NAN"; + // + // NearCount + // + this.NearCount.AutoSize = true; + this.NearCount.Font = new System.Drawing.Font("宋体", 12F); + this.NearCount.Location = new System.Drawing.Point(180, 1060); + this.NearCount.Name = "NearCount"; + this.NearCount.Size = new System.Drawing.Size(39, 20); + this.NearCount.TabIndex = 53; + this.NearCount.Text = "NAN"; + // + // NoReadCount + // + this.NoReadCount.AutoSize = true; + this.NoReadCount.Font = new System.Drawing.Font("宋体", 12F); + this.NoReadCount.Location = new System.Drawing.Point(180, 1027); + this.NoReadCount.Name = "NoReadCount"; + this.NoReadCount.Size = new System.Drawing.Size(39, 20); + this.NoReadCount.TabIndex = 52; + this.NoReadCount.Text = "NAN"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Font = new System.Drawing.Font("宋体", 12F); + this.label11.Location = new System.Drawing.Point(65, 1124); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(89, 20); + this.label11.TabIndex = 51; + this.label11.Text = "多标签："; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("宋体", 12F); + this.label10.Location = new System.Drawing.Point(65, 1060); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(109, 20); + this.label10.TabIndex = 50; + this.label10.Text = "间距异常："; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Font = new System.Drawing.Font("宋体", 12F); + this.label9.Location = new System.Drawing.Point(65, 1027); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(89, 20); + this.label9.TabIndex = 49; + this.label9.Text = "未读取："; + // + // WarningCount + // + this.WarningCount.AutoSize = true; + this.WarningCount.Font = new System.Drawing.Font("宋体", 12F); + this.WarningCount.Location = new System.Drawing.Point(139, 964); + this.WarningCount.Name = "WarningCount"; + this.WarningCount.Size = new System.Drawing.Size(39, 20); + this.WarningCount.TabIndex = 48; + this.WarningCount.Text = "NAN"; + // + // NormalCount + // + this.NormalCount.AutoSize = true; + this.NormalCount.Font = new System.Drawing.Font("宋体", 12F); + this.NormalCount.Location = new System.Drawing.Point(139, 847); + this.NormalCount.Name = "NormalCount"; + this.NormalCount.Size = new System.Drawing.Size(39, 20); + this.NormalCount.TabIndex = 47; + this.NormalCount.Text = "NAN"; + // + // TotalCount + // + this.TotalCount.AutoSize = true; + this.TotalCount.Font = new System.Drawing.Font("宋体", 12F); + this.TotalCount.Location = new System.Drawing.Point(139, 732); + this.TotalCount.Name = "TotalCount"; + this.TotalCount.Size = new System.Drawing.Size(39, 20); + this.TotalCount.TabIndex = 46; + this.TotalCount.Text = "NAN"; + // + // pictureBox5 + // + this.pictureBox5.Image = global::RFIDSocket.Properties.Resources.WarningCount; + this.pictureBox5.Location = new System.Drawing.Point(69, 924); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(60, 60); + this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox5.TabIndex = 45; + this.pictureBox5.TabStop = false; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("宋体", 12F); + this.label8.Location = new System.Drawing.Point(138, 923); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(89, 20); + this.label8.TabIndex = 44; + this.label8.Text = "异常数量"; + // + // pictureBox4 + // + this.pictureBox4.Image = global::RFIDSocket.Properties.Resources.NormalCount; + this.pictureBox4.Location = new System.Drawing.Point(69, 807); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(60, 60); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox4.TabIndex = 43; + this.pictureBox4.TabStop = false; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("宋体", 12F); + this.label7.Location = new System.Drawing.Point(138, 806); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(89, 20); + this.label7.TabIndex = 42; + this.label7.Text = "正常数量"; + // + // pictureBox3 + // + this.pictureBox3.Image = global::RFIDSocket.Properties.Resources.TotalCount; + this.pictureBox3.Location = new System.Drawing.Point(69, 692); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(60, 60); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 41; + this.pictureBox3.TabStop = false; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("宋体", 12F); + this.label6.Location = new System.Drawing.Point(138, 691); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(69, 20); + this.label6.TabIndex = 40; + this.label6.Text = "总数量"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.EPCText); + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.SNText); + this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.TipsText); + this.groupBox2.Controls.Add(this.label12); + this.groupBox2.Controls.Add(this.StatusText); + this.groupBox2.Controls.Add(this.label5); + this.groupBox2.Controls.Add(this.MaxInterval); + this.groupBox2.Controls.Add(this.label3); + this.groupBox2.Controls.Add(this.MinInterval); + this.groupBox2.Controls.Add(this.label4); + this.groupBox2.Controls.Add(this.MaxLength); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.MinLength); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.SelectByCondition); + this.groupBox2.Location = new System.Drawing.Point(13, 237); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(274, 287); + this.groupBox2.TabIndex = 57; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "条件查询"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 37); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(67, 15); + this.label1.TabIndex = 0; + this.label1.Text = "最小包长"; + // + // MinLength + // + this.MinLength.Location = new System.Drawing.Point(79, 32); + this.MinLength.Name = "MinLength"; + this.MinLength.Size = new System.Drawing.Size(52, 25); + this.MinLength.TabIndex = 1; + // + // MaxLength + // + this.MaxLength.Location = new System.Drawing.Point(216, 32); + this.MaxLength.Name = "MaxLength"; + this.MaxLength.Size = new System.Drawing.Size(52, 25); + this.MaxLength.TabIndex = 3; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(143, 37); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(67, 15); + this.label2.TabIndex = 2; + this.label2.Text = "最大包长"; + // + // MaxInterval + // + this.MaxInterval.Location = new System.Drawing.Point(216, 63); + this.MaxInterval.Name = "MaxInterval"; + this.MaxInterval.Size = new System.Drawing.Size(52, 25); + this.MaxInterval.TabIndex = 7; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(143, 68); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(67, 15); + this.label3.TabIndex = 6; + this.label3.Text = "最大间距"; + // + // MinInterval + // + this.MinInterval.Location = new System.Drawing.Point(79, 63); + this.MinInterval.Name = "MinInterval"; + this.MinInterval.Size = new System.Drawing.Size(52, 25); + this.MinInterval.TabIndex = 5; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(6, 68); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(67, 15); + this.label4.TabIndex = 4; + this.label4.Text = "最小间距"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(38, 98); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(67, 15); + this.label5.TabIndex = 8; + this.label5.Text = "读码结果"; + // + // StatusText + // + this.StatusText.FormattingEnabled = true; + this.StatusText.Location = new System.Drawing.Point(111, 94); + this.StatusText.Name = "StatusText"; + this.StatusText.Size = new System.Drawing.Size(121, 23); + this.StatusText.TabIndex = 9; + // + // TipsText + // + this.TipsText.FormattingEnabled = true; + this.TipsText.Location = new System.Drawing.Point(111, 123); + this.TipsText.Name = "TipsText"; + this.TipsText.Size = new System.Drawing.Size(121, 23); + this.TipsText.TabIndex = 11; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(38, 127); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(67, 15); + this.label12.TabIndex = 10; + this.label12.Text = "返回结果"; + // + // SNText + // + this.SNText.Location = new System.Drawing.Point(111, 157); + this.SNText.Name = "SNText"; + this.SNText.Size = new System.Drawing.Size(121, 25); + this.SNText.TabIndex = 13; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(40, 162); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(52, 15); + this.label14.TabIndex = 12; + this.label14.Text = "包裹号"; + // + // EPCText + // + this.EPCText.Location = new System.Drawing.Point(111, 188); + this.EPCText.Name = "EPCText"; + this.EPCText.Size = new System.Drawing.Size(121, 25); + this.EPCText.TabIndex = 15; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(40, 193); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(67, 15); + this.label15.TabIndex = 14; + this.label15.Text = "读码内容"; // // SelectAll // - this.SelectAll.Location = new System.Drawing.Point(16, 700); - this.SelectAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.SelectAll.Location = new System.Drawing.Point(13, 531); + this.SelectAll.Margin = new System.Windows.Forms.Padding(4); this.SelectAll.Name = "SelectAll"; - this.SelectAll.Size = new System.Drawing.Size(277, 60); - this.SelectAll.TabIndex = 2; + this.SelectAll.Size = new System.Drawing.Size(274, 60); + this.SelectAll.TabIndex = 16; this.SelectAll.Text = "综合条件查询"; this.SelectAll.UseVisualStyleBackColor = true; - this.SelectAll.Click += new System.EventHandler(this.SelectAll_Click); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(18, 29); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(97, 15); + this.label16.TabIndex = 59; + this.label16.Text = "选择查询地址"; + // + // AllAddress + // + this.AllAddress.FormattingEnabled = true; + this.AllAddress.Location = new System.Drawing.Point(136, 25); + this.AllAddress.Name = "AllAddress"; + this.AllAddress.Size = new System.Drawing.Size(143, 23); + this.AllAddress.TabIndex = 58; // // RFIDLog // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(984, 1154); + this.ClientSize = new System.Drawing.Size(982, 1258); + this.Controls.Add(this.label16); + this.Controls.Add(this.AllAddress); this.Controls.Add(this.SelectAll); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.LogContent); - this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); + this.Controls.Add(this.ShortCount); + this.Controls.Add(this.label13); + this.Controls.Add(this.MultiCount); + this.Controls.Add(this.NearCount); + this.Controls.Add(this.NoReadCount); + this.Controls.Add(this.label11); + this.Controls.Add(this.label10); + this.Controls.Add(this.label9); + this.Controls.Add(this.WarningCount); + this.Controls.Add(this.NormalCount); + this.Controls.Add(this.TotalCount); + this.Controls.Add(this.pictureBox5); + this.Controls.Add(this.label8); + this.Controls.Add(this.pictureBox4); + this.Controls.Add(this.label7); + this.Controls.Add(this.pictureBox3); + this.Controls.Add(this.label6); + this.Controls.Add(this.LogContent); this.Controls.Add(this.groupBox1); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "RFIDLog"; this.Text = "日志查询"; this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.LogContent)).EndInit(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -247,16 +549,44 @@ private System.Windows.Forms.DateTimePicker StartTime; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.DateTimePicker EndTime; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.ComboBox ReadKind; - private System.Windows.Forms.Button ReadKindSelect; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox DeviceNo; - private System.Windows.Forms.Button DeviceNoSelect; private System.Windows.Forms.DataGridView LogContent; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox Content; - private System.Windows.Forms.Button ContentSelect; + private System.Windows.Forms.Button SelectByCondition; + private System.Windows.Forms.Label ShortCount; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label MultiCount; + private System.Windows.Forms.Label NearCount; + private System.Windows.Forms.Label NoReadCount; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label WarningCount; + private System.Windows.Forms.Label NormalCount; + private System.Windows.Forms.Label TotalCount; + private System.Windows.Forms.PictureBox pictureBox5; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.TextBox MinLength; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox EPCText; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.TextBox SNText; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.ComboBox TipsText; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.ComboBox StatusText; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox MaxInterval; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox MinInterval; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox MaxLength; + private System.Windows.Forms.Label label2; private System.Windows.Forms.Button SelectAll; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.ComboBox AllAddress; } } \ No newline at end of file diff --git a/RFIDSocket/RFIDLog.cs b/RFIDSocket/RFIDLog.cs index 60b148a..90792fb 100644 --- a/RFIDSocket/RFIDLog.cs +++ b/RFIDSocket/RFIDLog.cs @@ -21,14 +21,22 @@ namespace RFIDSocket { InitializeComponent(); StartTime.Value = DateTime.Now.AddDays(-3); - List list = new List + List listStatus = new List { "", - "NB", + "NR", "GR", - "MR" }; - ReadKind.DataSource = list; + + Dictionary listTips = new Dictionary + { + {"ok", "正常"}, + {"noread", "无读"}, + {"near", "近距离"}, + {"short", "包过短"}, + {"multi", "多标签"}, + }; + Init(); } @@ -46,57 +54,10 @@ namespace RFIDSocket } } - private void ReadKindSelect_Click(object sender, EventArgs e) - { - if (LogContent != null) - { - LogContent.DataSource = null; - //LogContent.DataSource = LogControl.LogReadKindSelect(rFIDContents, ReadKind.Text); - } - } - - private void DeviceNoSelect_Click(object sender, EventArgs e) - { - if(!int.TryParse(DeviceNo.Text, out int no)) - { - MessageBox.Show("设备编号格式不正确"); - return; - } - if (LogContent != null) - { - LogContent.DataSource = null; - //LogContent.DataSource = LogControl.LogDeviceNoSelect(rFIDContents, no); - } - } - - private void ContentSelect_Click(object sender, EventArgs e) - { - if (LogContent != null) - { - LogContent.DataSource = null; - //LogContent.DataSource = LogControl.LogContentSelect(rFIDContents, Content.Text); - } - } - + private void SelectAll_Click(object sender, EventArgs e) { - if (!int.TryParse(DeviceNo.Text, out int no)) - { - MessageBox.Show("设备编号格式不正确"); - return; - } - if (LogContent != null) - { - //LogContent.DataSource = null; - //LogContent.DataSource = LogControl.LogTimeSelect( - // LogControl.LogReadKindSelect( - // LogControl.LogDeviceNoSelect( - // LogControl.LogContentSelect(rFIDContents, - // Content.Text), - // no), - // ReadKind.Text), - // StartTime.Value, EndTime.Value); - } + } } diff --git a/RFIDSocket/RFIDSocket.Designer.cs b/RFIDSocket/RFIDSocket.Designer.cs index ddaf98d..6810727 100644 --- a/RFIDSocket/RFIDSocket.Designer.cs +++ b/RFIDSocket/RFIDSocket.Designer.cs @@ -30,6 +30,13 @@ { this.components = new System.ComponentModel.Container(); this.CotentData = new System.Windows.Forms.DataGridView(); + this.sNDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.intervalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ePCDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tipsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); this.IPText = new System.Windows.Forms.TextBox(); this.SetAddress = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); @@ -66,7 +73,11 @@ this.MultiCount = new System.Windows.Forms.Label(); this.ShortCount = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); + this.MonitorAddress = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -76,7 +87,16 @@ // // CotentData // + this.CotentData.AutoGenerateColumns = false; this.CotentData.ColumnHeadersHeight = 20; + this.CotentData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.sNDataGridViewTextBoxColumn, + this.intervalDataGridViewTextBoxColumn, + this.lengthDataGridViewTextBoxColumn, + this.ePCDataGridViewTextBoxColumn, + this.tipsDataGridViewTextBoxColumn, + this.logTimeDataGridViewTextBoxColumn}); + this.CotentData.DataSource = this.rFIDContentBindingSource; this.CotentData.Location = new System.Drawing.Point(12, 129); this.CotentData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.CotentData.Name = "CotentData"; @@ -84,12 +104,64 @@ this.CotentData.RowHeadersWidth = 51; this.CotentData.RowTemplate.Height = 17; this.CotentData.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.CotentData.Size = new System.Drawing.Size(648, 1088); + this.CotentData.Size = new System.Drawing.Size(911, 1088); this.CotentData.TabIndex = 0; // + // sNDataGridViewTextBoxColumn + // + this.sNDataGridViewTextBoxColumn.DataPropertyName = "SN"; + this.sNDataGridViewTextBoxColumn.HeaderText = "包裹码"; + this.sNDataGridViewTextBoxColumn.MinimumWidth = 6; + this.sNDataGridViewTextBoxColumn.Name = "sNDataGridViewTextBoxColumn"; + this.sNDataGridViewTextBoxColumn.Width = 60; + // + // intervalDataGridViewTextBoxColumn + // + this.intervalDataGridViewTextBoxColumn.DataPropertyName = "Interval"; + this.intervalDataGridViewTextBoxColumn.HeaderText = "间距"; + this.intervalDataGridViewTextBoxColumn.MinimumWidth = 6; + this.intervalDataGridViewTextBoxColumn.Name = "intervalDataGridViewTextBoxColumn"; + this.intervalDataGridViewTextBoxColumn.Width = 60; + // + // lengthDataGridViewTextBoxColumn + // + this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length"; + this.lengthDataGridViewTextBoxColumn.HeaderText = "包长"; + this.lengthDataGridViewTextBoxColumn.MinimumWidth = 6; + this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn"; + this.lengthDataGridViewTextBoxColumn.Width = 60; + // + // ePCDataGridViewTextBoxColumn + // + this.ePCDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ePCDataGridViewTextBoxColumn.DataPropertyName = "EPC"; + this.ePCDataGridViewTextBoxColumn.HeaderText = "读取内容"; + this.ePCDataGridViewTextBoxColumn.MinimumWidth = 6; + this.ePCDataGridViewTextBoxColumn.Name = "ePCDataGridViewTextBoxColumn"; + // + // tipsDataGridViewTextBoxColumn + // + this.tipsDataGridViewTextBoxColumn.DataPropertyName = "Tips"; + this.tipsDataGridViewTextBoxColumn.HeaderText = "状态"; + this.tipsDataGridViewTextBoxColumn.MinimumWidth = 6; + this.tipsDataGridViewTextBoxColumn.Name = "tipsDataGridViewTextBoxColumn"; + this.tipsDataGridViewTextBoxColumn.Width = 80; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "记录时间"; + this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.Width = 120; + // + // rFIDContentBindingSource + // + this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); + // // IPText // - this.IPText.Location = new System.Drawing.Point(155, 29); + this.IPText.Location = new System.Drawing.Point(152, 28); this.IPText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.IPText.MaxLength = 6; this.IPText.Name = "IPText"; @@ -99,27 +171,27 @@ // // SetAddress // - this.SetAddress.Location = new System.Drawing.Point(356, 12); + this.SetAddress.Location = new System.Drawing.Point(353, 11); this.SetAddress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.SetAddress.Name = "SetAddress"; this.SetAddress.Size = new System.Drawing.Size(160, 56); this.SetAddress.TabIndex = 6; - this.SetAddress.Text = "确认服务端地址"; + this.SetAddress.Text = "确认客户端地址"; this.SetAddress.UseVisualStyleBackColor = true; this.SetAddress.Click += new System.EventHandler(this.SetPort_Click); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(15, 34); + this.label1.Location = new System.Drawing.Point(12, 33); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(128, 15); this.label1.TabIndex = 1; - this.label1.Text = "服务端IP：端口号"; + this.label1.Text = "客户端IP：端口号"; // // PortText // - this.PortText.Location = new System.Drawing.Point(291, 29); + this.PortText.Location = new System.Drawing.Point(288, 28); this.PortText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.PortText.MaxLength = 6; this.PortText.Name = "PortText"; @@ -129,10 +201,10 @@ // // MonitorOnOff // - this.MonitorOnOff.Location = new System.Drawing.Point(521, 14); + this.MonitorOnOff.Location = new System.Drawing.Point(928, 13); this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MonitorOnOff.Name = "MonitorOnOff"; - this.MonitorOnOff.Size = new System.Drawing.Size(147, 56); + this.MonitorOnOff.Size = new System.Drawing.Size(111, 50); this.MonitorOnOff.TabIndex = 7; this.MonitorOnOff.Text = "启动监听"; this.MonitorOnOff.UseVisualStyleBackColor = true; @@ -141,7 +213,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(673, 34); + this.label4.Location = new System.Drawing.Point(1055, 28); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(82, 15); this.label4.TabIndex = 8; @@ -151,7 +223,7 @@ // this.MonitorState.AutoSize = true; this.MonitorState.BackColor = System.Drawing.Color.Transparent; - this.MonitorState.Location = new System.Drawing.Point(765, 34); + this.MonitorState.Location = new System.Drawing.Point(1147, 28); this.MonitorState.Name = "MonitorState"; this.MonitorState.Size = new System.Drawing.Size(22, 15); this.MonitorState.TabIndex = 9; @@ -175,7 +247,7 @@ // // PgDn // - this.PgDn.Location = new System.Drawing.Point(525, 74); + this.PgDn.Location = new System.Drawing.Point(788, 74); this.PgDn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.PgDn.Name = "PgDn"; this.PgDn.Size = new System.Drawing.Size(135, 50); @@ -189,7 +261,7 @@ this.PageRange.AutoSize = true; this.PageRange.BackColor = System.Drawing.Color.Transparent; this.PageRange.Font = new System.Drawing.Font("宋体", 12F); - this.PageRange.Location = new System.Drawing.Point(340, 86); + this.PageRange.Location = new System.Drawing.Point(441, 88); this.PageRange.Name = "PageRange"; this.PageRange.Size = new System.Drawing.Size(69, 20); this.PageRange.TabIndex = 15; @@ -199,7 +271,7 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 12F); - this.label3.Location = new System.Drawing.Point(248, 86); + this.label3.Location = new System.Drawing.Point(349, 88); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(109, 20); this.label3.TabIndex = 14; @@ -207,10 +279,10 @@ // // LogStart // - this.LogStart.Location = new System.Drawing.Point(793, 14); + this.LogStart.Location = new System.Drawing.Point(994, 101); this.LogStart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.LogStart.Name = "LogStart"; - this.LogStart.Size = new System.Drawing.Size(113, 56); + this.LogStart.Size = new System.Drawing.Size(113, 50); this.LogStart.TabIndex = 16; this.LogStart.Text = "日志查询"; this.LogStart.UseVisualStyleBackColor = true; @@ -220,7 +292,7 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 12F); - this.label2.Location = new System.Drawing.Point(788, 154); + this.label2.Location = new System.Drawing.Point(1048, 206); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(89, 20); this.label2.TabIndex = 17; @@ -230,7 +302,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 12F); - this.label6.Location = new System.Drawing.Point(788, 384); + this.label6.Location = new System.Drawing.Point(1048, 436); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(69, 20); this.label6.TabIndex = 21; @@ -240,7 +312,7 @@ // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 12F); - this.label7.Location = new System.Drawing.Point(788, 499); + this.label7.Location = new System.Drawing.Point(1048, 551); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(89, 20); this.label7.TabIndex = 23; @@ -250,7 +322,7 @@ // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("宋体", 12F); - this.label8.Location = new System.Drawing.Point(788, 616); + this.label8.Location = new System.Drawing.Point(1048, 668); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(89, 20); this.label8.TabIndex = 25; @@ -259,7 +331,7 @@ // pictureBox5 // this.pictureBox5.Image = global::RFIDSocket.Properties.Resources.WarningCount; - this.pictureBox5.Location = new System.Drawing.Point(719, 617); + this.pictureBox5.Location = new System.Drawing.Point(979, 669); this.pictureBox5.Name = "pictureBox5"; this.pictureBox5.Size = new System.Drawing.Size(60, 60); this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -269,7 +341,7 @@ // pictureBox4 // this.pictureBox4.Image = global::RFIDSocket.Properties.Resources.NormalCount; - this.pictureBox4.Location = new System.Drawing.Point(719, 500); + this.pictureBox4.Location = new System.Drawing.Point(979, 552); this.pictureBox4.Name = "pictureBox4"; this.pictureBox4.Size = new System.Drawing.Size(60, 60); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -279,7 +351,7 @@ // pictureBox3 // this.pictureBox3.Image = global::RFIDSocket.Properties.Resources.TotalCount; - this.pictureBox3.Location = new System.Drawing.Point(719, 385); + this.pictureBox3.Location = new System.Drawing.Point(979, 437); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(60, 60); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -289,7 +361,7 @@ // DevicePictureBox // this.DevicePictureBox.Image = global::RFIDSocket.Properties.Resources.RunNormal; - this.DevicePictureBox.Location = new System.Drawing.Point(719, 268); + this.DevicePictureBox.Location = new System.Drawing.Point(979, 320); this.DevicePictureBox.Name = "DevicePictureBox"; this.DevicePictureBox.Size = new System.Drawing.Size(60, 60); this.DevicePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -299,7 +371,7 @@ // ConnectPictureBox // this.ConnectPictureBox.Image = global::RFIDSocket.Properties.Resources.ConnectNormal; - this.ConnectPictureBox.Location = new System.Drawing.Point(719, 155); + this.ConnectPictureBox.Location = new System.Drawing.Point(979, 207); this.ConnectPictureBox.Name = "ConnectPictureBox"; this.ConnectPictureBox.Size = new System.Drawing.Size(60, 60); this.ConnectPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -310,7 +382,7 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 12F); - this.label5.Location = new System.Drawing.Point(788, 268); + this.label5.Location = new System.Drawing.Point(1048, 320); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(89, 20); this.label5.TabIndex = 19; @@ -320,7 +392,7 @@ // this.ConnectState.AutoSize = true; this.ConnectState.Font = new System.Drawing.Font("宋体", 12F); - this.ConnectState.Location = new System.Drawing.Point(789, 195); + this.ConnectState.Location = new System.Drawing.Point(1049, 247); this.ConnectState.Name = "ConnectState"; this.ConnectState.Size = new System.Drawing.Size(39, 20); this.ConnectState.TabIndex = 27; @@ -330,7 +402,7 @@ // this.DeviceState.AutoSize = true; this.DeviceState.Font = new System.Drawing.Font("宋体", 12F); - this.DeviceState.Location = new System.Drawing.Point(788, 308); + this.DeviceState.Location = new System.Drawing.Point(1048, 360); this.DeviceState.Name = "DeviceState"; this.DeviceState.Size = new System.Drawing.Size(39, 20); this.DeviceState.TabIndex = 28; @@ -340,7 +412,7 @@ // this.TotalCount.AutoSize = true; this.TotalCount.Font = new System.Drawing.Font("宋体", 12F); - this.TotalCount.Location = new System.Drawing.Point(789, 425); + this.TotalCount.Location = new System.Drawing.Point(1049, 477); this.TotalCount.Name = "TotalCount"; this.TotalCount.Size = new System.Drawing.Size(39, 20); this.TotalCount.TabIndex = 29; @@ -350,7 +422,7 @@ // this.NormalCount.AutoSize = true; this.NormalCount.Font = new System.Drawing.Font("宋体", 12F); - this.NormalCount.Location = new System.Drawing.Point(789, 540); + this.NormalCount.Location = new System.Drawing.Point(1049, 592); this.NormalCount.Name = "NormalCount"; this.NormalCount.Size = new System.Drawing.Size(39, 20); this.NormalCount.TabIndex = 30; @@ -360,7 +432,7 @@ // this.WarningCount.AutoSize = true; this.WarningCount.Font = new System.Drawing.Font("宋体", 12F); - this.WarningCount.Location = new System.Drawing.Point(789, 657); + this.WarningCount.Location = new System.Drawing.Point(1049, 709); this.WarningCount.Name = "WarningCount"; this.WarningCount.Size = new System.Drawing.Size(39, 20); this.WarningCount.TabIndex = 31; @@ -370,7 +442,7 @@ // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("宋体", 12F); - this.label9.Location = new System.Drawing.Point(715, 720); + this.label9.Location = new System.Drawing.Point(975, 772); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(89, 20); this.label9.TabIndex = 32; @@ -380,7 +452,7 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("宋体", 12F); - this.label10.Location = new System.Drawing.Point(715, 753); + this.label10.Location = new System.Drawing.Point(975, 805); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(109, 20); this.label10.TabIndex = 33; @@ -390,7 +462,7 @@ // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("宋体", 12F); - this.label11.Location = new System.Drawing.Point(715, 817); + this.label11.Location = new System.Drawing.Point(975, 869); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(89, 20); this.label11.TabIndex = 34; @@ -400,7 +472,7 @@ // this.NoReadCount.AutoSize = true; this.NoReadCount.Font = new System.Drawing.Font("宋体", 12F); - this.NoReadCount.Location = new System.Drawing.Point(830, 720); + this.NoReadCount.Location = new System.Drawing.Point(1090, 772); this.NoReadCount.Name = "NoReadCount"; this.NoReadCount.Size = new System.Drawing.Size(39, 20); this.NoReadCount.TabIndex = 35; @@ -410,7 +482,7 @@ // this.NearCount.AutoSize = true; this.NearCount.Font = new System.Drawing.Font("宋体", 12F); - this.NearCount.Location = new System.Drawing.Point(830, 753); + this.NearCount.Location = new System.Drawing.Point(1090, 805); this.NearCount.Name = "NearCount"; this.NearCount.Size = new System.Drawing.Size(39, 20); this.NearCount.TabIndex = 36; @@ -420,7 +492,7 @@ // this.MultiCount.AutoSize = true; this.MultiCount.Font = new System.Drawing.Font("宋体", 12F); - this.MultiCount.Location = new System.Drawing.Point(830, 817); + this.MultiCount.Location = new System.Drawing.Point(1090, 869); this.MultiCount.Name = "MultiCount"; this.MultiCount.Size = new System.Drawing.Size(39, 20); this.MultiCount.TabIndex = 37; @@ -430,7 +502,7 @@ // this.ShortCount.AutoSize = true; this.ShortCount.Font = new System.Drawing.Font("宋体", 12F); - this.ShortCount.Location = new System.Drawing.Point(830, 785); + this.ShortCount.Location = new System.Drawing.Point(1090, 837); this.ShortCount.Name = "ShortCount"; this.ShortCount.Size = new System.Drawing.Size(39, 20); this.ShortCount.TabIndex = 39; @@ -440,17 +512,47 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("宋体", 12F); - this.label13.Location = new System.Drawing.Point(715, 785); + this.label13.Location = new System.Drawing.Point(975, 837); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(89, 20); this.label13.TabIndex = 38; this.label13.Text = "包过短："; // + // MonitorAddress + // + this.MonitorAddress.FormattingEnabled = true; + this.MonitorAddress.Location = new System.Drawing.Point(700, 28); + this.MonitorAddress.Name = "MonitorAddress"; + this.MonitorAddress.Size = new System.Drawing.Size(143, 23); + this.MonitorAddress.TabIndex = 40; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(582, 32); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(112, 15); + this.label12.TabIndex = 41; + this.label12.Text = "选择监听地址："; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("宋体", 12F); + this.label14.Location = new System.Drawing.Point(516, 88); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(59, 20); + this.label14.TabIndex = 42; + this.label14.Text = "共200"; + // // RFIDSocket // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(927, 1229); + this.ClientSize = new System.Drawing.Size(1189, 1229); + this.Controls.Add(this.label14); + this.Controls.Add(this.label12); + this.Controls.Add(this.MonitorAddress); this.Controls.Add(this.ShortCount); this.Controls.Add(this.label13); this.Controls.Add(this.MultiCount); @@ -489,9 +591,10 @@ this.Controls.Add(this.CotentData); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "RFIDSocket"; - this.Text = " 小件监听"; + this.Text = " 通道门监听"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RFIDSocket_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); @@ -541,6 +644,16 @@ private System.Windows.Forms.Label MultiCount; private System.Windows.Forms.Label ShortCount; private System.Windows.Forms.Label label13; + private System.Windows.Forms.ComboBox MonitorAddress; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.BindingSource rFIDContentBindingSource; + private System.Windows.Forms.DataGridViewTextBoxColumn sNDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn intervalDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn lengthDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn ePCDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn tipsDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; + private System.Windows.Forms.Label label14; } } diff --git a/RFIDSocket/RFIDSocket.cs b/RFIDSocket/RFIDSocket.cs index b955217..9f5d2e0 100644 --- a/RFIDSocket/RFIDSocket.cs +++ b/RFIDSocket/RFIDSocket.cs @@ -11,21 +11,27 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using TouchSocket.Sockets; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using TcpClient = HighWayIot.TouchSocket.TcpClient; namespace RFIDSocket { public partial class RFIDSocket : Form { - private static TcpServer Server = TcpServer.Instance; + private static TcpClient Server = TcpClient.Instance; private static DataAnalysis RFIDData = DataAnalysis.Instance; - string Port = "1234"; string IP = "127.0.0.1"; int PageNo = 1; + List IPs = new List(); + private List Content = new List(); + + BindingSource bs = new BindingSource(); + public RFIDSocket() { InitializeComponent(); @@ -34,12 +40,12 @@ namespace RFIDSocket private void InitAction() { - if (Server.State != ServerState.Running) + if (!Server.State) { MonitorState.Text = "关"; MonitorState.BackColor = Color.Yellow; } - else if (Server.State == ServerState.Running) + else if (Server.State) { MonitorState.Text = "开"; MonitorState.BackColor = Color.LightGreen; @@ -48,14 +54,17 @@ namespace RFIDSocket Port = PortText.Text; IP = IPText.Text; - + IPs = RFIDData.GetAllIP(); + + bs.DataSource = IPs; + MonitorAddress.DataSource = bs; } private void MonitorOnOff_Click(object sender, EventArgs e) { - if (Server.State != ServerState.Running) + if (!Server.State) { - if (Server.ServerStart(IP, Port)) + if (Server.ClientStart(IP, Port)) { MessageBox.Show("监听服务启动成功！"); TableTimer.Enabled = true; @@ -65,9 +74,9 @@ namespace RFIDSocket MessageBox.Show("监听服务启动失败！"); } } - else if (Server.State == ServerState.Running) + else if (Server.State) { - if (Server.ServerStop()) + if (Server.ClientStop()) { MessageBox.Show("监听服务关闭成功！"); TableTimer.Enabled = false; @@ -87,13 +96,13 @@ namespace RFIDSocket private void TableTimer_Tick(object sender, EventArgs e) { - if (Server.State != ServerState.Running) + if (!Server.State) { MonitorOnOff.Text = "启动监听"; MonitorState.Text = "关"; MonitorState.BackColor = Color.Yellow; } - else if (Server.State == ServerState.Running) + else if (Server.State) { MonitorOnOff.Text = "关闭监听"; MonitorState.Text = "开"; @@ -102,29 +111,34 @@ namespace RFIDSocket RFIDData.GetData(); - CotentData.DataSource = null; + IPs = RFIDData.GetAllIP(); + bs.DataSource = IPs; + bs.ResetBindings(false); + CotentData.DataSource = null; switch (PageNo) { case 1: ContentPages(0); PageRange.Text = "0 - 50"; break; case 2: ContentPages(50); PageRange.Text = "51 - 100"; break; case 3: ContentPages(100); PageRange.Text = "101 - 150"; break; case 4: ContentPages(150); PageRange.Text = "151 - 200"; break; - default: ContentPages(0); PageRange.Text = "0 - 50"; break; + default: ContentPages(0); PageRange.Text = "0 - 50"; break; } + StateRefresh(); + } private void RFIDSocket_FormClosing(object sender, FormClosingEventArgs e) { - if (Server.State == ServerState.Running) + if (Server.State) { - if (!Server.ServerStop()) + if (!Server.ClientStop()) { MessageBox.Show("监听服务关闭失败！ 请成功关闭后再退出"); e.Cancel = true; } - if (!Server.ServerDispose()) + if (!Server.ClientDispose()) { MessageBox.Show("监听服务释放失败！ 请再次尝试退出"); e.Cancel = true; @@ -132,9 +146,43 @@ namespace RFIDSocket } } + private void StateRefresh() + { + if (RFIDData.HeartbeatsState.Where(x => x.IP == MonitorAddress.Text.ToString()).Count() == 0) + { + ConnectPictureBox.Image = Properties.Resources.ConnectNormal; + ConnectState.Text = "正常"; + } + else + { + ConnectPictureBox.Image = Properties.Resources.ConnectWarning; + ConnectState.Text = "异常"; + } + + if (RFIDData.AlarmState.Where(x => x.IP == MonitorAddress.Text.ToString()).Count() == 0) + { + DevicePictureBox.Image = Properties.Resources.ConnectNormal; + DeviceState.Text = "正常"; + } + else + { + DevicePictureBox.Image = Properties.Resources.ConnectWarning; + DeviceState.Text = "异常"; + } + + TotalCount.Text = Content.Count.ToString(); + NormalCount.Text = Content.Where(x => x.Tips == "ok").Count().ToString(); + WarningCount.Text = Content.Where(x => x.Tips != "ok").Count().ToString(); + NoReadCount.Text = Content.Where(x => x.Tips == "noread").Count().ToString(); + NearCount.Text = Content.Where(x => x.Tips == "near").Count().ToString(); + ShortCount.Text = Content.Where(x => x.Tips == "short").Count().ToString(); + MultiCount.Text = Content.Where(x => x.Tips == "multi").Count().ToString(); + } + private void ContentPages(int skip) { - CotentData.DataSource = RFIDData.rFIDContents.Skip(skip).Take(50).ToList(); + Content = RFIDData.rFIDContents.Where(x => x.IP == MonitorAddress.Text.ToString()).Reverse().Take(200).ToList(); + CotentData.DataSource = Content.Skip(skip).Take(50).ToList(); } private void PgUp_Click(object sender, EventArgs e) @@ -162,6 +210,5 @@ namespace RFIDSocket RFIDLog rFIDLog = new RFIDLog(); rFIDLog.Show(); } - } } diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj index 79327fc..db0ff92 100644 --- a/RFIDSocket/RFIDSocket.csproj +++ b/RFIDSocket/RFIDSocket.csproj @@ -88,6 +88,7 @@ RFIDSocket.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -118,9 +119,7 @@ - - - + Always diff --git a/RFIDSocket/RFIDSocket.resx b/RFIDSocket/RFIDSocket.resx index 2b3df5e..7d63d68 100644 --- a/RFIDSocket/RFIDSocket.resx +++ b/RFIDSocket/RFIDSocket.resx @@ -117,7 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 199, 21 + + + 199, 21 + - 17, 17 + 21, 21 \ No newline at end of file