From 10e3a135dda8d3735fedeec322b047a7d2129c05 Mon Sep 17 00:00:00 2001 From: TianMaiCheng <746290578@qq.com> Date: Fri, 27 Feb 2026 15:53:42 +0800 Subject: [PATCH] =?UTF-8?q?TCL=E7=94=B5=E5=AD=90=E7=8C=AB=E7=9C=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CRICS_V3_1124.suo | Bin 12780544 -> 12780544 bytes CommonEntity/TCLToken.cs | 3 +- ConsoleApplication666/Program.cs | 2 +- Domain/Host.cs | 10 ++++ Domain/Host.hbm.xml | 2 + RCUHost/Implement/New_RoomStatusReceiver.cs | 29 ++++++++--- RCUHost/Implement/RoomStatusReceiver.cs | 20 +++++-- Service/Implement/HostManager.cs | 6 +++ WebSite/Controllers/HostController.cs | 2 + WebSite/Controllers/IoTController.cs | 55 ++++++++++++-------- WebSite/Controllers/SysHotelController.cs | 2 + WebSite/Views/Host/SmartVoiceBinding.ascx | 30 +++++++++++ 12 files changed, 128 insertions(+), 33 deletions(-) diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index a6f04f434be388425d4e10aaf47282cba154901e..df7ac96640e2f2af86737f03da96ec32c01c3595 100644 GIT binary patch delta 34005 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%0A}$ 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 delta 22965 zcmd6Pdt6l2`uD88_Y9jEE(0PU5e_gR64HpMq=v)AON1~I-ceD>%qtq2q2XZWEmCCb zJZ5HyhDN4%$(?03nx|uBMn;`7Gc+rYc?ylJ*7JOy@AIs2FRwJYAq_bai&vth&L+o#-S54+_FN*1M{Wpv7osg3WQ){E* zp{7XB-!Zzb!2wE6Z77|;z+BZ^;+5vj5wveweGb_=FqxVod~D=7DW{RM(i~4aAM^>P zi~?~SHJoH-YW^kIrnvS=Y$SER*PH2ink6U;OYC@`adh}`Ig`8tSC6JmvrHyha<62k z#_yzwakxKHeO3DZmn5=Z_K_QCVQ>}KY zxn5~gc5aJc^OR3sTSRed1#P(EsHDGOC0C9yUODlaiMIZ%j|W-L_lTnS=%8?N&2keX3*!$`MVIRxb{XUS9Uu+!=(`A;GP(g#>x5!w4A|Yxn7gB_fx8l zS{2*77bxXkuan#-y5-_AFVdQA(ohURB+I7>53qD9iK?(-U{jdEaDryf5{4-`hs)V~ z=^_i(zER5;atJld#MkE6g-GE^rlftakdmKdDNycU#rA=X zO{Sp(q;#d>{RBGtfQaRJ>;$ddCSk^pMUoI8jHEBpQ{t&4m=&?(w7G;0AjeD0PG?4n z4i-sloII@hW(;)0&gzxuK~GT92y-&VrW~`epDW!OvNcx7RI^oxVy`M^Uw)Q8Ue%FX zoo1S_jnCyvVTsiIJuE}nrBJ2vR1AeQ3&Y7X(Pt%^`4$&Wq|5%hhR~2%rVupxo=6R^ zhGmhnRtlvNrw2tShrTdTR)NT;GoGyDEir;yP#mAF;xFo?cmCqT*ULZ}S}67=_rt3r z>ElDpfkP(kkjHm>j^b=GQOZcsPR>)ZjjaC0P@LbaoISZnDLGk6OZ=GK^MXCtQ^9QP zRhrOR*_(e=T5blA^9dnd_{N~zY}{ZRVCZ8g+#FU(t0jJv7IY}0SHl?XPc>Xui&Jb z0x=1TvtkD80(A|>5`;o^F(}R7ETQuQC1=}sgeWJz34z&glA{~6q~%9r9OkTCAjf7F zr_Hrea%KtzXA02zZaL`DDrM+}OlmpQCEg=hLfL5AoGD~dv(Iz!)Mef-KI3~t#d^Ao zn(o00YyK)(Y5K`at=rjrYM22x)4Tu!+W3=1$m4vrn*^*>Z~UcQ{lxbw3>YFtrR~N!364DW_k<3R}er*eHln~jAl&c7!q1s4|6+LN;L50z1JFPM~!A3Rh#1#iclXXFoY?1IAH7@^$! z%|mk}7~P`Z22w^O8&1tH&h?|_JZX+%{w-9yrCp^I+tpCYzb0pBI<74LHI=J(Ar-}< zH)-8XX2trejW5y+vL)8rjhkSGmeA%(Hl7;CusFfVsHHnbTbqHJ`^8Aj0KKccb7eM3 z<+5Fyzl$p>xQ_RySy5saYJBBL2J5T5efdFJGK1lYZf5ch*4}#=v2wX5Mg6`=b9%uT z-6{iD<9t~7tSCxa8N!`oj6f}RHd?v#^Gapy&m(E%C*~zszYJib{@;C12yHB}2jGVH zqcOpkWY^8Qm7)`iXdSOtXD$^cR$!)AdG)5GU48d0$FF^ z4ZX_-JE`SaW;SlbWR_^Aj2cQ{&{s3biVGc#9Iwe-zmpW(4VcCaZR4o49FZ08bsGsY zM~)=dATgXuE(b1Ga<7}X)?hLIF34oN%p$1aQ^};H{VSYK=3%zI-zFv~Ro4T`#6k<7z2_Zu+xiR!o=2!pXZ$ zVyMvv+B=bU`?Dc*W|JJsexwRNHdZ-*axl64Sc-Dwik;j&R>x4Yg~e0M1Conu@xGzt zdRQ=1!=hLdt+GIoj_Zilb+$YUow`c>rwXH}p$80RS~z<{2|k@cRU=sl*?y73JP|u%d;gdjM+nPhJ2gyDwXS0*HO>@<3llVj%%EoDWcZl^$qFd6 zCUx3a$_{2L$r=QA0VB>4K`z>x>Z{p^C8l7Fj;CDlYCDF`kBX`B!HA||r)CE&c3`?PmXjZ2? zedl9>r2O==Oowc23GK<3=2Ou*V*)iy$6Tj*V?)^sbU2EAM%9hNQq3UP{Dly~$H-@@ zjH+5;G+NHfl;mQ;>>qrP5CwGZ;iSg1#$bv{!cZ1(6X4~~yPZ@u%pFS2qgj;DD3CK( zNTr%YxQnKawnTDv9iGwN-PdTs(b!CFM!egZ!)Ox>2D83k)+ewxu$OTZ@i)bbA>KN^=( z!MmTw4VmT$HuZM%KJTVmXN3i18<$zgHdAyGTS1N&r4UNHAo*cwe1jH~^r3L|XQ!zt z6@yvz1XghK=1^ldG*Hfw{{!Uxoke)2x%r!pR)*f_tsA)KzK=+v#s@G%6KjPOa!&>$0NKe+pPH~I#0u^<}<7_Xoe(YEJoj_R`Afi*^LY{YM~1^d2xes5wLP z=0|AvwE6)YH$*7czY1pmq6uRdf|h|mBp97yaxSdUK`5X;*THzjwo|5}0Z<|i+Q^yn zUCd>gQE=ir{M>P{!I9*wa70!VgMNUNcR&c%ee`A5z9;(;`8m7GuSS6nb zeww*JYadd20i5l_-3L=c5r$IuMlPh~EAcAaTwH>U{hW43ieu>XTd8)sdA|hJn?5)c zBXva}_YSNjPF+xAZAJ*K=}{d)JH}ydVMcSP#M{kEH^;IlN`hTLDlHf$h^VlPHV+J}^PM7xy<8RX;5wx{F3?TG)w-Cx5@k}Dy z$0tSi7475UN6V*S7z-{qHT@k=#gTYDZqiTD;YEOX)~Rec*(+cmow0WEJjP;Z?G%_l zE$&`^R$fT%DL_hd@`XYk8JTJAqwp%W7KcC7-i(lY6(_aPin}58Mn7XxOi%q zhqkNV#35~Ix75k~=-?R)M$tSNea#-azl#_m7-rGgITGT?b}mWNh~T*l%;p@aL~%Ic zF$KRusdv)ZbJCMw@{9qL=S<;F@GxgzwUun`EC!Hk8HWRK-|)SWbhE(iz#CtN&VK}d z?^wzltXzpcH-d^*BQU!7yci0W2@va9s(us~xW>ZeH!p#9PM#xAq^cEA%3qbuA7)a` z(=3-3??4P+av(^iUZ6{C97bYI#XP5!CXsDU!x1=-|X^ zHjjNlXUnk)&a7cep!?u?@+hw-Xx{QQxMJ%A(r}tt#dgxxOu!cS#%v9gVJw#ch%av+ zhh9qZXCtY~Xo?``rz}*kF>;29V3+@yj6VH)sFV#;9sL}8ifStHz>R1iuX;-^e3wSL zx!!Z9QuDV^5o@j(Dl7wQ(Jyd0xt>KUm`4~p?kQlTGW4MDk0|f!i}!M%Jc2GSXYW$R zO1yXba_mJd%b_g7d9WAWftZ}uSiTm$9LT;zY5Rm^xTyQiK-Kwb{CB??hKaw%1G-51IN8a=0JGyl$`n~cYJjReu zteV@VO>&6PM{`G$N$AT_-nx#Qob9I!y{_Zr#w8V;cSZ;(EKUB z(1dkZhDV59xoZoL#;Ir>6d%NN8&hAi7HR6!@SCwt6d`%40N8$$f-37+7klkTxvt zScMCFXuc@}h8JM;rGiLfG@iL%U-Jzej4|YVfJL$viheO{85KrrO#X452emFD%;*P^ zDMC6t<P}djJNC%j9AXK!I3ScH}4}lZIYqI!dv| zJnRtOM|_tFv*2xj!#sCQF64-VTn(@yE}bpGFk9Ir3f#q(u@cxsF!P-GXntOVOWTRb z$p3BiK;=X(x8Ok<)YeQ@<4(-Z!MzB}LUv+xz!kbU)IK;)iU7#rP)TQpT6Q1|MfznP zwTv<&nR8U;R6-gWtJg=x_5duQ%xt{(yEx~tz!QmBt)(7|5>9(LA?!^7Ohvr$l+t*@ zb&>ysm`Hq`3vS6H7K1`_C!wofV(l!^*G@~Rdmx?p6pw5^$;v2ZiVWxS z$bOeFnX5-CIZuM1xSd(?e!{Xj5ehRN;Avu6GTJuaCH2H1l{PV#%yWrw3i=_nwTbzO zv{*3NDEAW6TwI1dCkw%?2R?y$RXOj7U73uP;jE+ zJ!xZ)(@>7jHM>0J9E)R(IyqEzmX&KJyDbM02@lV)7&&K+Owpoj;UpukZ%Q0@o!OMw z4E@r{@k(_pKG!Wc^X8pK%BPg*!{ zC%ldgy}=7CP+ATK&_^%$a|rxb#BQ3hZntsfAdZ42A$lo!RLU1j61lF)Svu)&y~I*E zNyqVvl^P4W55(1f)i|zdTMQM=l9G|782ZHaOinr3^)%AwniB*>j;HaDAtmU&B}aNL zV)389z^ZBD1-4kH-B$h}@qRA_TZ)h~$P_~j6WlRmy?|+t`GGCvUSH#sGw2GBu-5nT zS%T{?(F^ z!^v$DdB;l=c?K&5m)kJ|V}$}baRa!48&sZ?dN}SFEcc=2-!NN8eg{?MS}t=>lz|S#Q}jCN z8>;EObFjxOAc(FLa>@VkS|09J(Ai9ByfX7K&fzhdoh5bogO^AT${8vTif z{1`cRr{U;cfq;k*)7!?>aT4`xh-Turgh+D_cL*KwMV46G}9$#5j$niW~C%;R zaG>cy^tK@o%7vs=2DBMj*#4fInCYTG0oW=)7`)#q#K#FQho}j?ggFwG-Y?jsu3uj0 zMY|KcFm2qYxnBxPQTz854oj3BAZ+B2tUYGm7FUWfUP^10!VV&!4M|f5(xpwmy81{|t$u{;KO;BK#o!LOJ zo4m2{!l%+7bbr|SL2-ESSv}U_fWM);kpu4eG%H_tnvUKLzYSF4M?MNLj7_vE~OH4 zAv@v#V!zFFB7^S`PJ3^2}3Q% zkkR=*8&G^_8*lcJ+p1Hz8)>&)TtF?i0QcM#@Jm~GwL%xgS`!Rkn#p)=3zZHPDk-Lv zB`b|{xRrUE)|`}wQA4uHO5=Sr6Wx=i<+YwD?vF!}@R(JI40jvOb?gbsF~&i=mh%i> zZw*`XoI5p-fx^V}g8lNw2~Ff0BbeAYPSW#Q6iOH^1Ph}L#GW?x(~2?JbZ*}A$a%Nh zhIPFMEv}~tzpB%y`DIfgCg3^{*6?ShQuFx07+f$0?i?Y;I%yPb_-@f;a#x$VW(}v# z!-YjWe#)Wy4hnW0Dy5)ic*dw<7`A;YfabM4Pb2DYaI%P4E!bZ0;Vbz~^LP;kEbbIA zqbSnQ)|3so%)_4!@Ep#pSt0?2 zx=#|8Q5Nz8I>NA3z|$p7f?3R%C@cmu)_wk==UF#>Ef*bi1MGD&f%lkzD^3;w9{Ejx zKCfM>W!cDXG1=&ZSJ?z)+k?j`S{i1wo>bz_-7yHx-8~cbH24&z;87`& ziY_9nJbt*yQPxqV;#=f=cfe4%W(bMwkPcd_rVH6rFikk3W=s`=8M{E;?~y=NU9?uB zqYp~dm?v{r5MMosFVbLS`8%=<&-`6Z#kS3aR&?gHQ^-g>qmS}&!zc=UBlRf0T-9PI zp0d$m&6=w{{HRYESPYP}E()9!|Qrt0v^0^+c-5OAbE4UD$Le^rH5pOmE3cD z>{Qo;VyHtALNB#+p-|bG&eeA<W@Hc2_aPrn*<+j75c-r*a>L~V#GV1``{kMtS`8Vi=7(9h%+j+Y&4BZxyYNkP1 zct=-mLPv#jnqP_6cxT-Cg?eL~AevaS68-KNa(s*jonLJkN!cgx3DI$hUS9y);YZhw z3(Ha3l}{zd;j7N=0Abn2keTSGL&S3t3wbfoNc#Q*!9&5rpP539Z&>ZjqT%QElu=_9-_*y{W1;46N;5L1HCTv0WOZ(a1dQPK|ruL9XjCq;a=U&q=Oa zjdB!9Kmy)`?_Jm+tZGL!Zd(P<(te27LcyC>;fSg#d{ZUQIpLJf2fNM+dpOtmJ(9vs z`Xoe(R-;b}-yoxw50KXK4Hg?Od83*XF$OUw@&KB~17oM^4Zv|ow83NFj)oTrYSn2$ zW_*3>;O4e3wqdST(Af)Y1|?qNneVRzD-ACcleOj$K&KhAF=|(Jz?*vt!Tyy3SWv_$ zgK2HIdX6+THYO3VNiFHx!sDOjF9A zsvpV>D;kuFe>q=L8NvQOt#bZUVaCLY!*Hxg&iFqg#0ts%W!tVq( z+fQsqCsmjtX(?50a(H@>E*y>xfurP{n|2W84QV=q(D0Zija{V8^`>g>P_ps!01 zobc*Hr1Y>@d_*&b6-#0il?;+OQu>*fHXy3xHE0M0BPjm?v5(@dL8T)%r#6#l?pDl7qB2t*UUv5KRS|4qqXa{qTusctG!IgsO&{5-0gGE!F zBnmXKEIdw_jyz|fkk5;ug30|aKtFB`Z<~5Q`YA$;qLU@tiu&hJ`ENj+_dQOT*F(|q8^L)?^^D`9d zC2m$A<|i1&-Yiy%eiM+gEHTW7Yc9~p+HuqxD&}ed7EeaTQPg>4wtos0OK-$;-Rc#Ft0|eUpa5qqT z5kdKQw|hbEYSkUQ{LuStc`s@W5##W%LOuYL7J_l)bzEHWKzE1Gi9iuV8DB7nbzhup zT!coN_}AOTbVy&M_m^}^<3y|&Pv>jpjl5Pl(YP2F7imj~tcnyV6e8Y=7Qa_&TY>6O z%!<>+qMofRv56_dL<1dGjA_*1mSt-60)Dl0MqV}8E%)NQd@$MOV;-wIixMl)NV^k- zLMRp~oc;_wT5>1yi1T;Avg{}^zCEv0mF4C{-UQSFAZv>X_>GqX_+_yvkv zf@~AU+gJfPPE=Nndx$PfCkv&mYn6DhZ+?^X- zjnA0!hY7{=ceYWOa6VX6bC6GpH+K!Ev`d0X&59QfTIg&=r*LZQ0+)E~c7jV=+u6wY zi5Tg>mf(7v*Aohw`96M+SkKNrZMc_ zxdW7I`FP)SG}jbt%TTH=n<*e&OycEXC8$*K=PSK~9w8O(FzSRP%C8B zcw}6(g*%7dyh@{=mKMPwi4H#?e#h;?94g4u>VQy0xpr|1s=|125;sJ=6q*|P;rSZ( zquGILeZ^$TpO0DvPr{0Fw7F)<|9=Agni_VhBw7gXlx!LfJ|~o;HS}iP>lZ>4_jVN@@64D3$!B8!y;h z4d@g=hmUmoC#SBpG^GB{`%;kx8i4hTqKDhoyw3onX~5l*yL49pMyWwmZJ7vk_4-bf zz}l#MiZ3VR-qOk`&J>9&foGh0uG^N1lpt6k<1su`w}RSYJT_KLr89wW%Lnx=^X-U~ zN94jBff_a-u0{<$>ShXI*HHSJr6;Ofg-{r+ipu$MHy57!83m3KN6^}lVmZgqMPz>t z$%3}Z65w|m#dND5NRD5O@QlA2qwo?T45XwupJ&llac8qhY5dNQ+|xv0UUwic?+p=V z&;>I{8D9ZbIScSiEurIGlRXg)m_$x;uqsXcf)?`1oXd07WE68=@;6A+1ilI8`S=HO8A8tG*qTD<~XGu1Frjb*noULg0 zg>5zGCaRh1=4sFQ(35f=t)TkdT5XI`Vo3#sM??pZgjOO{G#!zY`w>iPR)18mX@%UJ z?L~V(Xj*)8qqtIIpHN;|$8^8&2ebl<=BMZ457hvEUD^PZFSrgny8(}w$5WR2cpyb% z=bBr}t1IW#trBG)ow>DZsl2u#ZH+myBSWI4I>VKkbU!6`Z#dSnmI!ORDw0L(#TwS% z7xAFLt|dX%16o8MOL__QQAqE<%_H9V9+r2(jdyK#W&*-8i$S{jA#htLPU(Cw~b>+5G?Q z)}Xy78*I$7m?I4=v{KaETzsmRl^Ht5K3js zzJXLUgV}`T$Qa*5rrP^@FKWJD+DNwhksZ|>u!arbCvjT=^-q-+uqAEmrM6STqK6L} z8yC>Y#FLfl3`$KaDx39^qH|hwzyXE6Leb87I@?;=QEBY#BwH^W);1DU&DSavchTzU z2u{|w$TO+vZ7|bo!1o?U(qu@NyErR7k6T8~s+V#wqJ_7Kh!)3je3HT)0IF3`-C>Nu z#G-)aoRSfVR$Z&Hvn{+euiM*>Chf?H&HqG&^=l>J9sqIBB8 zsnB;Q{eUA6E+Rp=E>cT>sSHI$E(FzDw$m${P&t(jBUF`YLUo)IrWaOsC)r;NTSE68 z5V#ll;167mn#y<$Txk4K(oiW89*3Q)pTM_b9OHF2k#&P5Pz$wEismnK@}y*~Sc>|e z9ppq~=cs$%X+z0<+GMAqTquQgh;)X|Ed!$rHrs^FbTXaG!H&qL*Wk;pr6p6#7PpO7 z<=|4jXMk=#1iXwwoIf-PHHj--!L*?Qb?k55#(5lU^%DF*CYEd;NVdPhg$0a4?~{XU z!^tsHTEg+)dh!mJ7E|dBvtH=kUT}-4*<3DnL5)Hhn*yFVQv;pQ82>gnjUtISnp&>W z2MLIUHnRy9d7abOZu$fYQv{0Q->X$(xZTJC^w3II(`fuSY=Y7h zO^cVE*htE~9iZ=6n7ABe!l&KHy99~k2k4VRsBy|9kmFTv06T0dlzQpZHs1~j-HV6r z>HFOD%^@F~Boq34AJc%0R-f4XFXVhm#=ruh><#teZCe%0o>&vFIn2k(7=Z$5=V)m# z?W+_Q^6JzCvI-WfFk2$OnbI4ycm`fws~5gF9rJ?t8argBOUp@fUWLfk{9UFFgw`2mJ&?$&B5E zivf7MLwLK1O7~xSP~LZmJb&4b(yzw_xANaHHpv0Vca zt|ED~&=u@vHPq32wK9r|=K4x#<2Twp63G<~4;*tVP)^jzmt%exfVP>~y#b@BrC8dp zBp)B{DV97W90+o0%LRF_5L!M7bG64UeXdtzTcK;8>yc-TVgw~tBIVNcGI+6Ks}xB!ez3*Z-AYB* zdjyap!fm3oGAvd1^B{|>g?VUUE{01ZCLi=XAtm}ab>vOAVuV<-?~aY+fF8V4sf1#n z{GG8_@Ytn<7#6K)8!)(soFOEGHwg^@`@-C_w^whN^^;3sTa1lV34q89%+a-%>+ zb%|zbJa0@;Q;v=4$8?fe^RLIBlg{%5bTdr&*|vQ|$9WN4lXCuLo)Xn-%7o8R*Yp|| zMc!4JtLfi)9YiKA`f89vZGL}DE%U?*F=TIujnsJ}4LwJ6ptzl{J12V?*-G}0R!2*d>!3e(xg}K^J-M0bi8n1Z$E#G(?GCrgY;sr`-_^B% zYC?^66eA?EP1xVMfaid*zTq~KClzC}5-(G37>XiDJ#%+sk(pA5%Ar~q`_8FBDeB0g z$=gvZJP8psrZ&DYb!{H%O;%K~?uxY^rnl9HOBe zr|5KESB|1#=gwiSgIU^WxQ_2)V{WUE<{5)ID9~hXr~i5qo&~$k40~atAu` zy?Lf;Opw1|*m1M__1M1j)Zfh(dh$Lwl^R};?WdL{%4H~q`N^`L*V1XxaJ=USABpO{ z02{pU5TRm(THak=9B$-0Eo|E6fRD#y(5lpFCf#FbwV7 z5lFTb&5*|lqa}_ORoD8tKQXHPyHBC#9>o28A0RbdujD%oCCM@#oha2~9vXV#z{YHj7*38rF=gAz4Rb}lxLyw&;~9de*;yzz@eJ?|>{Mb4*euTrqDyIf z9zSx>tJUQ z=(K_#P_TY2EK%P)Vjbv1?pbb!ioAZS2}JAR{O+S}?}u)&e(?VH=T7YW>RvhGIo9Ru zhh1pg({e3MoMc5_=|E5w*``_jbVl8FJmegEedTj83|SR6)jv-~iO?0+=ke*FkYwzl zS%}))E(XKz`2RT!MZ{uknvMqRvD{#|KLXBmE4V0=!Eg&v>7F<^sIS$9D`hbM&Lp{; z8eJ)WD(wAG3z6&eK+YAS8 zOWJ9o!oS3BCBF^Ks#?qATVVf!dWMkSqIlF1OzrC2|Gf+q2tEtAh1~!lYU9+d*vo5^ z0*a}o=b-@4KV-XVza*c=BW8A8#XP^s(2X}7jcA8&R?r9|tI;=xXDgCCe;06dE3T&M zF${x^GH%u8*xAe!*Gn+;g*&e^)h(yEF$e3RRMaxDWk=RoX(L@a=v-EP|289N7s|(mDF+~5+UC|KyUB>QgsCQ z9{tr)j$I~;AQeUfO&A{ZF6F#sw35|nzJ!hJ&wUP0^Zn{w_WpyGCDtO~N_CMMownXk^bT2{iyCW>%|kHJ;$ zq4Y1!3-nE1Mds(i>8*4GRO^r8cV5m7wxsgwkyXu~eJE57eb0RHZkj#B2kYy+8SE__ z5BP?QFz^Gr$kPSq018?iav#n3!Tc)nVEqN3aJqW0JeXdD&!DOc=H2SSeX&`LZe29L zo#e%5BD(4lb&89q?=(%Zjv%A!a zn`Ue@$|$fzs#U`*C5RsXY6g4{$g`^U>6U5<4(u`19_^ZLd71)BEWzkMN;YWoFiU50 zuW-ewaRHVXCM|@nw`I}-EtOj>=G(J4Gu*d7bkc^~`l~<3TedN_l%lhbY$oeSzhg>u zOq5!6J$Eakm>HHB+CSYAMf=Q_;rwA%|4D{fhM9)R=)$9*g5I`R7HP-XBxOxZ7@eGL zNh0Ski%UC5Q{FS%f_S2Ef(Ai&NAX9y&6a!kh>*RHrL(W03_XqI$NBFuQE4Abo>oBC ziVwc*DV&^v06;rwybn8lTIiD>P4`jrk0$K0S!d~2muP`${KVo`-Tf?yM*I|y#Y&;B z%y{+m&lacPITLo3a&O|;apngzlx{i0*17!Vp`gbiQT|0sHC094y@6a=mJj@UqZ@t@ z{{J}YULJ6->OSokE~t&Ie#Pugr)}48nyNky{O>K`l7-@(?mclm4ENR~{mIjD$)DZp zZ2ptyw)pwq@m|6Smu^w#SWYvwdanNmu%14N6YuzjxEcdc66$~F0nkoU%e6o0i1)5L zcSP0i_2%Dk0Mt+JyDL*ro%j5Y2kU33CdhinLC1Z4)tUtV9slt-}p7@_*-qvzU${nAp zYwXm_@J0cy9N1_Ql}xXQRNZ?l@Qm&gemm}@hR$Jpf?M+bM=$i|w9`~Vcbuf#m)ud) z)V6zf-f5M z1iJaU|5bK_``(w-8o>_?ffR1tza=slneO6085!J%!Lusi8^~Gee~N~meJGyl9hNE< zMr-c2%%z22_DEE5N?_K$r9U_RCH%$TEd8T~q<71Qof{V>3ts=a{uDr ze#MxLyDry$<@0`6>~BGx!y`7eU2*ML`xR=*IPL%-e_;RhCqWIgJas($e(KX>!f z+ZW?N`?<<#w?8^({rgAUVH?!By|uzJG@*LuhZQruO&n-%!de~{(Do$nt9P{@#YZ&Z zIvLsCgmyr!*%r~>gnmV1QegWPEjuCrUbI!0?}t@)^5OM}>0g@r1*;481rPU%FR)Lc z-)UAC?mKa**KeuUzs?)*c%a#Ud>j7Y-T5D}5cTp z1s)Yxl6wD~z(AvRF_k_M=#m3)1^?+G4RWZhPXy)(dPRF#V4ldXBC3**qiDr9U-k>0 z_>cCdS~>(947K{}(5<`)9#_RID=dgm3k&WlzPzYt^*=9F zzVzLOum9Tf=7K48H&&uC4w3oa#eUfPi8xvL9!V&~%BOA_495YE_69P;0{s6k8#8>4 z|EFSuU3aj`UX(3f8;GrziGras7}v|21w+de43Akf^u-3WrHF2fM|%rbKD2S zMTUFvLB)YD@%xz@kBWv{1DIi(*=U%QU@(OCG#Z@IsH+-oG>ke3J(-TtBr<(`2N`oM#BNLx1!!?mw#RjR% z_QxLfqrpuqQ7wHpw!mM?X;+zLt&On|JLDcn9Hfid+8E#XoIC{AxZ1Cy)^S~%q~i9k zYU}u}c^UL>ZC7lbsO_rnEzE5{yR5agDAPz`(NV3}WS&zaPZMPzyT1x%Bha-r8iiBp|4T*wiQBeP&TzqsuxYLP`LeqylAN@WvQv> zQd6&`rrt|UsY^}wFE#bqZ|a*_rLQSZU#y}+yd}>O>k&Y!c8vF~==QNv>g$rn;_D;r zhnBTcUr0Z-l^#g>lzvXGwo}fuwEFN1(~v=kLD~^X65HK>=rgtK5**9Yrl&#rL!4^b z^z>tQ2UUN3ulLc5O)by*_sQCD|2-WZqR#s)cTw`nblaj2%M6B8=x)bK{AvZB+_VPj z1r^(|0sEYwa=kV|9dY~`^m^#is2oUOn#w&phZ&Yx5QHksupWypdn+^S?Szd5Cz#;{ zsHA*>83J*<(`9Bj(HXzugnIQjjP>LM!Cu(UY=+!Pn$td7RJt_-13dxXC*MBSier2hmX*Go0m+19K?Xnu zLIyzwLmpI1U(WtmqRa>(nda7K=Zc1jh)Q7u)znG_e%hf?>g* zM!GkiroWzDKv(>CIo15pgX-C`dNmvJkXoS5b_kH9I^=FhEzZnL!O2#fjk3Q3RwnO4p{+N33(P$33(2( z3bGnf1z7{BhA5D=kaZ9bgdpo7&qFpqUVvY=dlv zyaK6*yb9R?c@44?vJ27x*$vqP*$deRc^$GJqC(z)9DuwDc?)t7@;2lU /// /// - public static void SendData(string hotelcode, string roomnum, string CUID, string skillid, string sceneCode, int count = 0) + public static void SendData(string hotelcode, string roomnum, string CUID, string skillid, string sceneCode, int count = 0,Dictionary extra_params=null) { try { @@ -77,6 +77,7 @@ namespace CommonEntity dic1.Add("cuid", roomnum); dic1.Add("sceneCode", sceneCode); dic1.Add("botId", skillid); + dic1.Add("params",Newtonsoft.Json.JsonConvert.SerializeObject(extra_params)); logger.Error("TCL send data"); diff --git a/ConsoleApplication666/Program.cs b/ConsoleApplication666/Program.cs index b2d6def..c0927de 100644 --- a/ConsoleApplication666/Program.cs +++ b/ConsoleApplication666/Program.cs @@ -25,7 +25,7 @@ namespace ConsoleApplication666 static void Main(string[] args) { - + bool NewResult = true || false; BigInteger hugeNumber = BigInteger.Parse("1234567890123456789012345678901234567890"); var H= hugeNumber.ToByteArray(); diff --git a/Domain/Host.cs b/Domain/Host.cs index fa7e51b..838515b 100644 --- a/Domain/Host.cs +++ b/Domain/Host.cs @@ -659,5 +659,15 @@ namespace Domain public virtual bool IsWelcomeDisableTime { get; set; } public virtual string FCS_locationUUID { get; set; } public virtual string HiWeiCUID { get; set; } + /// + /// 电子门铃 + /// 视频流地址 + /// + public virtual string EBell_RSTP { get; set; } + + /// + /// 电子门铃在屏幕上的显示时间 + /// + public virtual int EBell_TV_duration { get; set; } } } diff --git a/Domain/Host.hbm.xml b/Domain/Host.hbm.xml index ac0dc54..dca6548 100644 --- a/Domain/Host.hbm.xml +++ b/Domain/Host.hbm.xml @@ -81,5 +81,7 @@ + + diff --git a/RCUHost/Implement/New_RoomStatusReceiver.cs b/RCUHost/Implement/New_RoomStatusReceiver.cs index 826bb12..4650c4d 100644 --- a/RCUHost/Implement/New_RoomStatusReceiver.cs +++ b/RCUHost/Implement/New_RoomStatusReceiver.cs @@ -407,12 +407,12 @@ namespace RCUHost.Implement { hostModal.Modal = new RoomTypeModalCache() { ModalAddress = device.Value.Address }; } - if (hostModal.Modal!=null) + if (hostModal.Modal != null) { if (string.IsNullOrEmpty(hostModal.Modal.ModalAddress)) { - hostModal.Modal.ModalAddress = device.Value.Address; - } + hostModal.Modal.ModalAddress = device.Value.Address; + } } } else @@ -549,6 +549,9 @@ namespace RCUHost.Implement string TCLcuid = host.TCLCUID; string skillid = host.TCLSkillID; + string ebell_rtsp = host.EBell_RSTP; + int du = host.EBell_TV_duration; + //如果是息屏 //004000022 if (device.Value.Address.Equals("004000022")) @@ -564,12 +567,26 @@ namespace RCUHost.Implement { TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SIP"); } - if (hotelcode.Equals("1085")) + + //if (hotelcode.Equals("1085")) + //{ + // if (hostModal.Modal.ModalAddress.Equals("004000021")) + // { + // TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "ROMANTIC"); + // } + //} + + //这个是电子门铃 + if (hostModal.Modal.ModalAddress.Equals("004000021")) { - if (hostModal.Modal.ModalAddress.Equals("004000021")) + Dictionary ddd = new Dictionary(); + if (!string.IsNullOrEmpty(ebell_rtsp)) { - TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "ROMANTIC"); + ddd.Add("url",ebell_rtsp); + ddd.Add("display_duration",du.ToString()); } + + TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "DOORBELL",0,ddd); } } diff --git a/RCUHost/Implement/RoomStatusReceiver.cs b/RCUHost/Implement/RoomStatusReceiver.cs index 25c1091..98fac73 100644 --- a/RCUHost/Implement/RoomStatusReceiver.cs +++ b/RCUHost/Implement/RoomStatusReceiver.cs @@ -631,12 +631,26 @@ namespace RCUHost.Implement { TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SIP"); } - if (hotelcode.Equals("1085")) + //if (hotelcode.Equals("1085")) + //{ + // if (hostModal.Modal.ModalAddress.Equals("004000023")) + // { + // TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "ROMANTIC"); + // } + //} + + string ebell_rtsp = host.EBell_RSTP; + int du = host.EBell_TV_duration; + if (hostModal.Modal.ModalAddress.Equals("004000021")) { - if (hostModal.Modal.ModalAddress.Equals("004000023")) + Dictionary ddd = new Dictionary(); + if (!string.IsNullOrEmpty(ebell_rtsp)) { - TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "ROMANTIC"); + ddd.Add("url", ebell_rtsp); + ddd.Add("display_duration", du.ToString()); } + + TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "DOORBELL", 0, ddd); } } #endregion diff --git a/Service/Implement/HostManager.cs b/Service/Implement/HostManager.cs index 4112966..d1285d8 100644 --- a/Service/Implement/HostManager.cs +++ b/Service/Implement/HostManager.cs @@ -356,6 +356,12 @@ namespace Service.Implement host.IsWelcomeDisableTime = entity.IsWelcomeDisableTime; host.DisableStartTime = entity.DisableStartTime; host.DisableEndTime = entity.DisableEndTime; + host.EBell_RSTP = entity.EBell_RSTP; + if (entity.EBell_TV_duration==0) + { + entity.EBell_TV_duration = 20000; + } + host.EBell_TV_duration = entity.EBell_TV_duration; //string Key = CacheKey.HostInfo_Key_HostNumber + "_" + host.HostNumber; //object obj = MemoryCacheHelper.Get(Key); diff --git a/WebSite/Controllers/HostController.cs b/WebSite/Controllers/HostController.cs index d0b4f8b..f9c5ac3 100644 --- a/WebSite/Controllers/HostController.cs +++ b/WebSite/Controllers/HostController.cs @@ -1185,6 +1185,8 @@ namespace WebSite.Controllers host_take.DisableStartTime = entity.DisableStartTime; host_take.DisableEndTime = entity.DisableEndTime; host_take.IsWelcomeDisableTime = entity.IsWelcomeDisableTime; + host_take.EBell_RSTP = entity.EBell_RSTP; + host_take.EBell_TV_duration = entity.EBell_TV_duration; } //天猫的发现设备 diff --git a/WebSite/Controllers/IoTController.cs b/WebSite/Controllers/IoTController.cs index db1be93..a11ae87 100644 --- a/WebSite/Controllers/IoTController.cs +++ b/WebSite/Controllers/IoTController.cs @@ -47,16 +47,20 @@ namespace WebSite.Controllers /// private bool CheckGetPower(Host host) { + bool JieGuo = false; bool Result = BBB(host); try { string KKK1 = CacheKey.TakeCardOnLine + "_" + host.HostNumber; CommonEntity.DataTongJi.MTakeCardData Chaka = CSRedisCacheHelper.Get_Partition(KKK1, 5); + + byte isChaKa = 0x02; if (Chaka != null) { string KeyFilter1 = "NEWDiff"; string KeyFilter2 = "OLDDiff"; + isChaKa = Chaka.Status; if (Chaka.Status == 0x01 && Result == false) { RCUHost.RCUHostCommon.tools.LanJieData(KeyFilter1, host.SysHotel.Code); @@ -67,18 +71,25 @@ namespace WebSite.Controllers RCUHost.RCUHostCommon.tools.LanJieData(KeyFilter2, host.SysHotel.Code); } - Result = Result || Chaka.Status == 0x01; - if (Result == true) - { - return true; - } + } + bool NewResult = Result || Chaka.Status == 0x01; + if (NewResult == true) + { + JieGuo = true; + return true; + } + else + { + JieGuo = false; + return false; } } catch (Exception ex) { + JieGuo = false; logger.Error("取电数据不同" + ex.Message); } - return Result; + return JieGuo; } public static bool BBB(Host host) { @@ -7433,7 +7444,7 @@ namespace WebSite.Controllers { var action = item.action; var name = item.applianceName; - //var area = item.area; + var area = item.area; List q1 = new List(); if (name.Equals("灯")) { @@ -7441,10 +7452,10 @@ namespace WebSite.Controllers } else { - //if (!string.IsNullOrEmpty(area)) - //{ - // name = area+ name; - //} + if (!string.IsNullOrEmpty(area)) + { + name = area + name; + } q1 = hostModals.Where(A => A.Modal.Name.Equals(name) || A.Modal.AliasName.Equals(name)).ToList(); } if (q1 != null && q1.Count > 0) @@ -7478,12 +7489,12 @@ namespace WebSite.Controllers { var action = item.action; var name = item.applianceName; - //var area = item.area; + var area = item.area; var value = item.value; - //if (!string.IsNullOrEmpty(area)) - //{ - // name = area + name; - //} + if (!string.IsNullOrEmpty(area)) + { + name = area + name; + } var q1 = hostModals.Where(A => A.Modal.Type == DeviceType.AirConditioner && (A.Modal.Name.Equals(name) || A.Modal.AliasName.Equals(name))); foreach (var item_inter in q1) @@ -7564,12 +7575,12 @@ namespace WebSite.Controllers { var action = item.action; var name = item.applianceName; - //var area = item.area; + var area = item.area; int hid = int.Parse(hotelid); - //if (!string.IsNullOrEmpty(area)) - //{ - // name = area + name; - //} + if (!string.IsNullOrEmpty(area)) + { + name = area + name; + } var scene = RoomTypeSceneManager.LoadAll().Where(A => A.HotelID == hid && A.Name.Equals(name)).FirstOrDefault(); if (scene != null) { @@ -7623,7 +7634,7 @@ namespace WebSite.Controllers public string action { get; set; } public string applianceName { get; set; } public string value { get; set; } - //public string area { get; set; } + public string area { get; set; } } public class TV_ResponseData { diff --git a/WebSite/Controllers/SysHotelController.cs b/WebSite/Controllers/SysHotelController.cs index 2a36927..69b8d6d 100644 --- a/WebSite/Controllers/SysHotelController.cs +++ b/WebSite/Controllers/SysHotelController.cs @@ -351,6 +351,8 @@ namespace WebSite.Controllers { Host TakeOut = null; string HostNumberOnly = item.HostNumber; + string XiaoDuKongZhiKey = CacheKey.XiaoDuYuYin + "_" + item.XiaoDuCUID; + HttpContext.Cache.Remove(XiaoDuKongZhiKey); string Key = CacheKey.HostInfo_Key_HostNumber + "_" + HostNumberOnly; object obj = MemoryCacheHelper.Get(Key); if (obj != null) diff --git a/WebSite/Views/Host/SmartVoiceBinding.ascx b/WebSite/Views/Host/SmartVoiceBinding.ascx index c514517..349228a 100644 --- a/WebSite/Views/Host/SmartVoiceBinding.ascx +++ b/WebSite/Views/Host/SmartVoiceBinding.ascx @@ -133,5 +133,35 @@ labelposition="left" value="<%= Model.DisableEndTime %>" /> + + + + + + + + + + + <%----%> + + + + + + + + + + + 毫秒 + +