From 0e08a7d102da4fcad1f2c18d2fb0db50ea1259e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 13 Sep 2023 18:40:34 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6(?= =?UTF-8?q?DictTag)=E6=98=BE=E7=A4=BA=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/wwwroot/data.xlsx | Bin 37699 -> 37917 bytes ZR.ServiceCore/Model/SysDictData.cs | 4 ++ ZR.ServiceCore/Services/SeedDataService.cs | 39 +++++++++--------- ZR.ServiceCore/Services/SysDictDataService.cs | 3 +- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/data.xlsx b/ZR.Admin.WebApi/wwwroot/data.xlsx index ee54375f64266e354c4e900245b07aadebca7e92..e68207a9385de3def09500cbe660bc956b9d58dd 100644 GIT binary patch delta 9149 zcmZ9SWl$bL)2^|g!QI{6p8&z#-Q7L7!{QJe9^4_ggy0Y~IKkcBEl6ARbc4w=5drP2l%AkHAz`-n7G3bDi;fMj1_+=1UfY8ya*!VFc6$-gd*5=OqJtHr#>+V|Tu7a%FQ{-9>K3w0;!U zRzRQtP1$J6V$oq&MAkZ<_cB^yq9|f&;pdsdv+MJ&?@g+otBd@uAcPOG_6F3yp4(;C zCmjNvRq25_jq23wY#M|{T2YDe2Qe9S7rkVWFG)^8DDYo>ki+$BK3TZRoFpN*La0=c z!5*GuYyFg9JhI!AEzCWxkh0K$?2E!(Jtb7$P2p-?gD)SdfN1vgIy}RAHof102>1#C4}M^Ga>q;E#?<+l0acpYvt(bWm>$wVUC^mV;h%^=$V}W z)`nYGhRmz$E02IP($ux>7}D(?nL)hz9IfiIJoXS{B+oggqjqW`y8K>h4s+R0AFaPo z9=%>%-9ve~yMCqZG1W2#>2PQ+NT@03gJ36XW)Zyl9yaPolLb}0$*rjxp*j5!{~S3$ zxy5s$b55U~j%gD29+9#DLFb6y)TKsKB5Hql8$HVDG7+ii-bZLemIcR1!}YE2BhyXR z!7HWS7(?fxW3#Mmy;GTW#h$`8;4nJ^dj}vzPvI__LwjC;~ zn)O`v0V$^t9s{VoNjzO9CZgh=FtqkVjnkS~=ND_c>*cd=TgM%5dX(VyI6fn39oprQ z_)H|cu$rgTJho3cA&*i=7%Eowy?41Q=8KDQOz#j2LEX>hmybo!km1U`c}viMPO-J= zXGG>RtemMF(!=%cx%yswgN>~fE~Cx0)z4E{^3@r^BwtqQVuh}`Qx-929p=@;?T{3j zJ?v}E2$v^Ynq+ZCYl%TkAx29q{F@0~n2BXiP${NkyeNLV+PoIa?#@eF(20V-1`WK# zuEEeKHlU@rpG_&V1GU6_O*`KKhk92b;l zE%A_-RaxZpJ%N$*mkVLFtXE)tbbYfA#mjAv|Hq{6csvXdV#o42Qk88M-TfKw z@HH(27@Z5Nz6X&M7O@$=FYgN>1jKG77>yqv;9&7`u+Ih?d|4sG3O}bk6C(R#M!4d< zOsCjbU7=|+UEyzt>6e{Pumfq6r0{gkpOD~IF)JBM)E$2J={%_S)V7lE3SvNZZ6TQ& zpL!B$Z74uz=6u6Z5;s|U@G0E$XGG?o?&->h72f(-o;!~ZoA4MudNV1my<7^_+Ckeq zz!dZ~XvX$iORrYF{F!keuSn5Pu8BGZ4gFg;rSwc!yq^xmfp*OEh(65`c!w=wZywZe zgf_C-A!@6uH4%xEw!(d)9@A$~$r#in%_D|{ori4a%#5vMdLc@2ZxrDO8+qcYs(23W zCm2+vz7t9_UGl7IEOAAp4|!oG7Pgxrz$3Ik!PSC}=?*2M(61=1o(js*FKHRyE!1X& zmbQ3%avx~;xt;&8=1dTLr9G{ufL+e)G@F@-QLyIA3qyP)H!&lP{mMENHh&kejRS2l zgy)57e&^n8*1uiSceI7s@CVwB7=yL8snzKU@{f~&0`Bss>gQnPzbHbDl5gRHFhCfJ z6Z7)rz;nt2wtNJxTQ&)^5Q)?i?^fI@{sqXXK$ zj#0w)TMFpo;@jQC;?BdE%7QuSJpIgWG8{Seq_kR@CHQ?)X?{z_IFL|_T;@ucp>?{p zynJ1IHa?x#fXF2)aQ;-?{)KZOyGj@dHyww7h&~pW>)9z?V_VQglVF|Zj_zSI(Jc!{ z2^}@;WwR)!TE%ajnY@QIEx;l9>zQJ^_O)b>8^nC-u@F}@#Y{0@q4`=Kp;~Bh`@<#% z`-I>`@TxXp*ZMN*B2J0t|Ik~pjMShCL46K6JLT!av2=DfHv!iKH0i;k?lxX&0z-twW8&SLi>uInRb$l?FLW#gj9uBVEq^Z;N`0Lj1$D%hV2#B{gi2q!Y0bM=E z9S~akZ!);WLkHhYb~c|X;wLN-n(lxx6dDnayW15k{L0Fo)FJ?a-W=5kb6wQz0N^`B+S&f%^ZGyo_>b-70e_Dl_D59=F{5 z5Kw_MxS}J4*Ei6dg@@lWh?o>GQf=tBj+;XH_CeA&CKZpEOqUDq1+x}gasscK-RBpb zMZokF2kj|#A@z-K$Y?}w$A*;2t0GYQ_0^OrH_~BkUXf!1sHi9?xI-5c+Js0?dTc$k z)=|JDklPs^^XgYY>)<7JsI%b`R%!iO=u#9}QR%M7KU_t(tRf-#F_8^`7*Gzyze~TQ zx1^e`i6qzk!nbTbV;xv%izzWDjox8ey|OH`|Fw`9xg#Er!WSZ@0KO1e4U3aQ0)+S| zf|U(y&MVpCZwfp& za4n)&}`U?_dpr$C^!Y>00LP$kgJ z4`_ZD9u`1vInZD+ZGnO`gAYB7V?-+~fieU1g8-1EA+&qLaLH?6cP|YTDrJzmf`k1Y zV)7^wHXgfvP+&Qo&p?cR5T7mMC0+7&u{7nLZm1J@!aCKMrwJ4BeLh^^y0<1z zFS?i%6&~Dtu(zvZ(-*EzRI7tMRU%I*soMOIETDto!SFs!`6e`qWwbN$IN31Pg8lOZ zo?tqn!7ZarQTS+UB8A?Hyi9I840DHrEiW~E;hQkgouF;PzC;sS`KLHt9$KJWsds)= zI+59ltdK`@{4r_C7&YmMMm#f(%UHA)UR+&4=vPKk=CZB_ML?dGEMK!#;F`7-V=D{~ zQR_LVNT=4FjlcT*6Pm@6t_N{slj+1AG1qkK7({zNpWd+KkG3I$qji~j%aPL`oxg63>vJ?85?(raargxnu2rD(8G3QT z=bUfp=veW1?284x*Pzrtd;Zi3RC^EM_jzzmaM7i`){tOrW2r;i-MgNsN%%ysiOhcK z3K`~FXM)%bXA^CHDGH^4Ee)|YM{||MT&qz6dr1!DG`heW=&}eE3w)7hC}h^-RSqGqp5v zeD(T&o!0g13O4@L5E=TuXsVT?e2NLFF*mz_-|L|S^Jcts)hIxnbNO|ThnY1#-o7^V z&A#+A`+Jy|d)A_t#Sr;SdU!lONKaLxS|6QZtM=H-r>E}O2YHx{B&qE?xn$1(eZA?b zB~z`lZ?M7|?aKyi<;5ZWeB+*31gziyOYYp|hfvwf8^1AJCYhC)LG?hFeI%JPKOM&% zzsB6uX2*xf@)*+w^G`X;V-rX&dQtH6SoQd9H2-pt{&^@1Qud3JHSuv}!E3Vrp(?@C zfMsAsdEAneVx57-fE$Dp>u#p$hRZF@F;-v#-RpN1VLbxNsA4WAH|EYmSE#r%A+^lW z$Vr&bMOeSyRwk0fTnB0LI&dERAKBQ@z|M8?bKgKC|r3XT0NjZsXi%EAc!Ul}$EUzg&AT9h|Y)p4V zPEMvu2|bGN@$mtCe){@&EDX}hdaO9l{AFHPT3gRJvHrrD6Rg*ey|s2G^>p`Td1`$h zE?kYveu3SyIgjh*HvaDUL8;A8$QoLAaAQpn17`2L-#TkdI(6?vtHliDP{K({48-dp z^1(};6@diM#}$&4v#~l=``L(tskEbdQ#0Gx^J%=Ae`N(=h`Vv`KgFS3;pc5WU)t02 z_4wdxJE3J)>1j6?wmjNu@L)XgU4Rgm?X8G3o!b36pHG=1M>cLCW%Y|eT&I8Nkp3W| ze*CT`2Ags+A`Ve+8fx!l8UvG)fgYv4P@q3HiD1h*s2<{cIa~SD)YMe=%~<4? z4>qHglR6Wy;u4o=PEi#sTNg$fiN0ECafv$PTE0iV7FvI3zGs`Jk;hCBW{~ zu10*W2^V8JEb4M)A-ikP_7hK`z341|JIgww&*uQ2ZemZ>0uA2aW5Gz%vv56|6vFF` z)W#g^v*^f9E6;REazs$W6&s9dZrxF;1Ll&{XiGeRmRGGb5vI0a&5loBogx5j({B!6 zlpbW2nFVErW=BSIB(gnXycfG9p*vluBY8rJ{aaX924A$WC{toX&X4oi!sF!zi`i_c zpNGoAoUA(L*8q3AgzNP{E#B|ILb+sU!E=}MD` zfx&Jeh!V`B>HX(`SNSj=spa<~kK)f1GTOjXWsxlM%&g#}g&{AP3vx}l>5xF0GSR~d zxlL;x9zV#@Z8GBf+4=9GN{*9t*dHU`lEim}JIsl~utr1t#Yug#X+-89dnkx}r*i6n zt>Y+$dE@>%mBSv_d3|f)Tdx!yF`&^6)gPwIIbJv!GV*9iT@b4n% z?35fq4Azd@gBYQTXbvh!^MYpe2AqgwMRQRlJW1!%{*=3%O7Vx${-#(6;#%SVN))(x zi-EG?O*PFwqP=D`&Umy}P@!l;d4^ z>O+U~gj5}Zwiqiki(r;Q=MnoCP(w2cmpka5IVs)F5;><+{T7*XbdwC;DkpFCOS*rY zxmeE$jdwLQeSj(VcmUBi`i*%R)%#_q8VV+6N^U5MH&0lHeTSj^Zsi{`Z^S{?9H@@3 zq-K+H*$0{~kHJ)9*eTLYaaL8e$kw#G%udzJxVOAM^W6IF7W^CJZqnxjgpUdK9808D zb93ghf%(9Fd^yghqE^A`m7I#Y^tj0SQ5dtj)y}rMb`*A{2TUe>gM(mKQ`um3Ml9Mn z1P#45L%{Wu3H>K-3vr6Gg=NP?i;LvRcGG+#ILXXsofif+U7sFNeZHNjPoTs#wWPml z+t5eRG>C}B({Ag*jIj-XUt;Ps4V7yT%aHi6nf`QA8;zpes7}H(K|Hv}O`+WmhPz|l z+19ptFU=~oM+QrGz-G$_g0wog<<+C4(}|v3a(nrTfetfq<1;tzXAzUJwhi|Y2D@@= zLopSTD*1c_wi{!XssR@5(Lk{TPj&flG7btFg*utF7~A0qBv>Ed$(loYF{L(NUnrJ_ zlrJ+0vfhKC)+r4|)O)fzPa#H1R2eUN^#(Jlw(tO^)vCo$l1iuIbE8X{iv?Oz0s3+n zfTzhgBfCjWHTm<&^1I|cnn?A{y@KuIg@a{ACSA>N;H_AX!*rPR(F3s|#%W<}w(mG9 zxsm|4U?}KU#8o@6FLr3Nhk*Hv_898lA1!%(yr&Zz`RP31_-C<(#I&hftt>`PX00u@ z|MsOR9;N)yd&a3FRxcSr1YN09yj6Zpg;|yF4P&nHEq z<5q9h3;z2GLFIsOAYBla-;r7y1Z_|QEi3^rf}d|###8l~Y)XiNw9`T9hM^$Xz3}y* z8IfeVwsoLF^q1mXZdI0tnCz$1?TWPa1G`kQJplZJx`iww(MQu+y0~0AbXy%u*P8*S zSU6OSA<7oO!LmiLF_x`HC6#vNrK1@(oLT=uICNIGk19ZX zRYzZPoh)Yrup8=mC%4F>Yqga%R)8@Mg86R)*g45v8J6#86!3=N!Uj5D9ob{Hz+ku4HR(??8b6DgmRGz+t#q2;-e@$Rr~KW$avibt1ULp^eTy{tm;j;thBd z1HEu$w-5{dO!x8!n_0-D*I-{0bP64BuS*SYPP_m5R_*#XwR)wglG9&m?&J%}+(vuU zeyK@=GivKWdU$o=66#CiB4w8!tQz(%q}ZZ*DD>uCqukV&9mMXYaH+`*x_v{TH#N}1 zPRW2$+Ob^e<|87XLht2)I8`PmVmn~PtHt&ka+RIP0|gbi+$+Y%(k5hSckMA_p{qtg zxS5^_h0SqP5E6lZiIfJHQoCl~bA_jQAiTQZ@B!+1rs>1L?wg}UwC~dsX!zU?clKP$ zRVcz$Ny4L{Q=qkz$Ec>$VN|oX>1MxlU~Z1uaK*RK)Q>-SE5zQuybd$7{f&+vvLJ z+d=eJs~mY=t)hSKr;m3#_p=x&IEe{8L_I5IJ84UyF^4W3v}4pGRa~&m6)F;(f$Q)> z@#?%?uum^{jahDH?1gXfCfILCcKC5!+C~9AZw;O86i;N1xsA#_@KclxD;E5jF!5Cp z;LW5135(ZEg zdiQ8gp-lEov?X$DeF2RAn!9}exWYrF{79O?!dB|w?Z1@1?#t%&tw0#dpUy*xxUC+H z{Q2{5xq-cr9qBA%_hdaNX-W~Uj9ff+*yByZcoBarS#_3UV7<)8;e({+A=pwg&Edu1 zig-uRUM$SfUp#6%-C`XR&YtROfV`i3i<`SLCEUF8rv0DAzi zT0(Hz6~C+9#Uv}S1Q?TYdE+qhh>HTAaBz=`d|?5Yyd8IBdS|Q4OSSLM?>w`f$Dh^p z)?(<_?L38YIfg};Ai=+@Q7xGA!_6z;B@fw0CBF?OW?RRx)gH;!1(4~nY`O`$ymExLkLW< zv`>CQU~y6w15z9BI=5@v5D0>LqNGtLdD+ZIs8&ND_MO5LIQNkcEr(`Wz`t<*AW@_c z9OuZFQWHyKBpjpYd@Hp&6@)%ysSHDvOYbb2+32U0mYn$!blP9=8DeaE)Bm=r=7eV(6bSg3~Qo)k?+thh|xWfW>xm*<8Lhpp3k9y)Z@T_fS}kfrOH77%v&b zmYBK-s7N=;jT(Vb|<`k6}Cy8$ijF(utnHctpjV?hxb^nKP){mVAngoVMSS4(YQ-e{#zufH8#xsaY^ zhNk8F18@qE0g;lp9O%Y94qqn_5uuoFyB;%CdP8#k)CZNU+sm*JOX5ZKRkB2px*0VQ zkRZb1=S~lUn3efqU#Vn@aye0rT6(wN?jW{r$CONB0^`!%(#W-f$-`~ZUr=-B0Eu-8H{bG> zn{uQ^3H7ufTig~~?7OT)h5H--mu*fcY@x@B4!*|MN5o$o!h3dJ-dXG&Rz!6)crjA* zho2e!J^N8tG5WgoztD?WI}<0~QouGOyuSpvWNwb@FQEs>94#yZV=K&-?HBIabP6*h z0Qb`jElZluuZFHeWs4MFWj!Pvqa9M4sMU3 z*f64?WSdR;rr4k_sn_v^c=B-`Y!Y|?o`DR_xxzwEft-e)ceHZWcir76p1JQ zHvtHPq^*X?G1cE_6A!9&k+hifI(--e*EBFfj?_M^N2ykqqrB9SMQ zDyorYZ{tj@)jWNx2u#ZY0Rcs>3@`A568{^2bU#lXR`J}P-#Gm1kL z%etwl%p8p>6K?)`Z6$YI?lm9GvApKYvt;^KVRxnL)JN|D#MiNa3#RB7HlD+SX)is0 zO`ZB_v2uc3Tww)=msmQ8(%Fm_AX&c6{(_LD8CQIcEILy!{^*|d$?caCFP6L$&V`wP zEvV2Kg<$eP+)NVJkb7LoDvh~{WwsKj2X0_JxM)s0ThHSh<0+-+l+%LsBZtRo0lXHAM)cq6Bm@Nhdt&Xs4M`fzE=>sTk3j=-#SuU)tGwUh zfGy)#p=>q&Vf8!W>ws&uvHyv9jM0$(JGu%?5>H0-|EKN#+fQNv){Pg2YV`m^dJ}#Qb>8up_dC*nt)kJuciw0p|LdUN2fUS_3^nWvUQ46`YbCNm z4g3GYs{bJHj%rZDLH{h8N$-}Be^{A>P4sVHLP9{GzL(_QQ;Ppj8x8}nCVhtDiUbpa LDPTpT|I_t9iZ6A^ delta 8891 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 diff --git a/ZR.ServiceCore/Model/SysDictData.cs b/ZR.ServiceCore/Model/SysDictData.cs index 9dbccae..915b3ca 100644 --- a/ZR.ServiceCore/Model/SysDictData.cs +++ b/ZR.ServiceCore/Model/SysDictData.cs @@ -53,5 +53,9 @@ namespace ZR.Model.System /// [SugarColumn(Length = 1)] public string Status { get; set; } + ///

+ /// 多语言翻译key值 + /// + public string LangKey { get; set; } = string.Empty; } } diff --git a/ZR.ServiceCore/Services/SeedDataService.cs b/ZR.ServiceCore/Services/SeedDataService.cs index 62bd9a4..72ac52e 100644 --- a/ZR.ServiceCore/Services/SeedDataService.cs +++ b/ZR.ServiceCore/Services/SeedDataService.cs @@ -1,8 +1,5 @@ -using Infrastructure.Extensions; -using MiniExcelLibs; +using MiniExcelLibs; using SqlSugar.IOC; -using System.Collections.Generic; -using System.Linq; using ZR.Common; using ZR.Model.System; @@ -37,7 +34,7 @@ namespace ZR.Service.System //db.Ado.ExecuteCommand("SET IDENTITY_INSERT sys_user OFF"); db.Ado.CommitTran(); - string msg = $"[用户数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[用户数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -55,7 +52,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.OffIdentity().ExecuteCommand();//插入可插入部分; - string msg = $"[菜单数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[菜单数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } /// @@ -72,7 +69,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand();//插入可插入部分; - string msg = $"[角色菜单] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[角色菜单] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } /// @@ -89,7 +86,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.OffIdentity().ExecuteCommand(); - string msg = $"[部门数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[部门数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -102,7 +99,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand(); - string msg = $"[岗位数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[岗位数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -115,7 +112,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.OffIdentity().ExecuteCommand(); - string msg = $"[角色数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[角色数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -128,7 +125,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand(); - string msg = $"[用户角色] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[用户角色] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -146,7 +143,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand(); - string msg = $"[系统配置] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[系统配置] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -164,7 +161,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand(); - string msg = $"[字典管理] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[字典管理] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -177,12 +174,14 @@ namespace ZR.Service.System { var db = DbScoped.SugarScope; var x = db.Storageable(data) - .SplitInsert(it => it.NotAny()) - .WhereColumns(it => new { it.DictType, it.DictValue }) + //.SplitInsert(it => it.NotAny()) + //.SplitUpdate(it => !it.Any()) + //.WhereColumns(it => new { it.DictType }) .ToStorage(); - var result = x.AsInsertable.ExecuteCommand(); + x.AsInsertable.ExecuteCommand(); + x.AsUpdateable.ExecuteCommand(); - string msg = $"[字典数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[字典数据] 插入{x.InsertList.Count} 更新{x.UpdateList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -200,7 +199,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.OffIdentity().ExecuteCommand(); - string msg = $"[字典数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[字典数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -218,7 +217,7 @@ namespace ZR.Service.System .ToStorage(); var result = x.AsInsertable.ExecuteCommand(); - string msg = $"[任务数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; + string msg = $"[任务数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}"; return (msg, x.ErrorList, x.IgnoreList); } @@ -242,6 +241,8 @@ namespace ZR.Service.System db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); } var sysUser = MiniExcel.Query(path, sheetName: "user").ToList(); diff --git a/ZR.ServiceCore/Services/SysDictDataService.cs b/ZR.ServiceCore/Services/SysDictDataService.cs index 2d4796d..f09917b 100644 --- a/ZR.ServiceCore/Services/SysDictDataService.cs +++ b/ZR.ServiceCore/Services/SysDictDataService.cs @@ -103,7 +103,8 @@ namespace ZR.Service.System DictValue = dict.DictValue, Status = dict.Status, CssClass = dict.CssClass, - ListClass = dict.ListClass + ListClass = dict.ListClass, + LangKey = dict.LangKey }); CacheHelper.Remove($"SelectDictDataByCode_{dict.DictCode}");