From c0c9157a611af1db2daed87230c4b63670adcbb6 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 3 Sep 2024 21:08:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8E=E9=A1=B9=E7=9B=AE=E7=BB=91=E5=AE=9A=E8=A1=A8=E5=8E=BB?= =?UTF-8?q?=E9=99=A4tenantId=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.java index a8d88a2..edfca53 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.java @@ -1,5 +1,6 @@ package com.hnac.hzinfo.inspect.obj.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.springblade.core.datascope.annotation.UserDataAuth; import com.hnac.hzinfo.inspect.obj.vo.TemplateProjectVo; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,7 @@ public interface ObjectTemplateMapper extends BaseMapper { * 根据对象id获取模板list * @return */ + @InterceptorIgnore(tenantLine = "true") List getListByObjectId(@Param("objectId") Long objectId, @Param("type") String type); /** @@ -27,6 +29,7 @@ public interface ObjectTemplateMapper extends BaseMapper { * 根据对象id获取模板项目内容 * @param objectId */ + @InterceptorIgnore(tenantLine = "true") List getTemplateByObjectId(Long objectId); From 4dd210c7803cd86c682751636d0cd87f7210b1b2 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Tue, 3 Sep 2024 21:14:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9C=88=E6=8A=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/word/stationMonthReport.docx | Bin 24431 -> 24430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/hzims-service/operational/src/main/resources/template/word/stationMonthReport.docx b/hzims-service/operational/src/main/resources/template/word/stationMonthReport.docx index 58e7f11e2d5e1ac4f0529f545712c1a65cc8eb7d..cc5084f131333930a9629fe0c81ee80f60bdd152 100644 GIT binary patch delta 10203 zcmZ9SWlSAR^ybmxZpEGA?(T4ri_68`-TmV37k8()yIXND?ry~?&=%Qucaz=ZKbf2l zCu2FuGjmSnciRtr(+{1@10OK_8O4_($Ox^MV#%x^UGf#aD7?O05Z^|pZiEDW)m7^e z$V9&Y&#c!tj?him8ZrcE49Qe&7q4@-N^HVodD@mO&@QljT5vzxJBapNmWO6y5%pI^ z|CX{vNd%I-|6SxS@-w5Hq4?Ersrdw!V2*D{K0}!vf)C9OQb;{nZhDU{Q8X81=zO$q zdbc9(edqS00327wO)#riMe+CoARF$4bjy{Td1W9{RzOC$tF{${Kk2B2E0 z+E`T)77iB*3JMV_3V0|!6vwY=2q}Ul1NQ+(*l{DgX?7_e3f2L7aB8WstGvk3-C8 z3G6b8<1W_stCIa}evWdGa%r>eu#iRL^&A?+~nXYx}twNne*n~X#2;6?#? zJD4+7U@t>k*{b1hRGqY)CBpsaWD({ebs)OMQ- zeaBj8#_4>h_J*5+X=ZwERb0>PsRPUNO$1h7Q~gy@;?`GIaC8G*<=OT3e$`oh4sqWp z&=#vH(RcV80r6(14mH-JBgn;9!xOBSFQQ0+oOzL97GJ-G8&vunU0xFJ=V)ENB`X$( zH|1=q^Q{`$uBxk=e{%}sgLz%#G!_}C-!&2?FA&`&*Lc&vg-q3-?tMoPjj1%v>%mLp9 zA0?&fOwCD|{Rf+oSB?mVeN5jkScodC z6u5_J5<=LK=(ys_+yy+W03LQWL6mTuw^w6M(hWX23~v+)|FS)8#~~nzX6(}rp42;~ z#^6(s5u6pc-}t`Gbs4{J);U?5&!b7s-#V@?Sk|{6Jm&;WUtK$__Wv#k1k^c(r!3nG zkPe(VtvdCXUfb(@KCtz78$17*-KpP-1M}`<^)>eIIXkUxs{L#*?!xBXa#}-T^X{|S zkNWWP=(_N3c-`7ETJCGUMW|yEj^cmN5xdKE`a1j%wX)+ZyzSU^XR`87U>lRF&!*Q~s7I0b8CKo zE?OlyQIF}dxAHf)=ChmITjSl^sLb3x>6CbRa_ss+m62RK;vK8^P2fC6ULAVCmMAvg zb4qIne3=)X$6Cf-cf#lOh;7rZH_VxyeMG5Fu_#Hh*9 zICT~QA5#Lct&N1YO}qeG%ss62AU5O!qHhjA;a~CU%lFchyF2S&i{128JH1aY1~UXc zl(&=nc<)o^&z0+5Tz83&kn(}?Y8g}3@;XoFXdBktoL792CR2Y*Q+37l+D|PX9>l+^ zZmmBH=2z_9OMpJ{Do_!w@I}vH>Zp3n;6Ie#Uc4MjFTyaRc1bA`et_e)xr7Za*Ybhm z2+C_7LhOVtc+BM2vwE5Skyptzoz@d#^8S(jk#FSQ)9~%0LHp5v&T^2({J(PsDx^IO>r3IbyxS-ks$7`KL~<1oza z7a#F|o?yOVPM5$2$cKWcC*2Xo$Jzcp0XX1cw?>7mKVk2u)01R!)ctZjj%>mLEP(v8 z97&JXI}z1fI(pQ{cpG(yD088GZG=YUOYnHs1lZxGjuu@+gU+HhGa4I; zluHwZYXI>nN$MwN*YdUD-&Hi>U5{V6Z9>b>?I7i}R3AeqiaF+`F}So^RL`v?i3dbP&`#c!ycfn{h`hf`_O|0KR<1J}un zR0=ZD?WcF#g}@he)aE31!|#3`zsob7dVqIm126Bl=4eRO?56?4A53TMv=zU4RYn&_ z*vP=XpZ5sPWS?(0_r&BUbg&g=DjsOrmk#i47FeKWc0)8;rtfe>{6@g>-*cS-to@-t za(ruQG|=Dp2$7XUxAx|dzcc2hl=dI56sCWM2L?;JL13J4UD(;LulxH^a>l)33d1vY76$ae> zne<2ad^z89L*1oqI0C z8df3{=-+WOjP)j)9+@qzOT}8+rCQ`!{h|a-Z-LcrSSkrkd!WU*cnt1ZN?Crn?SswG zgTfec(>Vg)Dj`Q~F# z7Onea>+a&{AOvCD2FpYb!1nySYaX2$;-z@s(GP;-VEy|KmgIZ!zz(c+?@3VL20}pY zGc=g}lRdLkqiLnDsR+yup#ql;{YszXRSa+6>gx&MNn$w<(jz2q{aKK8l@ZMix zrAlnveC`W2xz(?~4*P9)=U)59BjXa-KGDecl4esUb5ur(4qb1y0EN}8H`{{c3XyP} zG=@scG=ADHYx&DodtawZ5D!-SHqL96bqbjG+7XfA_@5cFNG>KFvfErqJg#BmuXQGB zH|HG%%|Uv7cBJwZm8R%S#$v+ThI~xAUI>4`+MOr%1h5VAon9B*fnzP&o%rs|ESx2^ z?4J|gFah^ z`Z^Ahj&zJjd!H-w{Nu>UmhsL36N(c#nSnqqT0?A2Ga>ekDBqb}{HspELgS5Z?ZgSc zj#h|It!Bavlt#NE<9(ValX4~_WWXc|v9DPS`H_XsSEZDIaO^PitkEHSwUUU_IFT-Y z%}a!+moG1(xh#j`1sAc9uL9HRNgdL;d;aP+Z-^Yf1;gPA>^@U8 zx#rUZKaOw6jQ%L4@wH>LjOATyd;xnrY^m5FCe2P*BF#@W7opg(rWt2Ba)I>-63eI= zK<9L}S#{#(D7ameCz`#NqbPj$nAqwCUI=&BTJjFUqOT?{FUE%}zb3C=u- zfLbyV;+o7|{FWBb>K_6b(u~==yfko>G-x!5T#S>h!>J~r<6kBj;AV@EUDL`>oP>Hv zC#;iB@gPrd2e%~*6U*N$e}U_4>1fEVTM0|!tUhNK!`7T{IzGLo;)h?=^LbW|rPdGh zw1Y7#72EBWn*hLD0tK1-sx9xSfF!I;AK%LP6|}JJi|q16Jw=knb{q6 zTTVmcJlNGy;AeB~q||x*83nf-7h0S>JIyz>1i)&ZDB5G!&FoRn3s_~>FCW-GNf5u` zadbnH&i5@l^2a27)NqyCY@Xw#R;LxZ=%ate_LmCBHP`J%=2 zi?dn4eZmBiixM{V&4iC%G6lT+ZcG0SxATu0ZNEAhs`>kLi!l-&*;V5%8|3@6(`Z?$ znK)mGl4zog;szz|a4?OTLY14DjdnM0YWhvfClQHB8&|~HLHF`C5(&DYwk;DT2bMIz zIDJVLfSHvVDsV)_i+9TCs3b?lVV+_Z+~?MfuFcxC>Jk|(6DxDA1t}aXU_7pqzLZ2UUe4? z`0~Jfi<1d}7DlJ99;SaM*zPBn-upQ9WQ*r5nI0SWtX}Iy4WS@9-JME+-8u(}lm9R> zZB^M<)^Ddrv-$B}>Y9s+A!;`&or%*wLLrs|V5M%R*F*j=M(0ysS2Tkdn56#u=#PVb znh$fT$Ufm51{=rL>E}@{XV;X^yU|`^GyRy%dR)iWo6NmOZl179(I4M}A_*n=jVUZm zQLYJXB%J8ja29cWhLcfh+QBKQw{J|;U9YFPi)GH|0@RQtWuTp6BkihUapF#&ajJ6i zABy>|&Hf#|@Gy2B@l$3Ni$?tmDfL}+fn2O$h;&yRJ~%GcCBsZIr*5c|w;nn#2UhP# zjv)app!4~*xHiEJU_{TEX+DA6shy!@)b{&pZ;K6n)Wzmwsl8l=*Gx|rJQT4QeDCl@ z%6zpz8W(LkmqRz4&IL(MOFyeLuI2U5%Wxi->cG?-!E!b}b6P3^!l8`e)_vY@F=&(6 zM{tB;lHgFUQ7X>bW|N`oHbkd+`VK34;l%e=BjDkGe zZq4;9T1=<`r>F%d)fEKF9ImVyc`>6J8x9yoSKN`-p^SA`SRR{jEn?%U%74Dc6g6j50;wHDfH8?wTb?=JY72Ej%Q zmRyaz%mf1C(Yp^y!8~zvnh=1HC8qf>$32ot(1Yd8P2Nr{tN~t$g_g!ar!4BVE_;SJ z$8xV`FO;1mC-%rb206)RIC6%uY@U89QDiW8^*Rb#AAWK?z)vD(UB6J+_ho-_;PZ-u z2fQNvT`hkUn6Q-(z`Ha%(1EAaQg>i9L%#wv=1h9b+3tj|EZ5cFP;(GU`U`g>#8meGI{1`Rqw!)-tVy24iwX zFBe&owv@Scygc?Hx0^I%ZY|gpcO327_;0DnmkuzZj?<&5EzlsQvRes#&YbSrN$OkC zE19Il>rY2z$YGZv%It z>uOLXgG+lOE0*>TrLx-%PFk0%D<8&G2mM}!s5%Qj6s1;8;i>xgT!XN)0f!wC6;MbH zFNf_)Getq=+fOw?_i|a{f)cF zf0LM@X<~@_kvy(J4zzs|*&COp`7u?^AMv$UoYDINbFOwHz5NuNy6mLAcf>*SZx~`C zK}RFo?ssxlzmr|q@dUmUad6pJ&kP$gzqJ({G^lUx+J{cr;*(y6J#_%R+p`Eyi5$1l zS)Ng-CD&^Cr4M;u0SdyEO)CIqs3pM24dJ#{)a;jv5v)s_9U*+>>1>|K>HQ+G<+YWKck8b0sZe zAX&ShRGV_8)u;dJ-$dfBwB#*L5+bP8VJ}{)9c{(<;??-#-d#6lt@4p?)$+^SA*??K z`5kBZSzPYFh*>+M7?p=CDNLLyWp|y-u#jU^YpX>7C2hE!1b!*XKR47;-7(cvP!L-o zr92V}L|#Zd;Q2;RUu!j&wJ6o#+8PnV2CV%AVL525!G{SjfeD7GjpmxAE%}*BW@;8R zr9erW%#q3Z=zn|W=8$orLfOi=Ry-*+*Sfs4EmDp=*0H1MMZN^UhLQ?|82i3N?wYml2OMV41 z=$Ia)G?|YyqXxZ&8lS<>Iueg>)oNf+Dzl23+kx6$4$iV{I-Akwxw<%oyl!6BUboFCstH{t+u#K9x?e?6CcOC zndiSgK|}>==g#Fpt)?+XvW(Huscu^pu#Ya12>#BkJ3x`aLjz!J=zzV<`sF)t=~Rqu zO_4$XHrKXb6;OhmCi+pAS3N^q6G7mt2s1z$N`1nsjjpi{M)kW4T2(#^<*_3{%?) zT^1vOg8x%=R@RcY5Z1>F0zx$46!i#4kWkpSNBweJzXzPG4B3NAFc%nwG7zg-s$nc! zXpzyp>DHA~aC~RgkJ>F~%uMm8$J)TU;gR*xB>!bXhe?k|NlfETg0mIGk*M7Qyw zFHB^rMnz~*Z*!|}@x`_#6b>~MxMSvU&i0+Yx?s`CnbmL@IZXy29D#(1;#7&u^Ghhl zf8JVn+^-~2=6XMz-%ZW~kv_wo^SjUT%IKpt(mH)|0YZ>xh4OrUaqg~voX>eUN`x_H zgxX$BqVNItBrDyPk45Cf-xR<#n~0j?V=r|%Wk35mRCfO!pWh`97s+9l4T&FTDg=h^ z)DM{r)lK*wsol@)9P3F$d%oQi7WV#QKBjetH4ISpQ{FYi1+c0sF4hrHnic7lP@qat{#;pm?Fb#VGFy6u$ zUCHiU46&7M$2xIIr`uW9f7MRu*1D= z?OBpv-}tewT_6;}ZngSM_x8-!;BT6ypQOS9U(1Lq&?0-I)bSj~4%Hw@5QA4|qeA|u zfl#!y0Mi9&m7t3>p1X9zISFPR9sUqAZ}DRn+DM&#&>Xg6^E1qhT$#G(@?3=TpkB5~r`2-T@V_+E zqpfM%ZY1;xoGN3jUf4QC)z`vv{7;Y-*K-P6ZTUtuN9uMxjIemk3|owQx;VNLv~<5W z{&HWLt&WlKlkR}ss;%lRfQ`j~7JFKR1Z$pzHV?BN?Zh*SYMTpbQpajs|3RK2(J9Vz zg$o;lGVXF-F=?@s3x2;lWD|@;vH+il#ap)@CUfQCVO8s}Wka&JC1i4oAcyR+45l$M zRYiZoCQH!1(iW#e;|QzZvv``)w1X<|*I6wZ{AwC}iZw8icTK4(I82T$>`>^>brSI7 z@xbA?j;l1?um~4n_GwNBq7Y2I@0*f(r6&05 z-2TEPG^%YXEQJjZB=GDGbhgFj0aOhmGo68)NUfWrHgEMXFtd!NW47^W#k9YEO;xs` z1W(q)lNXYmyn6QxCT{IwZ|i~r&_Jm$`nAgu42o-s0&fSpG9uUgmezG7QFa%9255)h=KFh7p`zfk44U(Cd`!XoJ&GeK3{9H0( zJ8sh#6_crnmELS^#i7%n50pW|Z&gT0;9%VQPEgNszlCsSnPu~(<2r{Ub+>T93+Rik zg+zx#`q<+VL)>(Mg5E%kEx3!{{^Ypz*e#o~C*LtRLdOEQ50buRFzft{);Q5@LZwv% z8=rO~sX2^oeJxd+`>cNj6$is|K$IXGUv7d1lUHfNV{`-+XCh^pIoSZ{WV0p#r&|

8EsIZ<|nDb&P8%gh zU669Z8QUujXz`Q=9jD`5XJZ|M7f)jmRd-}$g!(w++|cJddgNtfW1R>+3N*LpA+0yZ zkV_(d{yH>T436-Uv>dp-f%hLrNnoj+$mXQEMweEBY|UP z$%Y~O26S}M!ajpRJC4#>O+tQ-@66h0Lq#JoEI_t%$`)p@1pL8%rdXL!u?}I6t%7_q z?nni!+tLEl36b50;KvApsf9kIw2a6q2o#g|77}Lo#?(tpQKJDqudn+iQ2Aa1{QMsmXJK-cX&rN% zX)@=7->dWtl7FCDTG8v+(Q62eTYjCA9Qlc+++H<9n6aLnWUA|1zUo!;IqZ~lt*&R1 zslLT+(SkKD4#K`Tq)QQml3F!9e-PimZ^Q+UW4Tf}gcUUg^$?Ka>^}LYY)yCY&5v2v zcy{8UcRyzn84?h+m&_Y4u2tNnHE*}Z(??9?qS55mcK<11Y9X_%Gxkg&l~AQE4>^ai zP#VZ5f5(S13AJ-S4-Fixk~Hm hJ7ns-^mD_q`u91akQg0Ci32sKvvMP_qpyG-wePsm!jP*ph)2RZ*Skp+IB#NYV-IhY*rwmJ*4DrbU&&aR;N zkpiDlZ*mcfyo@KT4vpRw(ng{ zNuz#yNO|^kvpHob8N;A1s(p=bxU%V(A_XS=WJ|(A5r80MSd)ye#R`cG`+Vyo>{b!& zSA)BbY=iZYAzSv{#1cDU90+TA(t@cnYdcX_&ge-knA+&WL>QufA@RF4cpi~n$tAYlVW z$H|*O8hA^~d}N1K%5g%cH@{@r&3XY`2g)WAGb~vLMf8RTlaCa_P)UmX6y-oh;n%%M z--t~o*la&^Ozz`D4`-v``@w0m02WP&3IvYUnZ6TloaTz#@UB80YGiP~Zweu0YqlG# zD0~vtLugp9k@MOfn)xL&uYO~d&~J+rAr$5GeWN(RPlLY|$1YxD7SYQP_oR9e+IN>zoo3$QIE$O_+OvdYNObi*p zI{;4@_gO7nPri7pFq3}yjp4DPkf>$hPvM8pUYLWIsWK4SWZBAl+IfeLYxg0y$8f^V z;2oSy)PkwZ1OpcJUzs6?g@W2gfr7&R4^Z)TcC%o!a(432G&OUuWc6`$=*!r1+GNN5 zar^C>v}C)ZNs5Aju`ZZr$;qq9bF&TUOYNAKMHDBQiB3vC+&Jm}lf zPC*j77O!#LSITwUcPzaQ4UeU+fokp~zk9ES=#9doiX(G}bf9yLK&Qb=sj%$EgV}W# z?UFH{sb=}Oc@NLjGRYYvh0BHF?#@j-5>`c41Wv?gfE(MPc{YUeeuJYr)svRgP3sXS z^U^lQYcl7|9Y-Iswfi9s_rPqm;rRt9DI|U4Jn-K4PYo6Z77-5W?x7worL|f-*_OdD zAZ{c%ae|x8n`3lHib@}rZERtUZiq^JXvyjB_IZ5|1RLf-$7Oy;`G-GJz+xX&obt5X zS?EP>J~*#R5GbG(&uE^_lM_8eK37W=4+hD~*@jM2Y8^62W3dF98xqe`#A3LMCa;Vw zh8u-IL&ko=GRsqVKxlPk*&A+8Pp?zOoPy&=^&dR5g1KPh^r5dIAL3Pz+iWqG>1sodrq#&$dGr{`1^IFpWf@ vqaZ*dYU2M#SE2vUv(-T2jYOd@Ak#*|&_D>HF+a37M8cT<%Y^R#-r;`%^wL}e delta 10210 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 Date: Tue, 3 Sep 2024 21:26:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#=E6=B0=B4=E4=BD=8D=E6=95=B0=E6=8D=AE&?= =?UTF-8?q?=E6=B0=B4=E7=94=B5=E7=AB=99=E7=94=9F=E4=BA=A7=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/home/impl/RealTargetServiceImpl.java | 84 +++++++++++++++++----- .../impl/EcologyFlowStationServiceImpl.java | 7 +- .../main/service/impl/HydropowerServiceImpl.java | 1 + .../main/service/impl/PhotovoltaicServiceImpl.java | 8 ++- .../report/service/impl/RunMonthServiceImpl.java | 7 +- 5 files changed, 88 insertions(+), 19 deletions(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java index 640ea90..98aaa2b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java @@ -41,6 +41,8 @@ import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient; +import com.xxl.job.core.log.XxlJobLogger; +import io.undertow.util.CopyOnWriteMap; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -642,14 +644,16 @@ public class RealTargetServiceImpl implements RealTargetService { List list = new CopyOnWriteArrayList<>(); CountDownLatch countDownLatch = new CountDownLatch(modelList.size()); for(HzimsAnalyzeModelStationEntity item : modelList){ - pool.submit(() -> { + pool.execute(() -> { try{ - List multiAnalyzeCodePOList=new ArrayList<>(); - MultiAnalyzeCodePO multiAnalyzeCodePO=new MultiAnalyzeCodePO(); + List multiAnalyzeCodePOList = new ArrayList<>(); + MultiAnalyzeCodePO multiAnalyzeCodePO = new MultiAnalyzeCodePO(); multiAnalyzeCodePO.setDeviceCode(item.getInstanceCode()); multiAnalyzeCodePO.setSignages(Collections.singletonList(HomePageConstant.FRONT_WATER_LEVEL)); multiAnalyzeCodePOList.add(multiAnalyzeCodePO); - R>result=analyseDataSearchClient.getAnalyzeCodeBySignages(multiAnalyzeCodePOList); + R> result = analyseDataSearchClient.getAnalyzeCodeBySignages(multiAnalyzeCodePOList); + + if(result.isSuccess() && CollectionUtil.isNotEmpty(result.getData())){ WaterLevelVo waterLevelVo=new WaterLevelVo(); waterLevelVo.setStationCode(item.getStationId()); @@ -671,21 +675,25 @@ public class RealTargetServiceImpl implements RealTargetService { list.add(waterLevelVo); } countDownLatch.countDown(); - }catch (Exception exception){ - log.error("load_water_level_error : {}",exception.getMessage()); + XxlJobLogger.log("load_water_level : 子线程执行完成 {}", item.getInstanceCode()); + } catch (Exception exception) { countDownLatch.countDown(); + XxlJobLogger.log("load_water_level_error : 子线程执行失败 {}", exception.getMessage()); } }); - } + } try { + XxlJobLogger.log("load_water_level ：等待线程执行"); countDownLatch.await(); } catch (InterruptedException e) { e.printStackTrace(); Thread.currentThread().interrupt(); } + XxlJobLogger.log("load_water_level ：线程执行结束"); redisTemplate.opsForValue().set(loadwater_level_key,list); } + /** * 光伏站-逆变器实时加载 * @@ -947,7 +955,12 @@ public class RealTargetServiceImpl implements RealTargetService { } return datas.stream().map(data->{ ActivePowerVo active = new ActivePowerVo(); - Date dateTime = DateUtil.parse(data.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date dateTime; + if(data.getTs().contains(".0")){ + dateTime = DateUtil.parse(data.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + dateTime = DateUtil.parse(data.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } active.setHour(dateTime.getHours()); if (StringUtil.isBlank(data.getVal())) { active.setActivePower("0"); @@ -974,7 +987,12 @@ public class RealTargetServiceImpl implements RealTargetService { } return records.stream().map(record -> { UsrPowerVo usr = new UsrPowerVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } usr.setDate(DateUtil.format(time,DateUtil.PATTERN_DATE)); usr.setUsrPower(Float.valueOf(Optional.ofNullable(record.getVal()).orElse("0"))); return usr; @@ -1004,7 +1022,12 @@ public class RealTargetServiceImpl implements RealTargetService { } return records.stream().map(record -> { PowerMonthVo generate = new PowerMonthVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } generate.setStrMonth(DateUtil.format(time, DateUtil.PATTERN_DATE)); if(StringUtil.isEmpty(record.getVal())){ generate.setPower(0f); @@ -1217,7 +1240,12 @@ public class RealTargetServiceImpl implements RealTargetService { if(StringUtil.isEmpty(time) || "-".equals(time)){ return 0.0; } - Date date = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss.sss"); + Date date; + if(time.contains(".000")){ + date = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss.sss"); + }else{ + date = DateUtil.parse(time, DateUtil.PATTERN_DATETIME); + } if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){ return 0.0; } @@ -1245,7 +1273,11 @@ public class RealTargetServiceImpl implements RealTargetService { } return datas.stream().collect(Collectors.toMap( key-> { - Date dateTime = DateUtil.parse(key.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + if(key.getTs().contains(".0")){ + Date dateTime = DateUtil.parse(key.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + return dateTime.getHours(); + } + Date dateTime = DateUtil.parse(key.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); return dateTime.getHours(); }, value -> { @@ -1417,7 +1449,12 @@ public class RealTargetServiceImpl implements RealTargetService { } datas.addAll(records.stream().map(record -> { PowerMonthVo generate = new PowerMonthVo(); - Date time = DateUtil.parse(record.get("ts"), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.get("ts").contains(".0")){ + time = DateUtil.parse(record.get("ts"), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.get("ts") + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } generate.setStrMonth(DateUtil.format(time,DateUtil.PATTERN_DATE)); String val = record.get(HomePageConstant.HYDROPOWER_GENERATE_POWER); if(StringUtil.isEmpty(val)){ @@ -1535,7 +1572,12 @@ public class RealTargetServiceImpl implements RealTargetService { } datas.addAll(records.stream().map(record -> { PowerMonthVo generate = new PowerMonthVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } generate.setStrMonth(DateUtil.format(time,DateUtil.PATTERN_DATE)); if(StringUtil.isEmpty(record.getVal())){ generate.setPower(0f); @@ -1782,7 +1824,12 @@ public class RealTargetServiceImpl implements RealTargetService { } return records.stream().map(record -> { PhotovoltaicPowerVo load = new PhotovoltaicPowerVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } load.setHour(time.getHours()); load.setActivePower(Optional.ofNullable(record.getVal()).orElse("0")); return load; @@ -1809,7 +1856,12 @@ public class RealTargetServiceImpl implements RealTargetService { } return records.stream().map(record -> { GenerationPowerVo generate = new GenerationPowerVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } generate.setDate(DateUtil.format(time, DateUtil.PATTERN_DATE)); generate.setGenerate(Float.valueOf(Optional.ofNullable(record.getVal()).orElse("0"))); return generate; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java index 52f2c7f..024c854 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java @@ -310,7 +310,12 @@ public class EcologyFlowStationServiceImpl extends ServiceImpl { WaterVo water = new WaterVo(); - Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date time; + if(record.getTs().contains(".0")){ + time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + time = DateUtil.parse(record.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } water.setTime(DateUtil.format(time,DateUtil.PATTERN_DATE)); water.setWater(Double.valueOf(Optional.ofNullable(record.getVal()).orElse("0"))); if(Math.abs(water.getWater()) == 0){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 9815c00..dd93e24 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -569,6 +569,7 @@ public class HydropowerServiceImpl implements HydropowerService { WaterLevelVo level = validList.get(0); // 前池水位、当日水位曲线 response.setFrontWaterLevel(level.getFrontWaterLevel()); + response.setFrontCurveMap(level.getFrontCurveMap()); } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java index 7c3d32b..a554ad8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java @@ -780,7 +780,13 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService { } return list.stream().collect(Collectors.groupingBy(AnalyseDataTaosVO::getTs)).entrySet().stream().map(entry ->{ PhotovoltaicLoadGenerateVo target = new PhotovoltaicLoadGenerateVo(); - LocalDateTime time = LocalDateTime.parse(DateUtil.format(DateUtil.parse(entry.getKey(), "yyyy-MM-dd HH:mm:ss.s"),DateUtil.PATTERN_DATETIME), DateUtil.DATETIME_FORMATTER); + Date date; + if(entry.getKey().contains(".0")){ + date = DateUtil.parse(entry.getKey(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + date = DateUtil.parse(entry.getKey() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } + LocalDateTime time = LocalDateTime.parse(DateUtil.format(date,DateUtil.PATTERN_DATETIME), DateUtil.DATETIME_FORMATTER); target.setPeriod(String.valueOf(time.getHour())); target.setValue((float) entry.getValue().stream().filter(val -> !StringUtil.isEmpty(val.getVal())).mapToDouble(o-> Double.parseDouble(String.valueOf(o.getVal()))).sum()); return target; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java index f2a3c89..8c45a95 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java @@ -721,7 +721,12 @@ public class RunMonthServiceImpl extends ServiceImpl{ item.setSignage(data.getSignage()); - Date date = DateUtil.parse(item.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + Date date; + if(item.getTs().contains(".0")){ + date = DateUtil.parse(item.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + }else{ + date = DateUtil.parse(item.getTs() + ".0", "yyyy-MM-dd HH:mm:ss.s"); + } day.setTime(date); item.setTs(String.valueOf(day.get(Calendar.DAY_OF_MONTH))); }).collect(Collectors.toList()));