From 959486fed0e54e9025e3e6da32714f35960ab63a Mon Sep 17 00:00:00 2001 From: iqudoo Date: Thu, 16 Apr 2026 19:20:44 +0800 Subject: [PATCH] V1 --- README.md | 1 + ...-mybatis-generator-plugin-1.0-SNAPSHOT.jar | Bin 38186 -> 34878 bytes .../TapeRepositoryGeneratorPlugin.java | 633 ++++-------------- 3 files changed, 113 insertions(+), 521 deletions(-) diff --git a/README.md b/README.md index f2f8772..4df68da 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ + diff --git a/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar b/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar index 4f1d0afca859ec29d70bf2dc58a0e59c9ee02461..bc31d8f2788666199c2ad5e4130d7c032de1ff01 100644 GIT binary patch delta 12403 zcmZ9S1yCJN@aJ&?1b26L5AN>n?ykXMLm&`%_(OvPcjw_wa00@DU6O^3{3mX*FwFeZGI23p@Q4$yrLJGo> z!MhKfQz+&>d`IIcjWI}(1cDP*N0O!>$xoyx`MQvxY;K+u#f?poe;mAV7Vzmlsv19+ zhQe>-zN&rwIJ)_`@%Su&Wuv>?DWHuW`+fVy*?sFDC7q9YodLITZ-F`{Ke*r8&Y`K6 zSNvwwKEEfoF-TSsQ2tR+C!+(5pQ40Cxpz2fl+xm$(B;>an>)2Q$`-n4wAe^m)$(FS zbMD5VHiu*LD$6Py8iSR!?}!Ar(w>v|smJnzmZKb$r68?LLC!{2Jce^PD14Era#l*D zPYq#Jc^P^0_QEj&%O!Mn4fK{wF>?81=q@M&%g6a3yf2mwKgKDGKeqw2y*9n&^0hV^ zbCuF8tM#SJh3m>odHO6w;A?z+Z3g-c0hb^XdjkebO*1;(pu1-KPbd7jym)bgeNlIW zb?#mq^C9k~on2*&WQyq!lo0L*?!15v<(g5=c)~0-ir>>H>zZOjk4-cY>LI^r2Lg@+~wA>dPr|L-E>$h5{Ssaps znZlZf8|4s7TjXiqDue53PkugWPwiK3O|zQy%m%P~7xUFEWm(#2W)l+7%+GxP4Zh57hLctD0EOnA?5T^o_u5ZOFW2KtRCG6C~NK%Q2`7( z`%}W@*HacNGL?{#7w;As6q?af5|n|0M4LRr#`>o8B%oR0vHq6^9;wQZxP=Ein-6~R zi(=cB>H>XHMo-zK94g1J8-6np7bh0v6}50FeLJy0nAX>F z!ij4~v23~hKL;=%wn9+uxpH>;m2*vk3rDRS9bnrodNo6PV?_Qkk*`#QBWuIg%@IU9 zj}@~BUY05f=<_VjcAgRBAoxxk11TFYah<}2AYa+bw{4S&T+51?FzN;1&YX!Ho)6^Y#$70pb zD`i)fpn(J(s6E-Do>*glm&!GjkMx9{17S8QrkKvIvEekGtaxke__lQU3M>H_v*;QU z1BH=^lq%eZ8V`m{?Hq?5`mW_7sQrbV!VXhf)A~M!Br$5072oxVV)Wbz(a>L&oI#=Sw9Y1lS)4cTguqy5|=gH#o_Hk`>!)fPm1A(Jo zU!HG-JE^#L^fFXeax{dl=VddEeqiG2?NO+lO??g^c~;!tn>xOUh+l^spx?+1i|$TN zr$HC@4i54>d~`Q;+;ah~=lQ1m@}7EsGYZ+=&>jU^CaQDY{o-eZg_g_f15@U7#&Emb zrVwxF7m&e@*`(PxaqKqbr-@`*z#X_3YJW89m4*K4tAk_wfj{B6^o$%i_44^UC%Rzd z$f}ze-6vzBL;N+k_14xK+?N44Gou^S;1!pHD`l!8K7JB(_SrmUyTPoek28)LcSj?R zodp%NksC%gdQX|kdQwRIn^PiKW<(NN<6`sa+l#*%v;fmmP-p$5%84D#&iljCnXs*FeM9yPatTIRHx#p z3pOnH-lS06Jatb;oxz*nlsiy7(CUe#S<9}NE6>M%`+{3dCh+)dvk}nSm8Lg)Mp$rbcAr-a$eKuk|0mbM-_DQ~ZazadH z@NNx1Y_&Fu%O69l8mvBQfM_HvjjTK&=r1Exs*~RsRF^q0AdIv0o<_ieGO5uVmV>uq z$9?2fm(2E(OqgVrV`3h|Cql$>?yTyeUsZ5H_b^<(f5+3Es2&yqj8J1_WcIPfYA(^~ zZKgQSHUFMtC?iTw7+JiuRk9*-x)QA|Ap+kIfFtaUP)yIz)li%J6BoZ3#|E&>V#J2x z-PH=XR4wX%o`qJ1J$dT)$tL~@BZV4u!KFVASLh}bZ5Kj@{-d9qV9&ZZZ`-c1vB|Om z_j{xY8ibUcF=y5mICqnZz0%KZ!RhobA3#)`9E}vFhd`vU?|fp=KO+p5z+m^J955+a;7r$YB-R$ycZF3K@Jxt9^@a-xA8O;uJ#ynG}R%uj}xJc0?!1qu3Db zHq*T+TD;kQ0?cGCAl`5qAuXGQUA&s#K6>jMGD4QqGt_U~+(N6iAw>g2*GOLvUE`n- z6e9NC(g^D9#HO~u57sB9NeyaRwMkjeF>k3nKK9$CA4KN1W*)rpOT2JeXa!7eyTc+$ z$J}tQ?F@rbtwYe+uT2t{OyfvA;|BH>+X)g#xJE`W0L|=)<_DNA47R<~@N{tU*z{Y5 z@kxrQ^Cj(cFLDye2t}&pgD;*L6Cs;&S9J>Jc*ys$v};^ZQ=3c2E-VkDaf~?K5s2xo zNR`B&et!>)CD?^02TC)SOWvTWQCLH2$L^(?!Y00%RlphhK~a3_bB);nNq5w7FVRdyZG>uEI2=5TEQfZ zn&54)@*j5Mm9fCB97)^Da?~yUYA(x4SuhGh-vAZmg=JU7t(++g)eJz<{8+W{D9M_I z88-l7n$2MfxJf!{Fb*jW@+mR8NCYitP7@6?0C~dShS2q&Da5SFK{Whzu}8w?@B~4> zyBois$%e-3KQo9SjL_$6YHKdF*`c&J!=&k4`F~^+>s5PtU<7^NvrG5!YU5!^MNCJU zeBZ=_U=`cwBjoxWj--x~jh7Ka>il+7A{fZ^_+9?9R{Iba7)WwZdZ|}u!E@DK0n*Fp ztUwvG-K`lg#7fKtC+HgwR?~yo;mXNwmwwUbj;fPp-BqOv?)ohZxR|oDx(1E+z@~-keAuz)m24!eQQq z@pRkYYlbsY8mXBX7 zG`+Lxm?V;?@xDCfxcM-9*EsM;zv{bis=w!CP9p9F86!OS!oC#GPsK5=RtfK06qXP+ zOL#3SX$PZ-;N%Els4;^fK+Ktfwr`wp#r45Q&UGy8eraWRhQdc0eg!NBAiHQnH?gwq^IiF11qQ8soC-lbY~}kxrk2$+WGSZune51v+ji$}b((YuWx=N6CFkN4tWK!u1bqT3b4!Z#<{QWnI-d8Qnqsi(zd{0j{hn#o| z_ZYT?u9eYoXfD0DrOWE-z~{eH9ItJ6m!iOO(T`rl&_}D)M8ns&y(WR0gm=~#MN)R) zq^&Z(I=D>LG8ZWmJ!?F!K9h5VV`*mL?W4sM>A97@75gy*Y|xUfZTx4WKSL~S8!Wg)&-v2?CuZP<$bWG8})tcdo05T6{&nbgP%-2TZyUs87SQ@}CYPLgGy zT3KH}X&ubbr>gx}Bpk%Q8!us655#&6r~3z885bdvCch6C%%lxQnRcEeKWf$x`FHEN zx}Tblp2>jbIj;Px3)zf*R@pEj#w@G~$Gd@DM*=VNqbvvTpu8$Kr#tS9sV0n%peAN* zo@H+$FZ7>)kwSMZ@SsUrEyo4XBP;Kh-r^QCgl`DFi>2?AgMAvx2AN&X)nZ!}0_@7F zh_qH=f}r#q52|WUaS&6gT#(Alowa<}nsm~vy^8=5JmO?wg%QeN{G^GbX>6Jbr_Ez% zVzNC}S>2uf#M@eIf0zhwS%Ijrkn9i31Jx23M&EipO-u$`=GUP`J{Dz+Xo$O0-|Sd& zNTGR=$CS4}_aB!Q_e|Iow%0f{?IiF_(4eDp#12C_WqgQWWrX}lEhEnz+*=J}DfTNo z-mC(c4f@bZ^_GpagrQNAa!U>sW&@GS!7SP>xAY~0Ii( z;R4n5tEHuK}MwtspX_y_t z&?QY_s;)I7N;=6B;2y{V64K;%1loS8I087P$HqT#+@QrsbXL;Ak|c7Fvmn&=A}Yof znhYL+k=R7j-|{!FP+XH?q&1HT4h!B|S@T;M$>5;y?5=R+5f2#(>Mn}1@T`)-e3vT1 z%U!FMHpQpG7A(VotrGD=oJod8-$?dF?-aoq28^ZZ!EWni#5)p{Uc`=2E=<%IB0!+N z4=v9`s)F$qrgV&im{WE7HR2FzGAH$2_%?FkwtUL0p0Gj(XH0LDd|<8sa>xp7)WD*Y zEOp|6Ct(Zm31k{)gYz_%Q#7C7J4OeDM2LuSn?x1vpMYk+@6&Cjw1xZR4e`9H3-NsjCqdXNqK0;zdhU z4WlG$yE2cDiHzgUTpur=OEzT};9(Vn3#}pSDuKl#Qh2hu(~u$fB=RZ6S+tp9 ziQ@06Xbf!1EqSEQb0w0uKY#H+xE{ynQfv!LTq05^=Ta_QhK)+%usU&efa7)Lg6yIa z(X%@mFc)&Vk4O4(wB+D~a{K+enwXHq&+y7pA-pP733Vt*Vbx=Va0P2QMg(EBT5CjA z4sZ!lEwS?q5d{p#%BRRfA08@_Yuix(P6yjS^Vby~(Ty1r+XJ;5tR{EB+=vm!;jFtSkDS||xA zMjiELiUd(7-=$BKIVwHlZ zD0&|gN75}Ls%=er7oZGNpmr>a%ro5sIcw?F&)9(okqVcE(UjwOvW*&+k4jtwkuwD@ z6`uOyga7Yjo}!**I*|yWP;Oy_S5A z>@pxpa`{TxDk4zG0sMCR7Oi4M*Hqxy+5p|7YMAG&eQ87Fg*g%U`y!H(b!t_bI+hIH za?33$K;Xcgb5%$aR2iOYii90+&rk-K^|DDinddIeXDpA$s{iF2XY% z?rllEVaU4eFMw<&Ma&mThH`de!x$1nP|X9bQuLug|s|omKu848`Xk z@MmR+KPR?IEV3>?S?F4Nd_aSg{<#P4bjGcjIN^5@tAM_w8?SZEhpblP4SLC1HGtjM zi)>=q2)uflGw$Ot4)`F1>Q-ttG$&LsqZ2G7* z@3L5=h69snkAC#6%G*xoHd1V?#bYZ2fx^1>z!lnJFY%2@(G>maZSnJ0QmUgT?TrJ= zDqpKKV&JT^u~VqK>htEJn6{_LA^C9t(rSnn#f8NaR{AJBqU! zoQdmaJ!ZHI(}Z=eAvcv_Ex(vX!VkG1i_>>f)2c?V+$)QhNLpMFod)oeLZ(tbs5>WN!Sb3jk(sQ#M0xby`tuWuILr6$`K;7)Lz%)uRW1^@zOpdH7xhnOFXn}?*tRDE_XQ) zN&uQWttw?U`tk_3CM`-mMjEppOE^X}E19MPpNKmGirPCaUwh5^Y&3Ug~%Bsomprd=rvR zq$6(6(hZ}6QDewK#0<@qxeEwKTDrB@2*8n^t~w+XAr<%ix_D^)=R9J2eFKRR1SV!? zg1XT1QRKT-@xV0PllIU%c4mV1P{&bZI_KQw`p=BS2R$D>HMgCgNec)LqzoY3scUHg zT4K*NVyJzZpt7%u_W0$6p%DI@nBMxK8S`(FQl)V)g8~E&ODshDMEiNx+dOkrV z`B#3;7^-8mXWm(7f%1EI-umw^y79@4D6t^%P0PsgAWx*6XWcm<(k^n+n>7o8YxaTC zW;fg0eaW```-VcKYi@?k{q)Z(6&^i|em=3r$&dsV39%&}7*J(@eR*wiBAaf+hsyVf z-IH1;?DCFbcH+`WW%rc7sW}u}=>bwkUQJyL>56#A+sidIlzn3OPTTQcO!is4V(qyO z^UqnI2O6y7VhWN)R8^&t^u^BfRM`;;e(!%R@QU@?Y%fPSu8b@C?mohi3EzBL^jndA(6c#qaw>$?}kHuw=XC8re|%H}I-G z7>}0v#X^%4d_5q7YIB2J%2yqUx^bi}$ez89Ik~3w2f1K9EuVQ(Cx(iN7AXyq_kV;< zuG>&%rFl}6_1CI-RF>>G0a9hDLkziIx?6rWZZ46G{z;R3rc}!EzVJuR`Rt!D2Z!+)~=TzT7 z``4w(Xa$~zxdhA&^d2m3;U4gC6Xi{clOc3A9x{-F0Ej!(L&tQ>=pFAX z^33k`Eq&&p<3n#_WU^b~agWx3p}U_F;u>c#chwLmP|kZY;(=%3{{4>|rAkQKh+zy89I9Jd{Sg`lz?}jv?=_&dyDaG7e z6ZA#YR_^O(kL+2*y+v!|ctbo}plzfDy3zTkZ=46Uqd_BP*$mSQL?J5Pan)jSHa*U61*g_ zf!hlc;{LH3Q1Gdi_j#2=d}&xQrEa@pdKhqZDR#L=$q-s10GlMU+F6wv-!besFMSEN zuLu5SQThrb*UP|xzV3N{WPscJVgEcbG;KH^*3pTh-=BDj(AL*-YNb`vwUP_ye_pDl zgA0WuHCSh~z1lL_hJ;Mwa@dA4swGwTnXe8HgX#g`OU}=QwWA=@a#5AJef6qj?QtqC zE#5Wl@t;Z@ojfWkGv4-b$vj>lPu_9kG+7jXwW>?Wb)g~+<Li5(H_~>5q)~P%s@+c(9(NrU+_}f07l4+9dmwW-)nV;9wKWBKZNxoUp zs#FXE(>$y-o%$JNhNk7I#f}2nPBe4R`9UhY8%n%l+;h)AEl2KEQ)}qQhOA`_oWM({ z_|zAeo~d~dqPks2=^Q6}0TWQE53GqY|JJyQH}je@I<<1QjMD)(q^o%40I@9$er+VA z4Fo!HB~x(nC#u^1VJ|{1bMO9D@In7*$7dNBwwt8uN?Ucbyuc?%xJ zhC~f$=n(airIXP#uem?)rs*Ml9dl!*J>vU1cl4*vQU|bB=uZuG^ug9Kc~yfvPm3P_ zgaeWywOGEVpC59%;E+S$!(Txjtidkcll+6%H&vHt!FECN8^qtIHgLMk%&n}kHZ
sQJOD`dk$1H7&`sS6q^BR08m#uYVjU=MFl{{w><3noE7K5FoBg`f2 z#Kh`jxON@|Q=#9?I);P@vrBhF@BhRAv84vTAybRthN63ck?W0^##yoYp$9*h`LF%( zR}rQ$v*-m6)Qzn1t_sm|sKy)^#-f#RjYE|Y12qE8^_&qY(x+XH`LC517oAsT_qJ5% z$%{$S@x3oJM)Biy0enUNxl+t&7ThbUOiRQ_33N1KM&{A89o=xB$;NDs0XY{S3BAWB z2~!~ZMlw*aB4L|!6~Qny{|oLeuFdW3$1AQt|LmZwkZ&_1-BU`kQa%C$E5bj{7Dw#p zzx!VKkCdOdYaBhgfs}{xFuD*Wa1D5p8_Kf0?Ah-$c=xBZCkkktr|MQg6FckPl=pc` zt)HrQBwGe2+`oj}@Z6V>`$4?`Akc?M-_4+PTmbP}ovbf~E0x4R%OMio>BG;(7@Qw)`@u1+ zgD>*p6NTMG=mh9g(Ei`%iP0^b$$EZ!Z(9gAaE$#;#B^TzlW5y;0e@6w&PQ*93=qwD zgSpK_&FGw|1s?@7RJ<=@E6Nm8n`0)+aU^`(Pz>AZ_m;La!R96wwfH2jAnpH*zV_ZQLqHHi3e*Z=rY#V+4>S6W~~ zn)LaVh)8tp$Jo%QBQUq)LtnW$gSb$Z{Kph(O-?YhMnX`*SRtf3ANtb(RDAws2ffaP zsrFET1KPQgO9y%O&p$IZ!Vzb?9t0++=_E>SUa`|Q*o8t_5tmhyl6*(q{A3yd#Nv8{ z@kH?wZe9oW+a5*De1biGFuyzxte409G->0Ap(WG^)s$3bgaB2=r?|`a;!!%M1`e1^ z0wj`y>{s6v3=g))ny0WH(K{c5A-L#YgP*6=i>BjW$CzHW-ij2v4>A<#C5sx>4{1uh zxwHl0nX-{n$lj;SOB6+l7tQ2N2b6l#$^QDJi2g;For#? z5;wGod=0|*BIViWWESe8O!>ChD;C(yJ(A2%9}HY7@wel#nh5o76tBtGUQ3oWsat;x z)?)BXDrd(jJ`T>iIG&!~Rb}{NTa&*kITeVyDG_>eS}pXx&a2qri8h`n`6#%28|qh3 z`+;Wy8zOMb^{JlZfg)OKIa?{1a+I##5A*aV$N?j=EIDmb+Eg*pll!wdO7@^eTa;1a z3mJ-7JY{C=j8|4JdrPeEo{jL=G-{5T-^i}}o&L1(o7*XOcFT^Q5VKSJ?&YbFM&y!+ za@rqWjmQH_zspAbO!wj!o8@BhY3LY0wL7g7U{PS1Pou3lK@4^wP6Q`-cVu_2dYtmY zAX7G#FP5d*!P;hB(b^xCxV zIKUMSAcq4?vHLTnWJX{8gXmbd8xHt`__BNVC*gzGdhUYSqS@79)>lj`VPo~^;bXqx zaR81@fd=wFi#Qr6YQY?7Sm~GCaH)tsx@}FdOEOD_<~a>t3w!Fh-A1P4iC1%IWIyzI z`pf#{l}_(6n4A?U4$a=zNi-|Rt}bwU0w&8_rxIyBxCpZl^BgWO&j;>G4V!&kn@Cim_)w+*Yo_=mc1n&v|E|!A9{`!k%JDHg=YZ5FL}FO7HO|kzK0HTg!qrVcj$j zlP3RxCSz*pJp21$=OQ+>$=#?nVS}`iqbu)Z9|n?L^|`tl^{m6vD`)geuaAW8%mCfM z%;Q8YO18!BJ7ZUtHk5XcEzl-fS`TRmithvI>ZWGP4;%MLW`@CvgAb-EB^N2)XlC%j zZA5veb;`d?0ZK3jBh#Y+bjOK8zT$XCPBm-!ENYL{TDr*O9AnY7(=BO$?Y5O9r5>4B~b%;NUW^7DzFeDEjD#3 z{`qg>E|`W%Y@K3~nAs#!mQ#VF{I?iH){({Ai`l z7dGFY_9-PR=0n!k*4K(QL1;|rGR3jTi{MN&rk%d)Psp!4+7~6pV(h56#x*Qa$gem| z4_c+a)$%@zefi%Gpq3};n5d^@q3@WoAXov>!}s{uE;@HQsC~Pqyk!E0Nn6o0aZ}Sd zKcP}tu>Ydz&zM|4tIP=RN(yFx*|a}GZUE2c0RR>@T>nzzE)bMcLs@XH`|K$ zV=kN8e35i@mjF{kfWD1xd>p4sFRNG8{$*j^5@T{1LD2LM;P;Fxk~8_A$v;axci+?c zaxtqJ%~oHNce%t{6E0Af5#=A?5-t=dHnqh2O3JdnOX%LQ)YtDPrgTEV1tqd=rrDEr zD`!6727EOuDtY+$l(muT_NcP63H;uCmU9kV-$Dq<#C}G*g4{oNhJ3Gq-V+%Iwp^a` zdd}oeMvMjsfL8+f`=}2QVz{73?y1r5Al&CKAELT(>@M}Ts9r%WpS$rEF8Q}~Uv(>Y z&--OxO@;dbT=vV2{>~W>$qBd0S@PrpPIZ;*-Q1sSHmRr?}=rC zw`kke78w!^HxDgGUko-6e|^#<*1YaiXPipn?mbfT-sC$N{<&(>C1yrfA~vJ=%nCo5 zvkP?^_OvpCxA1u1jSe9MFSuSbt9P6{Y*&!MhKMw5cONeQJR$>TcURhi_^*fW+dYE1 z*;q|p0mdlj=i0lKow#9Tjj;~uQ4HbL3Em#=^Y5M1ratdnZ@ra3#9uK4U2#Ug#Sw=@ zEzg+r_QnzWSN~4H<2SCkvRNHg8i?)C{{L~z=ekp26P#4Oo?h-lPJE?VM=6F&eAOO> z>hyY>Q5lko5NLLA#cTqERE@cPeC%XvN-KfJ}_o@JzwPN*PvL~fte(HN%8n(2clz$5=qYMjoau`?aCSu#NNeF8^l>PtSp3ER`8 zpoVy+G^GfOPjQKiS%AS!ftxh&6iLuS6TOJj?#|Ac5cyTYnA!)}9kAqRj;0LCdv~#G z$!}dWFf1NZTy-w$ZwF~Rd*Y2pPE&RHgMAkcQmbz{Y%0YrakfT*4fs-=Ub_{L);MXYFPs`h} zTK#a_B%D(%+JDmnd|w#{Z8>?PcAha_N)v?RH;V6ZlZ>8WMT!%I$qD(GY3{Evx|B|T zt3(B%6}x$G1cSm3jYyO?w#=XK5NDb{q<75^dVkqb8hOs}ouY^7o;<{gb`jqw`+EW+ zoz~j5NnUaB%_lEgP`lZ|`1II10*lC?L;AtJ^O!h<9}$fa;P`cP=H#pEOTI9pM!kyE zXwmYEJjOYA{i6E*x%a|9jy>6f`4gX~$PoU>nSa~b9_d{RH;Wi6cQ!@f+s;{Ma9Te} z=X9KW&OJ%u;_IBW492y@MNQbI*~g0-so!QZ4oRgY)C2FMze*i?bAl)E8xAx%Gpq5u z4s1Eo$gr;u009qzPP)Arp)L0(1r~G4IP>lgNpjHzeqtUx@%R#=>MT2l`IH~C`fexu zbvnIFb4B8;>s0^2TO+BqZaLUQJrwEM z%j3KE}H z9ORy$Z|2XSzs=&=g5V7cF0BY6E^Qz6RZ|%;<&4ex8H05}vr8CQ=wLNzG+3-)Nts0AUvZJWy~8JjCU2$jPycQLKP_5$kFYS8 z>56s@+#;(s>!ot#T>4sF3M_ABdtF!05d8pF*HHbpR`>&P-BfOQ6@_L;Y{cd|SLfCa zIjIWXJ{hO5$@#Z1@Z4R+E!Y*bn%Mp|=XPJ)Dpd=3RMQX(MZV{bEyo=5)2(pdX>hB4 z4Cfr@zVB@lmQK5E6XtQLHfYN#81rw-I?v#~7KK^EJGhcJAF z6^L}Twn4ekiSu}7GwjP=g607)LZLfVV9D!(tLNF&5`8@|x2k9SqdnTmKfNWcB>EUy zh5tg>gPNSxbxUT;HZI!8uT}pCeKcV7sO&*}wXs3{)|pL?>wD3#r5d8M`i11d^|e8N z%~PLvGUc4Wts&~hts&HlUWh#&AV%gwhiHtCc)PiCtr2G_-y_h^boTyrE^eclhC@xWqpcHLT1+R(O}(CFd*Q z-QDqoSbZa4?esQ0|GN3j1IS`SA5PEn-bWl0@j6grY9hCG5*wZm`Teb84Lj%bm+zRp zp7z^2F+Y@$3%=*yq~ZI%n<(c~d0ViKxIjMcmXx5vbH)S~`Bar9a}_T64D%LtfKrem zdGxOXuSxY z)$qkp4Uqvnv!lB%(i@;q_!4^;WM`UPtV>Wc0x}p)<8zS2Ar5c3swS?{#()MuaxNdPwE2D!N%bKxxv_9 zx!3!jd=`oYCQp9<--CnMl8IqVLcku0(%|@H?0<1>@{kMY{|(3JZ&&}nVL=s!N`(HK S7#oKM#!10IK>YmQ=>Gz`i0e)O delta 15764 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 TjQwj$Cy|5`z}&_DC-MIPf8ADe diff --git a/src/main/java/com/iqudoo/framework/mybatis/TapeRepositoryGeneratorPlugin.java b/src/main/java/com/iqudoo/framework/mybatis/TapeRepositoryGeneratorPlugin.java index a615782..b8ea4bf 100644 --- a/src/main/java/com/iqudoo/framework/mybatis/TapeRepositoryGeneratorPlugin.java +++ b/src/main/java/com/iqudoo/framework/mybatis/TapeRepositoryGeneratorPlugin.java @@ -27,6 +27,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { private String changeLogContextClassPackage = "com.iqudoo.platform.application.domain.changeLog"; private String changeLogContextClassName = "ChangeLogContext"; private String changeLogEnable = "false"; + private String optimisticLockEnable = "false"; private String modelPackage = "com.iqudoo.platform.application.database.model"; private String mapperPackage = "com.iqudoo.platform.application.database.mapper"; private String targetProject = "src/main/java"; @@ -61,11 +62,23 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { changeLogContextClassPackage = stringConfig("changeLogContextClassPackage", changeLogContextClassPackage); changeLogContextClassName = stringConfig("changeLogContextClassName", changeLogContextClassName); changeLogEnable = stringConfig("changeLogEnable", changeLogEnable); + optimisticLockEnable = stringConfig("optimisticLockEnable", optimisticLockEnable); modelPackage = stringConfig("modelPackage", modelPackage); mapperPackage = stringConfig("mapperPackage", mapperPackage); targetProject = stringConfig("targetProject", targetProject); } + private boolean isOptimisticLockEnable() { + try { + boolean b = Boolean.parseBoolean(optimisticLockEnable); + if (b) { + return true; + } + } catch (Throwable ignored) { + } + return false; + } + private boolean isChangeLogEnable() { try { boolean b = Boolean.parseBoolean(changeLogEnable); @@ -153,30 +166,13 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { Interface repositoryInterface = new Interface(facadeRepositoryPackage + "." + interfaceName); repositoryInterface.setVisibility(JavaVisibility.PUBLIC); - // 添加必要的导入（仅保留model和example，移除ModelDataRepository） + // 添加必要的导入 repositoryInterface.addImportedType(new FullyQualifiedJavaType(modelPackage + "." + modelClassName)); repositoryInterface.addImportedType(new FullyQualifiedJavaType(modelPackage + "." + exampleClassName)); repositoryInterface.addImportedType(new FullyQualifiedJavaType("java.util.List")); + repositoryInterface.addImportedType(new FullyQualifiedJavaType("org.apache.ibatis.session.RowBounds")); - // 1. trashById - Method trashByIdMethod = new Method("trashById"); - trashByIdMethod.setVisibility(JavaVisibility.PUBLIC); - trashByIdMethod.setReturnType(new FullyQualifiedJavaType("int")); - trashByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - trashByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); - trashByIdMethod.setAbstract(true); - repositoryInterface.addMethod(trashByIdMethod); - - // 2. trashAll - Method trashAllMethod = new Method("trashAll"); - trashAllMethod.setVisibility(JavaVisibility.PUBLIC); - trashAllMethod.setReturnType(new FullyQualifiedJavaType("int")); - trashAllMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - trashAllMethod.addException(new FullyQualifiedJavaType("Throwable")); - trashAllMethod.setAbstract(true); - repositoryInterface.addMethod(trashAllMethod); - - // 3. deleteById + // 1. deleteById Method deleteByIdMethod = new Method("deleteById"); deleteByIdMethod.setVisibility(JavaVisibility.PUBLIC); deleteByIdMethod.setReturnType(new FullyQualifiedJavaType("int")); @@ -186,7 +182,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { deleteByIdMethod.setAbstract(true); repositoryInterface.addMethod(deleteByIdMethod); - // 4. deleteAll + // 2. deleteAll Method deleteAllMethod = new Method("deleteAll"); deleteAllMethod.setVisibility(JavaVisibility.PUBLIC); deleteAllMethod.setReturnType(new FullyQualifiedJavaType("int")); @@ -196,124 +192,53 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { deleteAllMethod.setAbstract(true); repositoryInterface.addMethod(deleteAllMethod); - // 5. recoverById - Method recoverByIdMethod = new Method("recoverById"); - recoverByIdMethod.setVisibility(JavaVisibility.PUBLIC); - recoverByIdMethod.setReturnType(new FullyQualifiedJavaType("int")); - recoverByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - recoverByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); - recoverByIdMethod.setAbstract(true); - repositoryInterface.addMethod(recoverByIdMethod); + // 3. findById + Method findByIdMethod = new Method("findById"); + findByIdMethod.setVisibility(JavaVisibility.PUBLIC); + findByIdMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); + findByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); + findByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); + findByIdMethod.setAbstract(true); + repositoryInterface.addMethod(findByIdMethod); - // 6. recoverAll - Method recoverAllMethod = new Method("recoverAll"); - recoverAllMethod.setVisibility(JavaVisibility.PUBLIC); - recoverAllMethod.setReturnType(new FullyQualifiedJavaType("int")); - recoverAllMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - recoverAllMethod.addException(new FullyQualifiedJavaType("Throwable")); - recoverAllMethod.setAbstract(true); - repositoryInterface.addMethod(recoverAllMethod); + // 4. findOne + Method findOneMethod = new Method("findOne"); + findOneMethod.setVisibility(JavaVisibility.PUBLIC); + findOneMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); + findOneMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); + findOneMethod.addException(new FullyQualifiedJavaType("Throwable")); + findOneMethod.setAbstract(true); + repositoryInterface.addMethod(findOneMethod); - // 7. findAnyById - Method findAnyByIdMethod = new Method("findAnyById"); - findAnyByIdMethod.setVisibility(JavaVisibility.PUBLIC); - findAnyByIdMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); - findAnyByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - findAnyByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); - findAnyByIdMethod.setAbstract(true); - repositoryInterface.addMethod(findAnyByIdMethod); + // 5. list + Method listMethod = new Method("list"); + listMethod.setVisibility(JavaVisibility.PUBLIC); + listMethod.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); + listMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); + listMethod.addException(new FullyQualifiedJavaType("Throwable")); + listMethod.setAbstract(true); + repositoryInterface.addMethod(listMethod); - // 8. findValidById - Method findValidByIdMethod = new Method("findValidById"); - findValidByIdMethod.setVisibility(JavaVisibility.PUBLIC); - findValidByIdMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); - findValidByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - findValidByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); - findValidByIdMethod.setAbstract(true); - repositoryInterface.addMethod(findValidByIdMethod); + // 5. list + Method listWithRowBoundsMethod = new Method("list"); + listWithRowBoundsMethod.setVisibility(JavaVisibility.PUBLIC); + listWithRowBoundsMethod.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); + listWithRowBoundsMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); + listWithRowBoundsMethod.addParameter(new Parameter(new FullyQualifiedJavaType("org.apache.ibatis.session.RowBounds"), "rowBounds")); + listWithRowBoundsMethod.addException(new FullyQualifiedJavaType("Throwable")); + listWithRowBoundsMethod.setAbstract(true); + repositoryInterface.addMethod(listWithRowBoundsMethod); - // 9. findTrashById - Method findTrashByIdMethod = new Method("findTrashById"); - findTrashByIdMethod.setVisibility(JavaVisibility.PUBLIC); - findTrashByIdMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); - findTrashByIdMethod.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - findTrashByIdMethod.addException(new FullyQualifiedJavaType("Throwable")); - findTrashByIdMethod.setAbstract(true); - repositoryInterface.addMethod(findTrashByIdMethod); + // 6. count + Method countMethod = new Method("count"); + countMethod.setVisibility(JavaVisibility.PUBLIC); + countMethod.setReturnType(new FullyQualifiedJavaType("long")); + countMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); + countMethod.addException(new FullyQualifiedJavaType("Throwable")); + countMethod.setAbstract(true); + repositoryInterface.addMethod(countMethod); - // 10. findValidOne - Method findValidOneMethod = new Method("findValidOne"); - findValidOneMethod.setVisibility(JavaVisibility.PUBLIC); - findValidOneMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); - findValidOneMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - findValidOneMethod.addException(new FullyQualifiedJavaType("Throwable")); - findValidOneMethod.setAbstract(true); - repositoryInterface.addMethod(findValidOneMethod); - - // 11. findTrashOne - Method findTrashOneMethod = new Method("findTrashOne"); - findTrashOneMethod.setVisibility(JavaVisibility.PUBLIC); - findTrashOneMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); - findTrashOneMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - findTrashOneMethod.addException(new FullyQualifiedJavaType("Throwable")); - findTrashOneMethod.setAbstract(true); - repositoryInterface.addMethod(findTrashOneMethod); - - // 12. getValidList - Method getValidListMethod = new Method("getValidList"); - getValidListMethod.setVisibility(JavaVisibility.PUBLIC); - getValidListMethod.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); - getValidListMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - getValidListMethod.addException(new FullyQualifiedJavaType("Throwable")); - getValidListMethod.setAbstract(true); - repositoryInterface.addMethod(getValidListMethod); - - // 13. getTrashList - Method getTrashListMethod = new Method("getTrashList"); - getTrashListMethod.setVisibility(JavaVisibility.PUBLIC); - getTrashListMethod.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); - getTrashListMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - getTrashListMethod.addException(new FullyQualifiedJavaType("Throwable")); - getTrashListMethod.setAbstract(true); - repositoryInterface.addMethod(getTrashListMethod); - - // 14. countByValid - Method countByValidMethod = new Method("countByValid"); - countByValidMethod.setVisibility(JavaVisibility.PUBLIC); - countByValidMethod.setReturnType(new FullyQualifiedJavaType("long")); - countByValidMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - countByValidMethod.addException(new FullyQualifiedJavaType("Throwable")); - countByValidMethod.setAbstract(true); - repositoryInterface.addMethod(countByValidMethod); - - // 15. countByValidWithPage - Method countByValidWithPageMethod = new Method("countByValidWithPage"); - countByValidWithPageMethod.setVisibility(JavaVisibility.PUBLIC); - countByValidWithPageMethod.setReturnType(new FullyQualifiedJavaType("long")); - countByValidWithPageMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - countByValidWithPageMethod.addException(new FullyQualifiedJavaType("Throwable")); - countByValidWithPageMethod.setAbstract(true); - repositoryInterface.addMethod(countByValidWithPageMethod); - - // 16. countByTrash - Method countByTrashMethod = new Method("countByTrash"); - countByTrashMethod.setVisibility(JavaVisibility.PUBLIC); - countByTrashMethod.setReturnType(new FullyQualifiedJavaType("long")); - countByTrashMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - countByTrashMethod.addException(new FullyQualifiedJavaType("Throwable")); - countByTrashMethod.setAbstract(true); - repositoryInterface.addMethod(countByTrashMethod); - - // 17. countByTrashWithPage - Method countByTrashWithPageMethod = new Method("countByTrashWithPage"); - countByTrashWithPageMethod.setVisibility(JavaVisibility.PUBLIC); - countByTrashWithPageMethod.setReturnType(new FullyQualifiedJavaType("long")); - countByTrashWithPageMethod.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - countByTrashWithPageMethod.addException(new FullyQualifiedJavaType("Throwable")); - countByTrashWithPageMethod.setAbstract(true); - repositoryInterface.addMethod(countByTrashWithPageMethod); - - // 18. insert + // 7. insert Method insertMethod = new Method("insert"); insertMethod.setVisibility(JavaVisibility.PUBLIC); insertMethod.setReturnType(new FullyQualifiedJavaType(modelClassName)); @@ -322,16 +247,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { insertMethod.setAbstract(true); repositoryInterface.addMethod(insertMethod); - // 19. batchInsert - Method batchInsertMethod = new Method("batchInsert"); - batchInsertMethod.setVisibility(JavaVisibility.PUBLIC); - batchInsertMethod.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); - batchInsertMethod.addParameter(new Parameter(new FullyQualifiedJavaType("List<" + modelClassName + ">"), "records")); - batchInsertMethod.addException(new FullyQualifiedJavaType("Throwable")); - batchInsertMethod.setAbstract(true); - repositoryInterface.addMethod(batchInsertMethod); - - // 20. update + // 8. update Method updateMethod = new Method("update"); updateMethod.setVisibility(JavaVisibility.PUBLIC); updateMethod.setReturnType(new FullyQualifiedJavaType("int")); @@ -340,7 +256,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { updateMethod.setAbstract(true); repositoryInterface.addMethod(updateMethod); - // 21. updateByExampleSelective + // 9. updateByExampleSelective Method updateByExampleSelectiveMethod = new Method("updateByExampleSelective"); updateByExampleSelectiveMethod.setVisibility(JavaVisibility.PUBLIC); updateByExampleSelectiveMethod.setReturnType(new FullyQualifiedJavaType("int")); @@ -390,27 +306,16 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addField(mapperField); // 原有方法生成逻辑（无修改） - generateFindAnyByIdMethod(implClass, modelClassName, mapperFieldName, exampleClassName, hasBLOBColumns); - generateFindValidByIdMethod(implClass, modelClassName, mapperFieldName, exampleClassName, hasBLOBColumns); - generateFindTrashByIdMethod(implClass, modelClassName, mapperFieldName, exampleClassName, hasBLOBColumns); + generateFindByIdMethod(implClass, modelClassName, mapperFieldName, exampleClassName, hasBLOBColumns); + generateFindOneMethod(implClass, modelClassName, exampleClassName); generateInsertMethod(implClass, modelClassName, mapperFieldName, introspectedTable); - generateBatchInsertMethod(implClass, modelClassName, mapperFieldName, introspectedTable); generateUpdateMethod(implClass, modelClassName, exampleClassName, mapperFieldName, introspectedTable, hasBLOBColumns); generateUpdateByExampleSelectiveMethod(implClass, modelClassName, exampleClassName, mapperFieldName, introspectedTable, hasBLOBColumns); generateDeleteByIdMethod(implClass, modelClassName, mapperFieldName); generateDeleteAllMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateTrashByIdMethod(implClass, modelClassName, mapperFieldName); - generateTrashAllMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateRecoverByIdMethod(implClass, modelClassName, mapperFieldName); - generateRecoverAllMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateFindValidOneMethod(implClass, modelClassName, exampleClassName); - generateFindTrashOneMethod(implClass, modelClassName, exampleClassName); - generateGetValidListMethod(implClass, modelClassName, exampleClassName, mapperFieldName, hasBLOBColumns); - generateGetTrashListMethod(implClass, modelClassName, exampleClassName, mapperFieldName, hasBLOBColumns); - generateCountByValidMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateCountByValidWithPageMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateCountByTrashMethod(implClass, modelClassName, exampleClassName, mapperFieldName); - generateCountByTrashWithPageMethod(implClass, modelClassName, exampleClassName, mapperFieldName); + generateListMethod(implClass, modelClassName, exampleClassName, mapperFieldName, hasBLOBColumns); + generateListWithRowBoundsMethod(implClass, modelClassName, exampleClassName, mapperFieldName, hasBLOBColumns); + generateCountMethod(implClass, modelClassName, exampleClassName, mapperFieldName); return implClass; } @@ -467,6 +372,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addImportedType(new FullyQualifiedJavaType(modelPackage + "." + modelClassName)); implClass.addImportedType(new FullyQualifiedJavaType(modelPackage + "." + exampleClassName)); implClass.addImportedType(new FullyQualifiedJavaType(facadeRepositoryPackage + "." + interfaceName)); + implClass.addImportedType(new FullyQualifiedJavaType("org.apache.ibatis.session.RowBounds")); implClass.addImportedType(new FullyQualifiedJavaType("org.springframework.stereotype.Repository")); implClass.addImportedType(new FullyQualifiedJavaType("javax.annotation.Resource")); implClass.addImportedType(new FullyQualifiedJavaType("org.slf4j.Logger")); @@ -474,8 +380,8 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addImportedType(new FullyQualifiedJavaType("java.util.*")); } - private void generateFindAnyByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName, String exampleClassName, boolean hasBLOBColumns) { - Method method = new Method("findAnyById"); + private void generateFindByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName, String exampleClassName, boolean hasBLOBColumns) { + Method method = new Method("findById"); method.addAnnotation("@Override"); method.setVisibility(JavaVisibility.PUBLIC); method.setReturnType(new FullyQualifiedJavaType(modelClassName)); @@ -499,54 +405,20 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateFindValidByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName, String exampleClassName, boolean hasBLOBColumns) { - Method method = new Method("findValidById"); + private void generateFindOneMethod(TopLevelClass implClass, String modelClassName, String exampleClassName) { + Method method = new Method("findOne"); method.addAnnotation("@Override"); method.setVisibility(JavaVisibility.PUBLIC); method.setReturnType(new FullyQualifiedJavaType(modelClassName)); - method.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "guid")); + method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); method.addException(new FullyQualifiedJavaType("Throwable")); - method.addBodyLine(modelClassName + " aDo = null;"); - method.addBodyLine(exampleClassName + " example"); - method.addBodyLine(" = new " + exampleClassName + "();"); - method.addBodyLine("example.createCriteria()"); - method.addBodyLine(" .andIsHiddenEqualTo(0)"); - method.addBodyLine(" .andIsDeleteEqualTo(0)"); - method.addBodyLine(" .andGuidEqualTo(guid);"); - String selectByExampleMethod = hasBLOBColumns ? "selectByExampleWithBLOBs" : "selectByExample"; - method.addBodyLine("List<" + modelClassName + "> recordList"); - method.addBodyLine(" = " + mapperFieldName + "." + selectByExampleMethod + "(example);"); - method.addBodyLine("if (recordList != null && !recordList.isEmpty()) {"); - method.addBodyLine("aDo = recordList.get(0);"); + method.addBodyLine("example.usePage(1, 1);"); + method.addBodyLine("List<" + modelClassName + "> dataList = list(example);"); + method.addBodyLine("if (dataList != null && !dataList.isEmpty()) {"); + method.addBodyLine("return dataList.get(0);"); method.addBodyLine("}"); - method.addBodyLine("return aDo;"); - - implClass.addMethod(method); - } - - private void generateFindTrashByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName, String exampleClassName, boolean hasBLOBColumns) { - Method method = new Method("findTrashById"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType(modelClassName)); - method.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "guid")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine(modelClassName + " aDo = null;"); - method.addBodyLine(exampleClassName + " example"); - method.addBodyLine(" = new " + exampleClassName + "();"); - method.addBodyLine("example.createCriteria()"); - method.addBodyLine(" .andIsHiddenEqualTo(1)"); - method.addBodyLine(" .andIsDeleteEqualTo(0)"); - method.addBodyLine(" .andGuidEqualTo(guid);"); - String selectByExampleMethod = hasBLOBColumns ? "selectByExampleWithBLOBs" : "selectByExample"; - method.addBodyLine("List<" + modelClassName + "> recordList"); - method.addBodyLine(" = " + mapperFieldName + "." + selectByExampleMethod + "(example);"); - method.addBodyLine("if (recordList != null && !recordList.isEmpty()) {"); - method.addBodyLine("aDo = recordList.get(0);"); - method.addBodyLine("}"); - method.addBodyLine("return aDo;"); + method.addBodyLine("return null;"); implClass.addMethod(method); } @@ -581,7 +453,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { } method.addBodyLine("aDo.setIsDelete(0);"); - method.addBodyLine("aDo.setIsHidden(0);"); method.addBodyLine("aDo.setDeleteToken(\"VALID\");"); method.addBodyLine("aDo.setDataVersion(1);"); method.addBodyLine("aDo.setCreateTime(new Date());"); @@ -604,63 +475,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateBatchInsertMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName, IntrospectedTable introspectedTable) { - Method method = new Method("batchInsert"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); - method.addParameter(new Parameter(new FullyQualifiedJavaType("List<" + modelClassName + ">"), "records")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("if (records == null || records.isEmpty()) {"); - method.addBodyLine("return new ArrayList<>();"); - method.addBodyLine("}"); - method.addBodyLine("List<" + modelClassName + "> batch = new ArrayList<>();"); - method.addBodyLine("for (" + modelClassName + " record : records) {"); - method.addBodyLine(modelClassName + " aDo = new " + modelClassName + "();"); - method.addBodyLine("if (record.getGuid() != null) {"); - method.addBodyLine("aDo.setGuid(record.getGuid());"); - method.addBodyLine("} else {"); - method.addBodyLine("Long guid = " + guidGeneratorCode + ";"); - method.addBodyLine("aDo.setGuid(guid);"); - method.addBodyLine("}"); - - for (IntrospectedColumn column : introspectedTable.getAllColumns()) { - String fieldName = column.getJavaProperty(); - String setterMethod = "set" + upperFirst(fieldName); - String getterMethod = "get" + upperFirst(fieldName); - if ("guid".equals(fieldName) || "isDelete".equals(fieldName) || "isHidden".equals(fieldName) - || "deleteToken".equals(fieldName) || "dataVersion".equals(fieldName) - || "createTime".equals(fieldName) || "updateTime".equals(fieldName)) { - continue; - } - method.addBodyLine("aDo." + setterMethod + "(record." + getterMethod + "());"); - } - - method.addBodyLine("aDo.setIsDelete(0);"); - method.addBodyLine("aDo.setIsHidden(0);"); - method.addBodyLine("aDo.setDeleteToken(\"VALID\");"); - method.addBodyLine("aDo.setDataVersion(1);"); - method.addBodyLine("aDo.setCreateTime(new Date());"); - method.addBodyLine("aDo.setUpdateTime(new Date());"); - method.addBodyLine("batch.add(aDo);"); - method.addBodyLine("}"); - - method.addBodyLine("int count = " + mapperFieldName + ".batchInsert(batch);"); - method.addBodyLine("if (count == batch.size()) {"); - if (isChangeLogEnable()) { - method.addBodyLine("for (" + modelClassName + " aDo : batch) {"); - method.addBodyLine(changeLogContextClassName + ".addLog(\"" + modelClassName + "\","); - method.addBodyLine(" \"batchInsert\", aDo.getGuid(), new HashMap<>());"); - method.addBodyLine("}"); - } - method.addBodyLine("return batch;"); - method.addBodyLine("}"); - method.addBodyLine("throw new Throwable(\"Batch insert failed, " + modelClassName + " affected: \" + count + \", expected: \" + batch.size());"); - - implClass.addMethod(method); - } - private void generateUpdateMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName, IntrospectedTable introspectedTable, boolean hasBLOBColumns) { Method method = new Method("update"); @@ -697,13 +511,19 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("}"); } method.addBodyLine(exampleClassName + " updateWhere = new " + exampleClassName + "();"); - method.addBodyLine("Integer lockDataVersion = record.getDataVersion();"); - method.addBodyLine("if (lockDataVersion == null) {"); - method.addBodyLine("lockDataVersion = aDo.getDataVersion();"); - method.addBodyLine("}"); - method.addBodyLine("updateWhere.createCriteria()"); - method.addBodyLine(" .andGuidEqualTo(aDo.getGuid())"); - method.addBodyLine(" .andDataVersionEqualTo(lockDataVersion);"); + if (isOptimisticLockEnable()) { + method.addBodyLine("Integer lockDataVersion = record.getDataVersion();"); + method.addBodyLine("if (lockDataVersion == null) {"); + method.addBodyLine("lockDataVersion = aDo.getDataVersion();"); + method.addBodyLine("}"); + method.addBodyLine("updateWhere.createCriteria()"); + method.addBodyLine(" .andGuidEqualTo(aDo.getGuid())"); + method.addBodyLine(" .andDataVersionEqualTo(lockDataVersion);"); + } else { + // 不使用乐观锁更新数据 + method.addBodyLine("updateWhere.createCriteria()"); + method.addBodyLine(" .andGuidEqualTo(aDo.getGuid());"); + } method.addBodyLine("aDo.setDataVersion(aDo.getDataVersion() + 1);"); method.addBodyLine("aDo.setUpdateTime(new Date());"); method.addBodyLine("// update data version"); @@ -735,7 +555,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { // 方法体 method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(0);"); + method.addBodyLine("criteria.andIsDeleteEqualTo(0);"); method.addBodyLine("}"); method.addBodyLine("List guidList = " + mapperFieldName); @@ -746,7 +566,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("example = new " + exampleClassName + "();"); method.addBodyLine("example.createCriteria()"); method.addBodyLine(" .andIsDeleteEqualTo(0)"); - method.addBodyLine(" .andIsHiddenEqualTo(0)"); method.addBodyLine(" .andGuidIn(guidList);"); if (isChangeLogEnable()) { String selectByExampleMethod = hasBLOBColumns ? "selectByExampleWithBLOBs" : "selectByExample"; @@ -775,7 +594,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("record.setDataVersion(100);"); method.addBodyLine("// It is not supported to directly modify the following columns"); method.addBodyLine("record.setUpdateTime(new Date());"); - method.addBodyLine("record.setIsHidden(null);"); method.addBodyLine("record.setIsDelete(null);"); method.addBodyLine("record.setDeleteToken(null);"); method.addBodyLine("record.setCreateTime(null);"); @@ -804,7 +622,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); method.addParameter(new Parameter(new FullyQualifiedJavaType("boolean"), "release")); method.addException(new FullyQualifiedJavaType("Throwable")); - method.addBodyLine(modelClassName + " aDo = findValidById(id);"); + method.addBodyLine(modelClassName + " aDo = findById(id);"); method.addBodyLine("if (aDo == null) {"); method.addBodyLine("return 0;"); method.addBodyLine("}"); @@ -824,65 +642,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateTrashByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName) { - Method method = new Method("trashById"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("int")); - method.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine(modelClassName + " aDo = findValidById(id);"); - method.addBodyLine("if (aDo == null) {"); - method.addBodyLine("return 0;"); - method.addBodyLine("}"); - method.addBodyLine("aDo.setIsHidden(1);"); - method.addBodyLine("aDo.setDeleteToken(aDo.getGuid() + \"\");"); - method.addBodyLine("aDo.setUpdateTime(new Date());"); - if (isChangeLogEnable()) { - method.addBodyLine("int update = " + mapperFieldName + ".updateByPrimaryKey(aDo);"); - method.addBodyLine("if (update > 0) {"); - method.addBodyLine(changeLogContextClassName + ".addLog(\"" + modelClassName + "\","); - method.addBodyLine(" \"trashById\", aDo.getGuid(), new HashMap<>());"); - method.addBodyLine("}"); - method.addBodyLine("return update;"); - } else { - method.addBodyLine("return " + mapperFieldName + ".updateByPrimaryKey(aDo);"); - } - implClass.addMethod(method); - } - - private void generateRecoverByIdMethod(TopLevelClass implClass, String modelClassName, String mapperFieldName) { - Method method = new Method("recoverById"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("int")); - method.addParameter(new Parameter(new FullyQualifiedJavaType("long"), "id")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine(modelClassName + " aDo = findTrashById(id);"); - method.addBodyLine("if (aDo == null) {"); - method.addBodyLine("return 0;"); - method.addBodyLine("}"); - method.addBodyLine("if (aDo.getIsDelete() == 1) {"); - method.addBodyLine("return 0;"); - method.addBodyLine("}"); - method.addBodyLine("aDo.setIsHidden(0);"); - method.addBodyLine("aDo.setDeleteToken(\"VALID\");"); - method.addBodyLine("aDo.setUpdateTime(new Date());"); - if (isChangeLogEnable()) { - method.addBodyLine("int update = " + mapperFieldName + ".updateByPrimaryKey(aDo);"); - method.addBodyLine("if (update > 0) {"); - method.addBodyLine(changeLogContextClassName + ".addLog(\"" + modelClassName + "\","); - method.addBodyLine(" \"recoverById\", aDo.getGuid(), new HashMap<>());"); - method.addBodyLine("}"); - method.addBodyLine("return update;"); - } else { - method.addBodyLine("return " + mapperFieldName + ".updateByPrimaryKey(aDo);"); - } - implClass.addMethod(method); - } - private void generateDeleteAllMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { Method method = new Method("deleteAll"); method.addAnnotation("@Override"); @@ -897,7 +656,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("return " + mapperFieldName + ".deleteByExample(example);"); method.addBodyLine("}"); method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(1);"); + method.addBodyLine("criteria.andIsDeleteEqualTo(0);"); method.addBodyLine("}"); method.addBodyLine("List guidList = " + mapperFieldName + ".selectPrimaryKeyByExample(example);"); method.addBodyLine("if (guidList.isEmpty()) {"); @@ -921,116 +680,9 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateTrashAllMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("trashAll"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("int")); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - // 方法体 - method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(0);"); - method.addBodyLine("}"); - method.addBodyLine("List guidList = " + mapperFieldName + ".selectPrimaryKeyByExample(example);"); - method.addBodyLine("if (guidList.isEmpty()) {"); - method.addBodyLine("return 0;"); - method.addBodyLine("}"); - method.addBodyLine(modelClassName + " " + lowerFirst(modelClassName) + " = new " + modelClassName + "();"); - method.addBodyLine(lowerFirst(modelClassName) + ".setIsHidden(1);"); - method.addBodyLine(lowerFirst(modelClassName) + ".setDeleteToken(" + guidGeneratorCode + " + \"\");"); - method.addBodyLine(lowerFirst(modelClassName) + ".setUpdateTime(new Date());"); - if (isChangeLogEnable()) { - method.addBodyLine("int update = " + mapperFieldName + ".updateByExampleSelective(" + lowerFirst(modelClassName) + ", example);"); - method.addBodyLine("if (update > 0) {"); - method.addBodyLine("for (Long guid : guidList) {"); - method.addBodyLine(changeLogContextClassName + ".addLog(\"" + modelClassName + "\","); - method.addBodyLine(" \"trashAll\", guid, new HashMap<>());"); - method.addBodyLine("}"); - method.addBodyLine("}"); - method.addBodyLine("return update;"); - } else { - method.addBodyLine("return " + mapperFieldName + ".updateByExampleSelective(" + lowerFirst(modelClassName) + ", example);"); - } - implClass.addMethod(method); - } - - private void generateRecoverAllMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("recoverAll"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("int")); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - // 方法体 - method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(1);"); - method.addBodyLine("}"); - method.addBodyLine("List guidList = " + mapperFieldName + ".selectPrimaryKeyByExample(example);"); - method.addBodyLine("if (guidList.isEmpty()) {"); - method.addBodyLine("return 0;"); - method.addBodyLine("}"); - method.addBodyLine(modelClassName + " " + lowerFirst(modelClassName) + " = new " + modelClassName + "();"); - method.addBodyLine(lowerFirst(modelClassName) + ".setIsHidden(0);"); - method.addBodyLine(lowerFirst(modelClassName) + ".setDeleteToken(\"VALID\");"); - method.addBodyLine(lowerFirst(modelClassName) + ".setUpdateTime(new Date());"); - if (isChangeLogEnable()) { - method.addBodyLine("int update = " + mapperFieldName + ".updateByExampleSelective(" + lowerFirst(modelClassName) + ", example);"); - method.addBodyLine("if (update > 0) {"); - method.addBodyLine("for (Long guid : guidList) {"); - method.addBodyLine(changeLogContextClassName + ".addLog(\"" + modelClassName + "\","); - method.addBodyLine(" \"recoverAll\", guid, new HashMap<>());"); - method.addBodyLine("}"); - method.addBodyLine("}"); - method.addBodyLine("return update;"); - } else { - method.addBodyLine("return " + mapperFieldName + ".updateByExampleSelective(" + lowerFirst(modelClassName) + ", example);"); - } - - implClass.addMethod(method); - } - - private void generateFindValidOneMethod(TopLevelClass implClass, String modelClassName, String exampleClassName) { - Method method = new Method("findValidOne"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType(modelClassName)); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("example.usePage(1, 1);"); - method.addBodyLine("List<" + modelClassName + "> dataList = getValidList(example);"); - method.addBodyLine("if (dataList != null && !dataList.isEmpty()) {"); - method.addBodyLine("return dataList.get(0);"); - method.addBodyLine("}"); - method.addBodyLine("return null;"); - - implClass.addMethod(method); - } - - private void generateFindTrashOneMethod(TopLevelClass implClass, String modelClassName, String exampleClassName) { - Method method = new Method("findTrashOne"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType(modelClassName)); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("example.usePage(1, 1);"); - method.addBodyLine("List<" + modelClassName + "> dataList = getTrashList(example);"); - method.addBodyLine("if (dataList != null && !dataList.isEmpty()) {"); - method.addBodyLine("return dataList.get(0);"); - method.addBodyLine("}"); - method.addBodyLine("return null;"); - - implClass.addMethod(method); - } - - private void generateGetValidListMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, - String mapperFieldName, boolean hasBLOBColumns) { - Method method = new Method("getValidList"); + private void generateListMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, + String mapperFieldName, boolean hasBLOBColumns) { + Method method = new Method("list"); method.addAnnotation("@Override"); method.setVisibility(JavaVisibility.PUBLIC); method.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); @@ -1038,7 +690,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addException(new FullyQualifiedJavaType("Throwable")); method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(0);"); + method.addBodyLine("criteria.andIsDeleteEqualTo(0);"); method.addBodyLine("}"); method.addBodyLine("List<" + modelClassName + "> result = null;"); method.addBodyLine("long startTime = new Date().getTime();"); @@ -1105,17 +757,23 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateGetTrashListMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, - String mapperFieldName, boolean hasBLOBColumns) { - Method method = new Method("getTrashList"); + private void generateListWithRowBoundsMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, + String mapperFieldName, boolean hasBLOBColumns) { + Method method = new Method("list"); method.addAnnotation("@Override"); method.setVisibility(JavaVisibility.PUBLIC); method.setReturnType(new FullyQualifiedJavaType("List<" + modelClassName + ">")); method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); + method.addParameter(new Parameter(new FullyQualifiedJavaType("org.apache.ibatis.session.RowBounds"), "rowBounds")); method.addException(new FullyQualifiedJavaType("Throwable")); + method.addBodyLine("// 兼容原来的写法rowBounds"); + method.addBodyLine("if (rowBounds != null) {"); + method.addBodyLine("example.limit(rowBounds.getOffset(), rowBounds.getLimit())"); + method.addBodyLine("}"); + method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(1);"); + method.addBodyLine("criteria.andIsDeleteEqualTo(0);"); method.addBodyLine("}"); method.addBodyLine("List<" + modelClassName + "> result = null;"); method.addBodyLine("long startTime = new Date().getTime();"); @@ -1137,7 +795,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("if (example.getLimitString() != null) {"); method.addBodyLine("exampleString += \"\\n\\t|-> limit: \" + example.getLimitString();"); method.addBodyLine("}"); - method.addBodyLine("LOGGER." + slowQueryLoggerLevel + "(\"[SQL] select " + modelClassName + " trash list primary key use long time\" +"); + method.addBodyLine("LOGGER." + slowQueryLoggerLevel + "(\"[SQL] select " + modelClassName + " valid list primary key use long time\" +"); method.addBodyLine(" \"\\n\\t|-> use time：\" + findPrimaryKeyTime + \"ms\" +"); method.addBodyLine(" exampleString +"); method.addBodyLine(" \"\\n\\t|-----------------------------------\""); @@ -1172,7 +830,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addBodyLine("if (example.getLimitString() != null) {"); method.addBodyLine("exampleString += \"\\n\\t|-> limit: \" + example.getLimitString();"); method.addBodyLine("}"); - method.addBodyLine("LOGGER." + slowQueryLoggerLevel + "(\"[SQL] select " + modelClassName + " trash list use long time\" +"); + method.addBodyLine("LOGGER." + slowQueryLoggerLevel + "(\"[SQL] select " + modelClassName + " valid list use long time\" +"); method.addBodyLine(" \"\\n\\t|-> use time：\" + useTime + \"ms\" +"); method.addBodyLine(" exampleString +"); method.addBodyLine(" \"\\n\\t|-----------------------------------\""); @@ -1182,8 +840,8 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateCountByValidMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("countByValid"); + private void generateCountMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { + Method method = new Method("count"); method.addAnnotation("@Override"); method.setVisibility(JavaVisibility.PUBLIC); method.setReturnType(new FullyQualifiedJavaType("long")); @@ -1191,7 +849,7 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { method.addException(new FullyQualifiedJavaType("Throwable")); method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(0);"); + method.addBodyLine("criteria.andIsDeleteEqualTo(0);"); method.addBodyLine("}"); method.addBodyLine("long startTime = new Date().getTime();"); method.addBodyLine("long count = " + mapperFieldName + ".countByExample(example);"); @@ -1215,73 +873,6 @@ public class TapeRepositoryGeneratorPlugin extends PluginAdapter { implClass.addMethod(method); } - private void generateCountByValidWithPageMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("countByValidWithPage"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("long")); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("// When not paginated, the count query returns 0 to avoid unnecessary queries"); - method.addBodyLine("if (example.getRows() != null && example.getOffset() != null) {"); - method.addBodyLine("return countByValid(example);"); - method.addBodyLine("}"); - method.addBodyLine("return 0L;"); - - implClass.addMethod(method); - } - - private void generateCountByTrashMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("countByTrash"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("long")); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("for (" + exampleClassName + ".Criteria criteria : example.getOredCriteria()) {"); - method.addBodyLine("criteria.andIsDeleteEqualTo(0).andIsHiddenEqualTo(1);"); - method.addBodyLine("}"); - method.addBodyLine("long startTime = new Date().getTime();"); - method.addBodyLine("long count = " + mapperFieldName + ".countByExample(example);"); - method.addBodyLine("long useTime = new Date().getTime() - startTime;"); - method.addBodyLine("if (useTime > " + slowQueryLoggerTime + ") {"); - method.addBodyLine("String exampleString = \"\";"); - method.addBodyLine("if (example.getWhereString() != null) {"); - method.addBodyLine("exampleString += \"\\n\\t|-> where: \" + example.getWhereString();"); - method.addBodyLine("}"); - method.addBodyLine("if (example.getOrderByClause() != null) {"); - method.addBodyLine("exampleString += \"\\n\\t|-> order by: \" + example.getOrderByClause();"); - method.addBodyLine("}"); - method.addBodyLine("LOGGER." + slowQueryLoggerLevel + "(\"[SQL] select " + modelClassName + " trash count use long time\" +"); - method.addBodyLine(" \"\\n\\t|-> use time：\" + useTime + \"ms\" +"); - method.addBodyLine(" exampleString +"); - method.addBodyLine(" \"\\n\\t|-----------------------------------\""); - method.addBodyLine(");"); - method.addBodyLine("}"); - method.addBodyLine("return count;"); - - implClass.addMethod(method); - } - - private void generateCountByTrashWithPageMethod(TopLevelClass implClass, String modelClassName, String exampleClassName, String mapperFieldName) { - Method method = new Method("countByTrashWithPage"); - method.addAnnotation("@Override"); - method.setVisibility(JavaVisibility.PUBLIC); - method.setReturnType(new FullyQualifiedJavaType("long")); - method.addParameter(new Parameter(new FullyQualifiedJavaType(exampleClassName), "example")); - method.addException(new FullyQualifiedJavaType("Throwable")); - - method.addBodyLine("// When not paginated, the count query returns 0 to avoid unnecessary queries"); - method.addBodyLine("if (example.getRows() != null && example.getOffset() != null) {"); - method.addBodyLine("return countByTrash(example);"); - method.addBodyLine("}"); - method.addBodyLine("return 0L;"); - - implClass.addMethod(method); - } - private String upperFirst(String str) { if (str == null || str.isEmpty()) { return str;