From cd84def61ddf16a7548398d13ae26793b5bfe379 Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Mon, 13 Apr 2026 13:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B7=A5=E4=BD=9C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/approve.cpython-312.pyc | Bin 45215 -> 46012 bytes .../__pycache__/del_brand.cpython-312.pyc | Bin 28509 -> 29042 bytes app/amazon/__pycache__/main.cpython-312.pyc | Bin 28953 -> 29816 bytes .../__pycache__/match_action.cpython-312.pyc | Bin 32575 -> 33227 bytes app/amazon/__pycache__/tool.cpython-312.pyc | Bin 3404 -> 4576 bytes app/assets/delete-brand.js | 2 +- app/new_web_source/delete-brand.html | 31 +- .../PermissionMenuSchemaInitializer.java | 23 ++ .../controller/SkipPriceAsinController.java | 55 ++++ .../shopkey/mapper/SkipPriceAsinMapper.java | 9 + .../model/dto/SkipPriceAsinCreateRequest.java | 24 ++ .../model/entity/SkipPriceAsinEntity.java | 44 +++ .../shopkey/model/vo/SkipPriceAsinItemVo.java | 21 ++ .../shopkey/model/vo/SkipPriceAsinPageVo.java | 15 + .../shopkey/service/SkipPriceAsinService.java | 212 +++++++++++++ ...kip_price_asin_and_admin_menu_defaults.sql | 33 ++ .../__pycache__/admin_api.cpython-312.pyc | Bin 55940 -> 64810 bytes backend/blueprints/admin_api.py | 197 ++++++++++++ backend/web_source/admin.html | 291 +++++++++++++++--- .../brand/components/BrandShopMatchTab.vue | 35 ++- 20 files changed, 932 insertions(+), 60 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java create mode 100644 backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql diff --git a/app/amazon/__pycache__/approve.cpython-312.pyc b/app/amazon/__pycache__/approve.cpython-312.pyc index 99830ef623758dfca88b4ee8284e391f29e08dd9..af79784c0daf91e2320604feef1c4df4c0c7dd46 100644 GIT binary patch delta 6943 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 delta 6250 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 S<%P54Q|8Qt)8$js5&v)Sb|Rnv diff --git a/app/amazon/__pycache__/del_brand.cpython-312.pyc b/app/amazon/__pycache__/del_brand.cpython-312.pyc index b1eb189ed0eac0e4e0317142b9a8a0dc7cf39b8a..eabb2992b378addedf649f2ead8f44436bb28386 100644 GIT binary patch delta 1198 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 PL;UV~_V?}_4Sx6!+!pw& delta 4180 zcma)9eQ;FO6@Pbk-+ty}^SPT1o9yO;*<9bI(2Z+^_#i4*!Lu{XR9-%CWEN&+msa<%4NXa_(T+;d&jnniDOfoM=6z z!)}h--i5i&xAR4|jzlX*H>PwdGD`QyY^!Uj+_ zoTCCPGdc518L8+8B0YDfuMf)ow?x9BScFzFh8H5HCQ_Ds-n4`#Uidg=U)~LD@TL7v zUwZhZsl5|Zd&fULe0&Oae{%mAyp~#;+BCNpzI8a^jnu#A)Sxaef(fArp#a`Y+fGWL zDZPV~!v1tO@xkfz#|?K}bZ&-r`%-AL=OmBVcM@__(v{h!+tkQrbqGd^!W3OdR8pce z(k;nyAjTF=Taayu(O|cg`}4>lt`F9*UOJW_Trg zAqgfw%D$+xEkRBlLMOcLs3nE)FUO`8nr;it#EvWk)udaIDnwX^fJ>n35jHRoOmnn$ z!69dvL)DEgV7l?s^sj_TXB7!2zjdxRrZlkL4qAXhd=Mzyk%t}?bc(LZuNdUsNL0qX z$Ek3+uz?(gO3#PH1!>+wQVCVwBGLn$-jZBgFdbl^nB-U_8kIzWP!S&R_GXL7#RQDL5HoP~9uW$LGy zw+? zj{fV}%v@+*=799_EM53hm250`L9;dAm`IJM(kE2bpDK)5uA}->M3YW9F+Y(OH^W2A zbJEkMxry|6I=y3hJXru$6&r~g_EwaU0+^_%V|#z8f`xPpcUb-UJm6iH1(l69!vQkZ z1xtN3D~saRBb-=#lo!3z$C4d9tA!J@5*cxR6?Z3#l0;@)7sIeuzwON9v#q!e?p=_l zFA+=Otj}AxFs@_r%8u$q%d9-Yh4U<2oa-xvgUhp=<~WlVH^fOixi|Oi@C0@nJZxdnXsd` zHhN<2X>Qy;EdzDVb%AJ2m^ZRqm9X!$GiUiVYM2ajJMsmT@F>@BO{yP>@t{ItHHCH2Su6Em) zA!A=@v*F1q;s1AZ;T%VYm&`N#f9eaHuj<=V-I90B_6&2=juiaxarGf%n3+!_5ci9u z0Y3ESuyp#Be|rw@AB{5jl4sz#bo!V;9q|2{Hqb3D(b1*w_~M6nis=G;wGBL`j8^EY z-AcB>h1w09a<3)`#-`g5@Q6|^Qy^typzt&p?vb=aXh()65|zRM%vOpuEJor*uaKqrvb< zARHW&s01Z-LJ5XAeGnlJhoq_+1M*NeUKDEXryjVs&O@@{Se?V9WvIJZhH{%;WfSC+ z2AHb*fcW9H>voe5p!s@_P*C!oyXu0w>K(WLfc1kc_xst-N81jzJvKZ(GTuK~vv$(m zc`^Ie_Y1v{TmQVdpK!V5Uqngrt@=*gu5l*wjJ>(6o#=jZ!-^dC`>oy2@OQ>$ZjFmO zYszh}*PV6ikoGimEac7+OM4xE&gyCR^XL3L()E^(V*V}C?C2=q&pVB5==lPkvCbFk zkzQz7;kN|)Y)m>Wofgxix1iHtnrz}3=YoM} zoC_9#(ex3vO8R32K=34$h6^TPFVgoTY-TW&&0y-4d#8T(z|`^4PY&#vI`Zn&b1yCR z&_TGkvV@GnH!D5%`*8S7$k9C@tZHK67+MuHVu;awFu7`9=~6~2X>w$Uc1x|H0ZHAz zyRaX_kN%LsP$BHDEz;3Sc&cU5@@Sh+SD>&)?B=VG@I2>^I%go8!e`fGGNOb4#m2AXF}*P?CF5#T79{3 z?6(BvP&g2ZNrUt$)|RtaT;*PktAmiT+C%D+i&m!@a-PSDs_@fDJ&W*Ma_!9tixDTX zllad1s+v(Gk0Z=?CGws?_z8kqCa^30DOkKgB(?D920v+pH#bz0KKOD&1K9^PUAK^a z*wvLo#^I4Jp)|y%J)=_>NwEZA^o*&`Sm-g7`XqeR0_ClU)PAYe9)2~+T!hoYsBHV?56_n

l#r@ruo(}l z^$wklvU!%P&QZhQEXq+!sZ>T?Eu^&H)u=iF;ue88ll!;qC*&-+#XQ|59n_20lXoF1 zjv3;{z7#A|NE+NIxpUL!mjkRivB#mtn9FCVL-$J#k_iX4);O}_yvX0p)UpfL7&kD? zKFXgWAT^eeoI^duj$F|(eK`|u>^%dM#BQ@pSi7|}-x_sKWEUL%8o6 z;q1b;Crmp{ta9kosM*Rva6w1U1j{(z_IPdT=HdOul8vvo#CaVfTLpt+=#wL1#ndYW zMTyF^9=7(D!l~XCmW{sXbs1}M#y-dhHL+vU8FKCVIb#Smnu2`HDcUo`Or>o@k{pv2 zLo_1CXf^9mY;r6Z8>D#xv-{=ie=df`{(IaDSJvuYH#S$W-dtUSDI*Fqeoz7W*Yum+n31RkLoVI{&k28uouj!_IO zisb=4h;R}Ci&uIAK|MceqET4$8IEE(r#S=TiXz~NkWaG}jdJi&I9jxw@a<$=JW)HL zKT&@ye3?@jFUwan;&N0ELy^zwD)=B7uf5FSeW?m`*WrKkT4CN_A^7q?SS#AYV?_YU*$V{UgGM2s8dr%*zHN;?RJ!oPN$a caD(J^;EdIz?6ik0#Z?;lK9rv%I7vj5s0u(toS1;<7*5wMTca$8~FO1!ZqF_3mn05PR;q#Z&L;p0oGdbLX9p0J`0K z@8p~(@4WNQyfg32`}3XqZ*=)7UUylmjpb;2ckAbkciVe)W+e1x)pdGwwK~M{+)7SR zKFtX#G4{9k@to^jQb8+)9e;ORw!plQzLIQ$DCPS6TEA^wo8HbKzW8U;gbBF~8$ zA>lZZq+wk#UYzXLCW%Q+dD7Sf7O{WP7@bmUq9Su25RoJjCnZv-#5{5;Ev-{9)}~So zX~N{-a&B`n-Fdp2qe4r*XPMOZlO`9kBF>9qV2?9JYm_T+&CBWOiYPZzNRDz5theT& z^~m`&4f!+DWM$Q6GjWrcb&wOxV)jAqaLm-y?j)uplj!-RRGWjtxwRP}FJ?^1(B;dC zTWv%Ya5B=$%QYFBGP-{%pj!G*y7+B&K4S21_qEk|eSyY?#(H<4(dUh5w~2u|%5JS| z^fveg{>E!G=?1z_oB#l~b{DR*{5>8UfukpO-3}B#@QO~342hHzi4j{we?-~a zfX9bj0I>In%q`IKL)S!d>`s-1l1@ENC7bM-XaU)6&ry`YXc0MK-%O1Y=Xgv$3yy_t z03`s+05(&2kHZ;2TLH8T$TQAd1!HOl&Nz*HW;10+lsM@1HhQ-?dC4}w^uuj}UC4jT zDy8%G(Y0OVkDLlZ(@>I1=07!yb2_PTW-wmIS#D zfDlM118#qFU88_^1FI9D3*aXJPXRnl5*IooqgN5bt`vIMCl=P2u2VPkC zHA1nZz1S`vS8--5IZ~XiuygkL<8uanUwi;1y#>p#rQZOmOIo#cNeX{9cHp@sKSatQ zjtlG59C4SLUMhK7V+rYn#AX_+a1yY{J0%9*Yi8ut5|g5PZ%ET*qK<2^g$)6CEUXEp zkRcj45f?J_AgrZxavll5nOO^|q9GuhFl}N=D4{8hu4mN1ozq6ACy?8gwAipQWc1Gy zEFmL7vy%*|LRwSB<=|)4wVOey?i0;a}0gQk$338ced~lbhFSH+)3Cbz$f-0=> z@>DW2qzlCf`VN|en(3+hJk|eE0Q`=%rhHuGIMKP#g`W&XATKOc73j zgT;hWgmiMnH4j;cylkE#Hlx0|RLozCw_n=~`(yZn}T+>`QP=+RC3CTjLP|R_; zq!4l4>ti@7p~Pk?RY0XoDHb7y{^qJBSfinTL)auZ1XYVM%$|>OCeMY;P1*2v=EDsNk349)0EA7} zLZ+zU!`g?HyRxEVh}%e$c-XYtM9sTjqS{a!w@bE>YeNrhX6=KU$;b~`s2yj2pH9eV z)b^h*x65F=XhrJ6X-{mL&Y%4sI-Ow?Jel>6{sS%i^rt&*-8KKeb+z-RuS@<|p01T_ zQ7+9V+H&XrdXLt^DN}k2A2L|BwE4eRqM=H>stFbM%2%X3@DAFz=mj{7NcGAu6fe^o z#jlW}Rm+n0QnD%%S0BV!^h&9m#_AVWEkh1+ZB>>Ov0r_u;zw2p8eewxjP5@<((}&U zLtSI(tmU-~Q%o_Xv4@Q|Sd{p79H9dpv~L72mG#=~g>2EZ@zJOIdc zG*njoz_M7%;u>H;VvfW#`DyI{g=|FL;@j5fl~Oe%7yLRvAApq7$-W;fUz#c6s!t3LXK5h6mt=ch`r?F z%HN?9(!FN4>`#d$L|>I^y`GphuHa@kK1^)h$QPyOpn3_M5Lc7WJ&TVRF!^#8VZPA5h#*Ode|TyplkDxT=7E9o2F zR4pnjO6@Xqn_R4Z33nj#qaZ7B~_{Xh5RxL{rf|#E1mvba?Yjr z@w}z$W!&Y$r0T`|Cu*M3pTy;@P2oOSRJ=~deVVGSUMT<6;fk#;lwT>7)6SK}>b1%8 zLAgt@)*v6!DCmqKgPgL4l4U@rsMl#^Lzy$yDP&hU#rhw~xT^{|WnI<4@Kv39Jtw1#5yAysxwUR;A>hB=^zk-Fwl<#6nbnmpxjwj4Nla^O7bq%=MY_k0oH z?SXUaexgDDM9Q`}Os`Q+BtGil^}e7tfZMTygtyrA$3dD^Wv>GDKKWqFBD9x`ZE-7@ zhy8+7*DXNZ+@N^@$R2=GCMZXc<1n@gq~$_C6504VfW8H-O-%4w85YwFN%z&Lmj?jmoxGuC`W z$%xM1))=VYKIseRU|ezt7}ipc^5Ht_Iezyx5z`Wj^03%I{cC$28^ce)jAw{pYnp?3 z%x`GF!@R~#SFLe3=eJ@XI9c7qi7yPS-MU|m-XmW(AJVXTk-52p^tR+`rVM?FTxu!M z<6nV3<#y36h}e&fB+m0Xwf+gutf=+>;#rx?%=)h&8T+`qB`B_dElXB}U>1pK_0h5x z!V~@#S?9HPvN$Ih6PS|*j>N5_x68@1Nl2X=gFxZrnpSOHd&1jRp4o~lRO{z&hsZKhCidwp`1 zKj$XZL}CP=SEL;Hbcm>>D{7=sk|jW>i-KUbB@Z>4!A82z+}-;;%~#~!&Llo)Cfc1A zt?dC%DcG6Sd7aM2Hvl3O%AGOnM)6JHz-J)-Hwr;84$XdFo$b5xTQd6dLo})V83z9X zgWw1fTM`+4wr6DDkwvx+nJv#2v^_LBnI!M*`}Js-YR{d%J#@9bl0s7^{NI_3;I`_cAcu| zFFx%)uQ?sQv|=!2-LQT=8Qb;Yj9ZE3*H-ne8nl+2SAAAmGgMkLSh8U-{c)Oah7-4v z^X+!WLYf=K7jtUui>jZh28|V$Rt~FbZt5(9sq3%lY6ev`f4y%ce{EmVS+3?U*m5Xd zRI69Y?ZeI60-AsLF}(NqQuwtg5QUiOQV@Tn8t762J}cF96J%UZDB_nCai4 zR3xUQkveQ4Fb@G70brlw5L@sWj+@D`7>Bn)KLfxDAVdM={AzNeV`;?(Bron0zUAQm zUMs(rmsg@bVVq;c>B0%(l6`_06t+!J;~e)xeiQ$#Bstzdp8WCr$5+QV+ne`lH18`U%e9+L|b}#T})ZefK4KY3~9V`SFtZAJ9EVR6$z9u-fJX z?FQ8p?tbv%X!psHfqpE41iy1W-a`ot?ukDpPlPhiWzrFvt#wL~>`~xXkza>qp~K{h zkgJnbXUu%eKI|%>W|Ar@Wi;WjL@@yT^8lYxh$#GRkQuNII9&j&09*=G2|y8m3!n^u z`4D(4W~qy1BtgOj{S{y4Cr^8k!fbavZee#FO@H!Ex#bkT%IGpkOTDp018Wa0RR91 delta 5025 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 diff --git a/app/amazon/__pycache__/tool.cpython-312.pyc b/app/amazon/__pycache__/tool.cpython-312.pyc index f2537c6fb61749490b0fc1d17ffd30a75f0d9fbf..eceb0cda63dae1cffa2f3af23523986a3c4bbac0 100644 GIT binary patch delta 1443 zcmZ8hO>7fK6rSC+*K6mO1VSh&8W9dz6npI?c5J6bN~1z3Aw>y@l1sGNoy6O$cg^gY zgq0&3T0vV;LIs6LfZC|7NPp6V8wDh;t=dC+>S|G?O2x!E)ifL`PMvjdt~qX-Vs)=l3C*M5#bR1ZtWKBOC0ZFWj~q9ouygNR)8AWu2o(^=g_chw&QtcSR;_iD1L;B6sl_0>mJFC@orr1Z?F zCZ>_Yjfn;t&0^JIF*37QlW3P_v-t@!MApYhcLU_8n`GbH^b9T2IiOH8jLgU+44Eb3 zlR4Qh2X1jQ9+UcHu_d3Qb4<=d!mIwS=3DOu zUxFuw2H@($>#Lui3*=q)O@gf;ld$*LVOad^{_1?8cx$>qw^BW)Uk`^8?MSOAaf{RRpd?Bu zWCbP>$^=DKIfJadDbvg(1tA`abjCuFL@3hTnT*84@vtE4QYdAnRZBmrTZ*cRLNpZ4 z!?u%(ChJoM96Syq;ZV2-5=X472TsSjc-WiCsOTgbJEE9Ew6i#S)Q7B9Vx6iyh%aG~UrY7LCO7 z@o2as+>ziphwYUllrgQk4Ga#5+C-LQ$ExXb!wmN6nu&GQ2@pj?lBwvL!yd!pL|Sxw zLuedfgss2{1L0ur1WBe<|4#6*W+JSKYVf!|iL`@jdq_d?9*3<|jN$lFc_hjR8xDI0 zVP*WR<1>{s(z7N{JKWY~V)B*&&*E1JV3)yRND1IJ*W_K3%-pzbgC(Y0Q4r$Y?nuo9 zGDjIzu9{#PIQmj%N6vHPt!Rfp3V9h+}rtYh5nda6mdsxlTLStHqX zpE};*cJ624a9gEbiSBEF!|qTedhWHfE@xGA07r?BB4Ws-D>D>Dl|2mA_}HT~tOo#9 z|2x?8jD3TmI_HcsaB;bHy@JmM=@x4H+;ABXSm>+3%FxJfL(;E9(sS4OPkEFET;tz> dq8jbmhVzG9`oZq#UB_z^akZGVEV@gZUzqFPYjHV!Z-MYn%sd}CZ7@H;u2t(z%Io+lTnHp E0FKT?Q~&?~ diff --git a/app/assets/delete-brand.js b/app/assets/delete-brand.js index 9097ae7..84bdd87 100644 --- a/app/assets/delete-brand.js +++ b/app/assets/delete-brand.js @@ -1 +1 @@ -import { d as We, o as Ye, I as Ze, a as d, c as f, b as es, B as ss, e as l, F as H, r as de, t as v, f as h, J as ts, K as Ae, n as De, g as y, h as J, L as ns, i as G, E as p, M as as, N as ls, O as rs, P as os, _ as us, p as is, q as cs } from "./pywebview-D808cNhy.js"; import { e as ds } from "./brand-DRn3N4FA.js"; const fs = { class: "page-shell module-page" }, vs = { class: "main-content" }, hs = { class: "left-panel" }, ps = { class: "upload-zone" }, _s = { class: "selected-files clean-placeholder split-selected-files" }, ys = { key: 0, class: "more-line" }, gs = { key: 1 }, ms = { class: "run-row" }, ks = ["disabled"], ws = ["disabled"], Is = { class: "loading-msg" }, bs = { key: 0, class: "queue-debug-card" }, Ss = { key: 0, class: "queue-debug-line" }, Ts = { key: 1, class: "queue-debug-payload" }, Cs = { class: "right-panel" }, Fs = { class: "task-list-wrap" }, Es = { class: "clean-result-summary" }, Ps = { class: "summary-card" }, Rs = { class: "summary-card" }, xs = { class: "summary-card" }, Ns = { class: "result-list-wrap" }, $s = { key: 0, class: "empty-tasks" }, As = { key: 0, class: "result-subsection" }, Ds = { class: "task-list clean-result-list" }, Ms = { class: "left split-result-main" }, Bs = ["title"], qs = { class: "files" }, Us = { class: "files" }, Ls = { key: 0, class: "files" }, Os = { key: 1, class: "files" }, Ks = { key: 2, class: "files" }, Hs = { key: 3, class: "time" }, Js = { key: 4, class: "delete-brand-progress-block" }, Gs = { class: "delete-brand-progress-header" }, js = { class: "delete-brand-progress-bar" }, zs = { class: "files delete-brand-progress" }, Vs = { key: 5, class: "files split-entry-list delete-brand-preview" }, Qs = { key: 6, class: "files" }, Xs = { class: "task-right split-result-actions" }, Ws = ["onClick"], Ys = ["onClick"], Zs = { key: 1, class: "result-subsection" }, et = { class: "task-list clean-result-list" }, st = { class: "left split-result-main" }, tt = ["title"], nt = { class: "files" }, at = { class: "files" }, lt = { key: 0, class: "files" }, rt = { key: 1, class: "files" }, ot = { key: 2, class: "time" }, ut = { key: 3, class: "delete-brand-progress-block" }, it = { class: "delete-brand-progress-header" }, ct = { class: "delete-brand-progress-bar" }, dt = { class: "files delete-brand-progress" }, ft = { key: 4, class: "files split-entry-list delete-brand-preview" }, vt = { key: 5, class: "files" }, ht = { class: "task-right split-result-actions" }, pt = ["onClick"], _t = ["onClick"], yt = We({ __name: "BrandDeleteBrandTab", setup(mt) { function N() { return `delete-brand:current-tasks:${typeof window < "u" && window.localStorage.getItem("uid") || "0"}` } const $ = y([]), j = y([]), B = y(!1), fe = y([]), i = y([]), q = y([]), z = y({ total: 0, successCount: 0, failedCount: 0, items: [] }), b = y(""), S = y(""), g = y({}), T = y(null), ee = y(!1), V = y(!1), A = y(!1), D = y(""), Q = y(!1), U = y(null), se = J(() => $.value.slice(0, 10)), F = J(() => { const e = []; return i.value.forEach(s => { e.push(...s.items) }), e }); function Me() { try { const e = typeof window < "u" ? window.localStorage.getItem(N()) : null; if (e) { if (i.value = JSON.parse(e), i.value.length > 0) { const s = i.value[i.value.length - 1]; b.value = s.queuePushResult || "", S.value = s.queuePayloadText || "" } } else i.value = [] } catch { i.value = [] } } function te(e, s, t, n) { if (!s?.length) return; const a = i.value.findIndex(c => c.taskId === e), o = a >= 0 ? i.value[a] : null, r = s.map(c => { const _ = o?.items.find(Xe => M(Xe, c)), k = Array.isArray(c.countries) ? c.countries : void 0, m = Array.isArray(_?.countries) ? _?.countries : void 0, w = k && k.length > 0 ? k : m && m.length > 0 ? m : k ?? m, I = Array.isArray(c.previewRows) ? c.previewRows : void 0, C = Array.isArray(_?.previewRows) ? _?.previewRows : void 0, ce = I && I.length > 0 ? I : C && C.length > 0 ? C : I ?? C; return { ...c, countries: w, previewRows: ce, _pushed: _?._pushed ?? c._pushed ?? !1, _completed: _?._completed ?? c._completed ?? !1 } }), u = { taskId: e, items: r, createdAt: o?.createdAt || Date.now(), queuePushResult: t ?? o?.queuePushResult, queuePayloadText: n ?? o?.queuePayloadText }; a >= 0 ? i.value[a] = u : i.value.push(u), typeof window < "u" && window.localStorage.setItem(N(), JSON.stringify(i.value)) } function ve(e) { const s = i.value.length; i.value = i.value.filter(t => t.taskId !== e), i.value.length !== s && typeof window < "u" && window.localStorage.setItem(N(), JSON.stringify(i.value)) } function he(e) { return e === "SUCCESS" || e === "FAILED" || e === "COMPLETED" } function Be(e) { if (!e?.length) return !1; const s = new Set; if (e.forEach(n => { n.taskId && he(n.taskStatus) && s.add(n.taskId) }), !s.size) return !1; const t = i.value.length; return i.value = i.value.filter(n => !s.has(n.taskId)), i.value.length !== t ? (ne(), !0) : !1 } const X = J(() => q.value.filter(e => !F.value.some(s => M(s, e)))), qe = J(() => F.value.length > 0 || X.value.length > 0), Ue = J(() => F.value.filter(e => Re(e) && E(e) === "未入队")); function ne() { typeof window < "u" && (i.value.length === 0 ? window.localStorage.removeItem(N()) : window.localStorage.setItem(N(), JSON.stringify(i.value))) } function P(e) { return e ? (i.value.find(t => t.taskId === e)?.items.length || 0) > 1 : !1 } function ae(e) { return e && i.value.find(s => s.taskId === e) || null } function M(e, s) { return !e || !s ? !1 : e.resultId != null && s.resultId != null ? e.resultId === s.resultId : e.fileKey && s.fileKey ? e.fileKey === s.fileKey : e.sourceFilename === s.sourceFilename } function R(e, s) { const t = ae(e); return t && t.items.find(n => M(n, s)) || null } function pe(e) { if (!e) return !1; const s = ae(e); if (!s) return !1; let t = !1; const n = g.value[e]?.line_progress?.info, a = P(e); if (n?.file_name && n.current_line != null && n.total_lines != null && n.total_lines > 0 && n.current_line >= n.total_lines) { const o = s.items.find(r => r.sourceFilename === n.file_name); o && !o._completed && (o._completed = !0, t = !0) } if (!a) { const o = g.value[e]?.task?.status; if ((o === "SUCCESS" || o === "FAILED") && s.items.length === 1) { const r = s.items[0]; r && !r._completed && (r._completed = !0, t = !0) } } return t && ne(), t } function _e(e) { return e && g.value[e]?.task?.status || "" } function W(e) { if (e.error) return e.error; if (e.matchStatus && e.matchStatus !== "MATCHED") return e.matchMessage || ""; const s = e.taskId; return s && g.value[s]?.task?.errorMessage || "" } function ye(e) { const s = e.taskId; if (!s) return !1; const t = g.value[s]?.line_progress, n = _e(s), a = P(s), o = E(e); if (a) { const r = R(s, e), u = K(e) === D.value, c = !!(t?.has_progress && t?.info?.file_name === e.sourceFilename); return u || c || r?._pushed || (n === "RUNNING" || n === "PENDING" || !n) && r?._completed ? !0 : { success: !1, retryable: !0 } } return o === "本文件解析完毕" || o === "已被全局判定为终态" ? !1 : t?.has_progress || t?.info ? !0 : o === "已入队" || o === "处理中" } function ge(e) { return e.map(s => s.matchStatus === "MATCHED" ? { ...s, _pushed: !1, _completed: !1 } : { ...s, matched: !1, openStoreUrl: void 0, error: s.error || void 0, _pushed: !1, _completed: !1 }) } function me(e) { return e.matchStatus === "MATCHED" ? `已匹配 ${e.shopId || ""}`.trim() : e.matchMessage ? e.matchMessage : e.matchStatus === "CONFLICT" ? "存在多个同名店铺，请人工确认" : e.matchStatus === "PENDING" || e.matchStatus === "INDEX_STALE" ? "店铺索引暂未就绪" : e.matchStatus ? e.matchStatus : e.matched ? `已匹配 ${e.shopId || ""}`.trim() : "待匹配" } function Le() { fe.value = [...F.value, ...X.value] } function x() { Le(), Oe(fe.value) } function Oe(e) { z.value = { total: e.length, successCount: e.filter(s => s.success).length, failedCount: e.filter(s => !s.success).length, items: e } } function le(e) { const s = e.taskId; return s && (g.value[s]?.fileProgress || []).find(a => a.fileKey && e.fileKey ? a.fileKey === e.fileKey : a.sourceFilename && e.sourceFilename ? a.sourceFilename === e.sourceFilename : !1) || null } function ke(e) { const s = e.taskId; if (!s) return ""; const t = g.value[s], n = t?.line_progress?.info, a = le(e); if (P(s)) { const u = R(s, e), c = t?.task?.status, _ = !!(n?.file_name && n.file_name === e.sourceFilename); let k = u?._completed ? "COMPLETED" : (u?._pushed, "PENDING"), m = 0, w = Math.max(0, e.totalRows ?? a?.totalRows ?? 0); c === "SUCCESS" || c === "FAILED" && u?._completed ? (k = "COMPLETED", m = w) : _ ? (k = "RUNNING", m = Math.max(0, Math.min(w || Number.MAX_SAFE_INTEGER, n?.current_line ?? 0)), !w && n?.total_lines && n.total_lines > 0 && (w = n.total_lines)) : u?._completed ? (k = "COMPLETED", m = w) : u?._pushed && (k = "PENDING", m = 0); const I = []; if (I.push(`文件状态：${k}`), I.push(`文件进度：${m}/${w}`), n?.finished_files != null) { const C = n.file_total && n.file_total > 0 ? `/${n.file_total}` : ""; I.push(`已完成文件：${n.finished_files}${C}`) } return n?.phase && I.push(`阶段：${n.phase}`), I.join("｜") } if (a) { const u = [], c = a.processedRows ?? 0, _ = a.totalRows ?? 0; if (a.status && u.push(`文件状态：${a.status}`), u.push(`文件进度：${c}/${_}`), n?.finished_files != null) { const k = n.file_total && n.file_total > 0 ? `/${n.file_total}` : ""; u.push(`已完成文件：${n.finished_files}${k}`) } return n?.phase && u.push(`阶段：${n.phase}`), u.join("｜") } if (!t?.line_progress?.has_progress || !n) { const u = t?.task?.status; return u ? `任务状态：${u}` : "" } const r = []; if (n.phase && r.push(`阶段：${n.phase}`), n.file_index && n.file_total && r.push(`文件：${n.file_index}/${n.file_total}`), n.file_name && r.push(`当前文件：${n.file_name}`), n.current_line != null && n.total_lines != null && r.push(`${P(s) ? "当前文件进度" : "进度"}：${n.current_line}/${n.total_lines}`), n.current_country && r.push(`国家：${n.current_country}`), n.current_asin && r.push(`ASIN：${n.current_asin}`), n.finished_files != null) { const u = n.file_total && n.file_total > 0 ? `/${n.file_total}` : ""; r.push(`已完成文件：${n.finished_files}${u}`) } return r.join("｜") } function Y(e) { const s = e.taskId; if (!s) return 0; const t = g.value[s]?.line_progress?.info; if (P(s)) { const r = R(s, e); if (g.value[s]?.task?.status === "SUCCESS" || r?._completed) return 100; const c = Math.max(0, e.totalRows ?? le(e)?.totalRows ?? 0); if (!!(t?.file_name && t.file_name === e.sourceFilename)) { if (t?.current_line != null && t?.total_lines && t.total_lines > 0) return Math.max(0, Math.min(100, Math.round(t.current_line / t.total_lines * 100))); if (t?.current_line != null && c > 0) return Math.max(0, Math.min(100, Math.round(t.current_line / c * 100))) } return 0 } const a = le(e); return a ? Math.max(0, Math.min(100, a.percent ?? 0)) : t ? t.current_line != null && t.total_lines && t.total_lines > 0 ? Math.max(0, Math.min(100, Math.round(t.current_line / t.total_lines * 100))) : t.finished_files != null && t.file_total && t.file_total > 0 ? Math.max(0, Math.min(100, Math.round(t.finished_files / t.file_total * 100))) : g.value[s]?.task?.status === "SUCCESS" ? 100 : 0 : 0 } function we(e) { const s = g.value[e]?.task?.status; return he(s) } function L() { const e = new Set; return i.value.forEach(s => { s.items.some(t => t._pushed) && e.add(s.taskId) }), Array.from(e) } function E(e) { const s = e.taskId; if (!s || !ae(s)) return ""; const n = R(s, e), a = _e(s), o = g.value[s]?.line_progress, r = P(s); if (!r && (a === "SUCCESS" || a === "FAILED" || e.taskStatus === "SUCCESS" || e.taskStatus === "FAILED")) return "已被全局判定为终态"; if (n?._completed) return "本文件解析完毕"; if (a === "RUNNING" && o?.has_progress && o?.info?.file_name === e.sourceFilename) return "处理中"; if (r && !n?._pushed && !n?._completed) return "未入队"; if (r && a === "SUCCESS") return "本文件解析完毕"; if (!r) { const u = g.value[s]; if (u?.items && u.items.find(_ => M(_, e)) && a === "SUCCESS") return "本文件解析完毕" } return n?._pushed ? "已入队" : "未入队" } function Ie(e) { if (e.downloadUrl) return !0; const s = e.taskId; return s ? g.value[s]?.task?.status === "SUCCESS" : { success: !1, retryable: !1 } } function Ke(e) { const s = e?.task?.id; if (!s) return !1; const t = i.value.find(r => r.taskId === s); if (!t) return { success: !1, retryable: !1 }; const n = e?.items || []; let a = !1; const o = t.items.map(r => { const u = n.find(ce => M(ce, r)); if (!u) return r; const c = Array.isArray(u.countries) ? u.countries : void 0, _ = Array.isArray(r.countries) ? r.countries : void 0, k = c && c.length > 0 ? c : _ && _.length > 0 ? _ : c ?? _, m = Array.isArray(u.previewRows) ? u.previewRows : void 0, w = Array.isArray(r.previewRows) ? r.previewRows : void 0, I = m && m.length > 0 ? m : w && w.length > 0 ? w : m ?? w, C = { ...r, ...u, countries: k, previewRows: I, _pushed: r._pushed, _completed: r._completed }; return JSON.stringify(C) !== JSON.stringify(r) && (a = !0), C }); for (const r of n) o.some(u => M(u, r)) || (o.push({ ...r, _pushed: !1, _completed: !1 }), a = !0); return JSON.stringify(o) !== JSON.stringify(t.items) && (t.items = o, a = !0), a && ne(), a } async function re(e) { const s = e || L(); if (s.length) try { const t = await ns(s); let n = !1; for (const a of t.items || []) { const o = a?.task?.id; typeof o == "number" && o > 0 && (g.value[o] = a, Ke(a) && (n = !0), pe(o) && (n = !0)) } n && x() } catch { } } function He() { return document.visibilityState === "visible" ? 4500 : 1e4 } function oe(e = !1) { if (T.value) { if (!e) return; clearTimeout(T.value), T.value = null } const s = async () => { if (T.value = null, ee.value) { oe(); return } const t = L(); if (!t.length) return; ee.value = !0; let n = !1, a = !1; try { await re(t), await $e(); for (const o of t) we(o) && (ve(o), n = !0, a = !0) } finally { ee.value = !1 } a ? await O() : n && x(), L().length > 0 && oe() }; e ? s() : T.value = window.setTimeout(s, He()) } function ue(e = !1) { T.value && !e || oe(e) } function Z(e) { const s = e.taskId ? g.value[e.taskId]?.task?.status : null; return s === "SUCCESS" ? { className: "success", text: "已完成" } : s === "FAILED" ? { className: "failed", text: "失败" } : s === "RUNNING" ? { className: "running", text: "执行中" } : e.taskStatus === "SUCCESS" ? { className: "success", text: "已完成" } : e.taskStatus === "FAILED" ? { className: "failed", text: "失败" } : e.taskStatus === "RUNNING" ? { className: "running", text: "执行中" } : e.success ? { className: "success", text: "已完成" } : { className: "failed", text: "失败" } } function be() { T.value && (window.clearTimeout(T.value), T.value = null), ie() } async function Se(e) { const s = G(); if (!s?.upload_file_to_java) throw new Error("当前桌面端未提供文件上传桥接能力"); const t = []; for (const n of e) { const a = typeof n == "string" ? n : n.absolutePath, o = typeof n == "string" ? void 0 : n.relativePath, r = await s.upload_file_to_java(a, o); if (!r?.success || !r.data) throw new Error(r?.error || r?.message || `上传失败：${a}`); t.push(r.data) } return t } async function Je() { const e = G(); if (!e?.select_brand_xlsx_files) { p.warning("当前环境不支持文件选择，请在本机客户端中打开"); return } try { const s = await e.select_brand_xlsx_files(); if (!s?.length) return; $.value = s, j.value = await Se(s), p.success(`已选择 ${s.length} 个删除品牌文件`) } catch (s) { p.error(s instanceof Error ? s.message : "选择失败") } } async function Ge() { const e = G(); if (!e?.select_brand_folder) { p.warning("当前环境不支持文件夹选择，请在本机客户端中打开"); return } try { const s = await e.select_brand_folder(); if (!s) return; const t = await ds(s); if (!t.success || !t.items?.length) { p.warning(t.error || "该文件夹下没有 xlsx 文件"); return } $.value = t.items.map(n => n.relativePath || n.absolutePath), j.value = await Se(t.items), p.success(`已选择文件夹内 ${t.items.length} 个 xlsx 文件`) } catch (s) { p.error(s instanceof Error ? s.message : "选择失败") } } async function je() { if (!j.value.length) { p.warning("请先选择待处理文件"); return } try { B.value = !0; const e = await as({ files: j.value.map(a => ({ fileKey: a.fileKey, originalFilename: a.originalFilename, relativePath: a.relativePath })) }), s = ge(e.items || []), t = s.some(a => a.matchStatus === "MATCHED"), n = s.some(a => a.matchStatus && a.matchStatus !== "MATCHED"); b.value = t ? "解析完成，可在左侧点击“推送到 Python 队列”开始串行处理" : "解析完成，当前没有可推送的已匹配文件", S.value = "", s.length && s[0].taskId && te(s[0].taskId, s, b.value, S.value), x(), n ? p.warning("部分文件尚未命中可用店铺索引，已保留状态信息，请等待后台刷新后重试。") : t ? p.success("删除品牌解析完成，请在左侧推送到 Python 队列") : p.warning("当前没有可推送的已匹配文件，请先等待店铺索引刷新。"), await O() } catch (e) { p.error(e instanceof Error ? e.message : "执行失败") } finally { B.value = !1 } } async function Te(e) { const s = e.taskId; if (!s) { p.warning("未找到任务ID"); return } const t = G(), n = ls(s), a = e.outputFilename || e.sourceFilename || `delete-brand_${s}.xlsx`; if (t?.save_file_from_url_new) { const o = await t.save_file_from_url_new(n, a); o.success ? p.success(`已保存：${o.path || a}`) : o.error && o.error !== "用户取消" && p.error(o.error); return } } async function O() { try { const e = await rs(); q.value = ge(e.items || []), Be(q.value), x(), await re(), ue(!0) } catch (e) { console.error("loadHistory error:", e) } } function Ce(e) { i.value.forEach(t => { t.items = t.items.filter(n => n.resultId !== e) }); const s = i.value.length; i.value = i.value.filter(t => t.items.length > 0), i.value.length !== s && typeof window < "u" && window.localStorage.setItem(N(), JSON.stringify(i.value)), q.value = q.value.filter(t => t.resultId !== e), x(), L().length === 0 && be() } async function Fe(e) { try { await os(e), Ce(e), await O(), p.success("已删除") } catch (s) { const t = s instanceof Error ? s.message : "删除失败"; if (typeof t == "string" && t.includes("记录不存在")) { Ce(e), p.success("已删除"); return } p.error(t) } } function Ee(e) { const s = e.slice(0, 5).map(n => `${n.country}:${n.asin}${n.status ? `（${n.status}）` : ""}`); return e.length - s.length > 0 ? `${s.join("、")} 等 ${e.length} 条` : s.join("、") } function kt(e, s) { } function ie() { U.value && (window.clearTimeout(U.value), U.value = null) } function ze(e = 3e3) { ie(), U.value = window.setTimeout(() => { U.value = null, $e().catch(() => { }) }, e) } function Ve(e) { return e.includes("当前店铺正在执行中") } function Pe() { for (const e of i.value) for (const s of e.items) { const t = E(s); if (t === "已入队" || t === "处理中") return !0 } return !1 } function K(e) { return e.resultId != null ? `result:${e.resultId}` : `task:${e.taskId || 0}:${e.sourceFilename || ""}` } function Re(e) { return !!(e.taskId && (e.matchStatus === "MATCHED" || e.matched)) } function xe() { return F.value.find(e => !Re(e) || K(e) === D.value || R(e.taskId, e)?._completed ? !1 : E(e) === "未入队") } async function Ne(e, s) { if (s?.auto && Pe()) return e.taskId, e.sourceFilename, { success: !1, retryable: !0 }; const t = G(), n = e.taskId; if (!n) return { success: !1, retryable: !1 }; const a = i.value.find(c => c.taskId === n); if (!a) return { success: !1, retryable: !1 }; if (!t?.enqueue_json) return p.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）"), { success: !1, retryable: !1 }; const o = { type: "delete-brand-run", ts: Date.now(), data: { taskId: n, items: [e] } }; S.value = JSON.stringify(o, null, 2); const r = await t.enqueue_json(o); let u = ""; if (r?.success) { u = `已推送文件 ${e.sourceFilename}，当前队列长度：${r.queue_size ?? "-"}`; const c = R(n, e); return c && (c._pushed = !0, c._completed = !1), D.value = K(e), te(n, a.items, u, S.value), ue(!0), b.value = u, { success: !0, retryable: !1 } } else { const c = r?.error || "未知错误"; if (u = `推送到 Python 队列失败：${c}`, b.value = u, te(n, a.items, u, S.value), s?.auto && Ve(c)) return { success: !1, retryable: !0 } } return b.value = u, { success: !1, retryable: !1 } } async function Qe() { const e = xe(); if (!e) { p.warning("当前没有可推送的已匹配文件"); return } V.value = !0, A.value = !0, ie(); const s = await Ne(e); if (V.value = !1, !s.success) { A.value = !1, D.value = ""; return } p.success("已开始按顺序推送到 Python 队列") } async function $e() { if (!A.value || Q.value) { A.value, Q.value; return } if (Pe()) return; const e = D.value; if (e) { const t = F.value.find(n => K(n) === e); if (t) { const n = t.taskId, a = P(n); a && (pe(n), E(t), void 0); const o = E(t); if (o === "已入队" || o === "处理中") { t.sourceFilename; return } if (a) { const r = R(n, t); if (r && !r._completed) { t.sourceFilename, r._pushed, r._completed; return } } } } const s = xe(); if (!s) { D.value = "", A.value = !1; return } Q.value = !0; try { s.taskId, s.sourceFilename, K(s); const t = await Ne(s, { auto: !0 }); if (!t.success) { if (t.retryable) { s.taskId, s.sourceFilename, ze(); return } s.taskId, s.sourceFilename, A.value = !1 } } finally { Q.value = !1 } } return Ye(() => { Me(); const e = L(); e.length > 0 ? re(e).then(async () => { let s = !1, t = !1; for (const n of e) we(n) && (ve(n), s = !0, t = !0); t ? await O() : s && x(), ue(!0) }) : x(), O().catch(() => { }) }), Ze(() => { be() }), (e, s) => (d(), f("div", fs, [es(ss, { active: "delete-brand" }), l("div", vs, [l("aside", hs, [s[2] || (s[2] = l("div", { class: "section-title" }, "选择文件", -1)), l("div", ps, [s[0] || (s[0] = l("div", { class: "hint" }, "上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。", -1)), l("div", { class: "btns" }, [l("button", { type: "button", class: "opt-btn", onClick: Je }, "选择 Excel 文件"), l("button", { type: "button", class: "opt-btn", onClick: Ge }, "选择文件夹")]), l("div", _s, [$.value.length ? (d(), f(H, { key: 0 }, [(d(!0), f(H, null, de(se.value, t => (d(), f("span", { key: t }, v(t), 1))), 128)), $.value.length > se.value.length ? (d(), f("span", ys, " 还有 " + v($.value.length - se.value.length) + " 个文件未展开显示 ", 1)) : h("", !0)], 64)) : (d(), f("span", gs, "暂未选择删除品牌文件"))])]), s[3] || (s[3] = ts('

执行说明
', 2)), l("div", ms, [l("button", { type: "button", class: "btn-run", disabled: B.value, onClick: je }, v(B.value ? "解析中..." : "开始解析"), 9, ks), l("button", { type: "button", class: "btn-run btn-queue", disabled: V.value || !Ue.value.length, onClick: Qe }, v(V.value ? "推送中..." : "推送到 Python 队列"), 9, ws), l("span", Is, v(B.value ? "正在读取删除品牌数据，请稍候…" : "解析后会在右侧展示按国家分组的去重结果"), 1)]), b.value || S.value ? (d(), f("div", bs, [s[1] || (s[1] = l("div", { class: "section-title queue-debug-title" }, "Python 队列推送结果", -1)), b.value ? (d(), f("div", Ss, v(b.value), 1)) : h("", !0), S.value ? (d(), f("pre", Ts, v(S.value), 1)) : h("", !0)])) : h("", !0)]), l("section", Cs, [s[12] || (s[12] = l("div", { class: "panel-header" }, "删除品牌结果", -1)), l("div", Fs, [l("div", Es, [l("div", Ps, [s[4] || (s[4] = l("span", { class: "summary-label" }, "已处理文件", -1)), l("strong", null, v(z.value.total), 1)]), l("div", Rs, [s[5] || (s[5] = l("span", { class: "summary-label" }, "成功结果", -1)), l("strong", null, v(z.value.successCount), 1)]), l("div", xs, [s[6] || (s[6] = l("span", { class: "summary-label" }, "失败文件", -1)), l("strong", null, v(z.value.failedCount), 1)])]), l("div", Ns, [s[11] || (s[11] = l("div", { class: "result-list-header" }, [l("span", null, "删除品牌结果列表")], -1)), qe.value ? (d(), f(H, { key: 1 }, [F.value.length ? (d(), f("div", As, [s[8] || (s[8] = l("div", { class: "result-subsection-title" }, "当前任务", -1)), l("ul", Ds, [(d(!0), f(H, null, de(F.value, t => (d(), f("li", { key: `current-${t.taskId || t.resultId || t.sourceFilename}`, class: "task-item split-result-item" }, [l("div", Ms, [l("span", { class: "id", title: t.sourceFilename }, v(t.sourceFilename || "-"), 9, Bs), l("div", qs, "店铺名：" + v(t.shopName || "-"), 1), l("div", Us, "匹配结果：" + v(me(t)), 1), t.platform ? (d(), f("div", Ls, "平台：" + v(t.platform), 1)) : h("", !0), E(t) ? (d(), f("div", Os, "队列状态：" + v(E(t)), 1)) : h("", !0), t.countryCount !== void 0 && t.matched ? (d(), f("div", Ks, "国家数：" + v(t.countryCount), 1)) : h("", !0), t.totalRows !== void 0 && t.matched ? (d(), f("div", Hs, "去重后 " + v(t.totalRows) + " 条 ", 1)) : h("", !0), ye(t) ? (d(), f("div", Js, [l("div", Gs, [s[7] || (s[7] = l("span", null, "任务进度", -1)), l("span", null, v(Y(t)) + "%", 1)]), l("div", js, [l("div", { class: "delete-brand-progress-bar-fill", style: Ae({ width: `${Y(t)}%` }) }, null, 4)]), l("div", zs, v(ke(t)), 1)])) : h("", !0), t.previewRows?.length ? (d(), f("div", Vs, v(Ee(t.previewRows)), 1)) : h("", !0), W(t) ? (d(), f("div", Qs, "错误信息：" + v(W(t)), 1)) : h("", !0)]), l("div", Xs, [l("span", { class: De(["status", Z(t).className]) }, v(Z(t).text), 3), Ie(t) ? (d(), f("button", { key: 0, type: "button", class: "download", onClick: n => Te(t) }, " 下载 ", 8, Ws)) : h("", !0), t.resultId ? (d(), f("button", { key: 1, type: "button", class: "btn-delete", onClick: n => Fe(t.resultId) }, " 删除 ", 8, Ys)) : h("", !0)])]))), 128))])])) : h("", !0), X.value.length ? (d(), f("div", Zs, [s[10] || (s[10] = l("div", { class: "result-subsection-title" }, "历史记录", -1)), l("ul", et, [(d(!0), f(H, null, de(X.value, t => (d(), f("li", { key: `history-${t.taskId || t.resultId || t.sourceFilename}`, class: "task-item split-result-item" }, [l("div", st, [l("span", { class: "id", title: t.sourceFilename }, v(t.sourceFilename || "-"), 9, tt), l("div", nt, "店铺名：" + v(t.shopName || "-"), 1), l("div", at, "匹配结果：" + v(me(t)), 1), t.platform ? (d(), f("div", lt, "平台：" + v(t.platform), 1)) : h("", !0), t.countryCount !== void 0 && t.matched ? (d(), f("div", rt, "国家数：" + v(t.countryCount), 1)) : h("", !0), t.totalRows !== void 0 && t.matched ? (d(), f("div", ot, "去重后 " + v(t.totalRows) + " 条 ", 1)) : h("", !0), ye(t) ? (d(), f("div", ut, [l("div", it, [s[9] || (s[9] = l("span", null, "任务进度", -1)), l("span", null, v(Y(t)) + "%", 1)]), l("div", ct, [l("div", { class: "delete-brand-progress-bar-fill", style: Ae({ width: `${Y(t)}%` }) }, null, 4)]), l("div", dt, v(ke(t)), 1)])) : h("", !0), t.previewRows?.length ? (d(), f("div", ft, v(Ee(t.previewRows)), 1)) : h("", !0), W(t) ? (d(), f("div", vt, "错误信息：" + v(W(t)), 1)) : h("", !0)]), l("div", ht, [l("span", { class: De(["status", Z(t).className]) }, v(Z(t).text), 3), Ie(t) ? (d(), f("button", { key: 0, type: "button", class: "download", onClick: n => Te(t) }, " 下载 ", 8, pt)) : h("", !0), t.resultId ? (d(), f("button", { key: 1, type: "button", class: "btn-delete", onClick: n => Fe(t.resultId) }, " 删除 ", 8, _t)) : h("", !0)])]))), 128))])])) : h("", !0)], 64)) : (d(), f("div", $s, " 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])])) } }), gt = us(yt, [["__scopeId", "data-v-04852f65"]]); is(gt).use(cs).mount("#app"); +import{d as We,o as Ye,I as Ze,a as d,c as f,b as es,B as ss,e as l,F as H,r as de,t as v,f as h,J as ts,K as Ae,n as De,g as y,h as J,L as ns,i as G,E as p,M as as,N as ls,O as rs,P as os,_ as us,p as is,q as cs}from"./pywebview-D808cNhy.js";import{e as ds}from"./brand-DRn3N4FA.js";const fs={class:"page-shell module-page"},vs={class:"main-content"},hs={class:"left-panel"},ps={class:"upload-zone"},_s={class:"selected-files clean-placeholder split-selected-files"},ys={key:0,class:"more-line"},gs={key:1},ms={class:"run-row"},ks=["disabled"],ws=["disabled"],Is={class:"loading-msg"},bs={key:0,class:"queue-debug-card"},Ss={key:0,class:"queue-debug-line"},Ts={key:1,class:"queue-debug-payload"},Cs={class:"right-panel"},Fs={class:"task-list-wrap"},Es={class:"clean-result-summary"},Ps={class:"summary-card"},Rs={class:"summary-card"},xs={class:"summary-card"},Ns={class:"result-list-wrap"},$s={key:0,class:"empty-tasks"},As={key:0,class:"result-subsection"},Ds={class:"task-list clean-result-list"},Ms={class:"left split-result-main"},Bs=["title"],qs={class:"files"},Us={class:"files"},Ls={key:0,class:"files"},Os={key:1,class:"files"},Ks={key:2,class:"files"},Hs={key:3,class:"time"},Js={key:4,class:"delete-brand-progress-block"},Gs={class:"delete-brand-progress-header"},js={class:"delete-brand-progress-bar"},zs={class:"files delete-brand-progress"},Vs={key:5,class:"files split-entry-list delete-brand-preview"},Qs={key:6,class:"files"},Xs={class:"task-right split-result-actions"},Ws=["onClick"],Ys=["onClick"],Zs={key:1,class:"result-subsection"},et={class:"task-list clean-result-list"},st={class:"left split-result-main"},tt=["title"],nt={class:"files"},at={class:"files"},lt={key:0,class:"files"},rt={key:1,class:"files"},ot={key:2,class:"time"},ut={key:3,class:"delete-brand-progress-block"},it={class:"delete-brand-progress-header"},ct={class:"delete-brand-progress-bar"},dt={class:"files delete-brand-progress"},ft={key:4,class:"files split-entry-list delete-brand-preview"},vt={key:5,class:"files"},ht={class:"task-right split-result-actions"},pt=["onClick"],_t=["onClick"],yt=We({__name:"BrandDeleteBrandTab",setup(mt){function N(){return`delete-brand:current-tasks:${typeof window<"u"&&window.localStorage.getItem("uid")||"0"}`}const $=y([]),j=y([]),B=y(!1),fe=y([]),i=y([]),q=y([]),z=y({total:0,successCount:0,failedCount:0,items:[]}),b=y(""),S=y(""),g=y({}),T=y(null),ee=y(!1),V=y(!1),A=y(!1),D=y(""),Q=y(!1),U=y(null),se=J(()=>$.value.slice(0,10)),F=J(()=>{const e=[];return i.value.forEach(s=>{e.push(...s.items)}),e});function Me(){try{const e=typeof window<"u"?window.localStorage.getItem(N()):null;if(e){if(i.value=JSON.parse(e),i.value.length>0){const s=i.value[i.value.length-1];b.value=s.queuePushResult||"",S.value=s.queuePayloadText||""}}else i.value=[]}catch{i.value=[]}}function te(e,s,t,n){if(!s?.length)return;const a=i.value.findIndex(c=>c.taskId===e),o=a>=0?i.value[a]:null,r=s.map(c=>{const _=o?.items.find(Xe=>M(Xe,c)),k=Array.isArray(c.countries)?c.countries:void 0,m=Array.isArray(_?.countries)?_?.countries:void 0,w=k&&k.length>0?k:m&&m.length>0?m:k??m,I=Array.isArray(c.previewRows)?c.previewRows:void 0,C=Array.isArray(_?.previewRows)?_?.previewRows:void 0,ce=I&&I.length>0?I:C&&C.length>0?C:I??C;return{...c,countries:w,previewRows:ce,_pushed:_?._pushed??c._pushed??!1,_completed:_?._completed??c._completed??!1}}),u={taskId:e,items:r,createdAt:o?.createdAt||Date.now(),queuePushResult:t??o?.queuePushResult,queuePayloadText:n??o?.queuePayloadText};a>=0?i.value[a]=u:i.value.push(u),typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(i.value))}function ve(e){const s=i.value.length;i.value=i.value.filter(t=>t.taskId!==e),i.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(i.value))}function he(e){return e==="SUCCESS"||e==="FAILED"||e==="COMPLETED"}function Be(e){if(!e?.length)return!1;const s=new Set;if(e.forEach(n=>{n.taskId&&he(n.taskStatus)&&s.add(n.taskId)}),!s.size)return!1;const t=i.value.length;return i.value=i.value.filter(n=>!s.has(n.taskId)),i.value.length!==t?(ne(),!0):!1}const X=J(()=>q.value.filter(e=>!F.value.some(s=>M(s,e)))),qe=J(()=>F.value.length>0||X.value.length>0),Ue=J(()=>F.value.filter(e=>Re(e)&&E(e)==="未入队"));function ne(){typeof window<"u"&&(i.value.length===0?window.localStorage.removeItem(N()):window.localStorage.setItem(N(),JSON.stringify(i.value)))}function P(e){return e?(i.value.find(t=>t.taskId===e)?.items.length||0)>1:!1}function ae(e){return e&&i.value.find(s=>s.taskId===e)||null}function M(e,s){return!e||!s?!1:e.resultId!=null&&s.resultId!=null?e.resultId===s.resultId:e.fileKey&&s.fileKey?e.fileKey===s.fileKey:e.sourceFilename===s.sourceFilename}function R(e,s){const t=ae(e);return t&&t.items.find(n=>M(n,s))||null}function pe(e){if(!e)return!1;const s=ae(e);if(!s)return!1;let t=!1;const n=g.value[e]?.line_progress?.info,a=P(e);if(n?.file_name&&n.current_line!=null&&n.total_lines!=null&&n.total_lines>0&&n.current_line>=n.total_lines){const o=s.items.find(r=>r.sourceFilename===n.file_name);o&&!o._completed&&(o._completed=!0,t=!0)}if(!a){const o=g.value[e]?.task?.status;if((o==="SUCCESS"||o==="FAILED")&&s.items.length===1){const r=s.items[0];r&&!r._completed&&(r._completed=!0,t=!0)}}return t&&ne(),t}function _e(e){return e&&g.value[e]?.task?.status||""}function W(e){if(e.error)return e.error;if(e.matchStatus&&e.matchStatus!=="MATCHED")return e.matchMessage||"";const s=e.taskId;return s&&g.value[s]?.task?.errorMessage||""}function ye(e){const s=e.taskId;if(!s)return!1;const t=g.value[s]?.line_progress,n=_e(s),a=P(s),o=E(e);if(a){const r=R(s,e),u=K(e)===D.value,c=!!(t?.has_progress&&t?.info?.file_name===e.sourceFilename);return u||c||r?._pushed||(n==="RUNNING"||n==="PENDING"||!n)&&r?._completed?!0:{success:!1,retryable:!0}}return o==="本文件解析完毕"||o==="已被全局判定为终态"?!1:t?.has_progress||t?.info?!0:o==="已入队"||o==="处理中"}function ge(e){return e.map(s=>s.matchStatus==="MATCHED"?{...s,_pushed:!1,_completed:!1}:{...s,matched:!1,openStoreUrl:void 0,error:s.error||void 0,_pushed:!1,_completed:!1})}function me(e){return e.matchStatus==="MATCHED"?`已匹配 ${e.shopId||""}`.trim():e.matchMessage?e.matchMessage:e.matchStatus==="CONFLICT"?"存在多个同名店铺，请人工确认":e.matchStatus==="PENDING"||e.matchStatus==="INDEX_STALE"?"店铺索引暂未就绪":e.matchStatus?e.matchStatus:e.matched?`已匹配 ${e.shopId||""}`.trim():"待匹配"}function Le(){fe.value=[...F.value,...X.value]}function x(){Le(),Oe(fe.value)}function Oe(e){z.value={total:e.length,successCount:e.filter(s=>s.success).length,failedCount:e.filter(s=>!s.success).length,items:e}}function le(e){const s=e.taskId;return s&&(g.value[s]?.fileProgress||[]).find(a=>a.fileKey&&e.fileKey?a.fileKey===e.fileKey:a.sourceFilename&&e.sourceFilename?a.sourceFilename===e.sourceFilename:!1)||null}function ke(e){const s=e.taskId;if(!s)return"";const t=g.value[s],n=t?.line_progress?.info,a=le(e);if(P(s)){const u=R(s,e),c=t?.task?.status,_=!!(n?.file_name&&n.file_name===e.sourceFilename);let k=u?._completed?"COMPLETED":(u?._pushed,"PENDING"),m=0,w=Math.max(0,e.totalRows??a?.totalRows??0);c==="SUCCESS"||c==="FAILED"&&u?._completed?(k="COMPLETED",m=w):_?(k="RUNNING",m=Math.max(0,Math.min(w||Number.MAX_SAFE_INTEGER,n?.current_line??0)),!w&&n?.total_lines&&n.total_lines>0&&(w=n.total_lines)):u?._completed?(k="COMPLETED",m=w):u?._pushed&&(k="PENDING",m=0);const I=[];if(I.push(`文件状态：${k}`),I.push(`文件进度：${m}/${w}`),n?.finished_files!=null){const C=n.file_total&&n.file_total>0?`/${n.file_total}`:"";I.push(`已完成文件：${n.finished_files}${C}`)}return n?.phase&&I.push(`阶段：${n.phase}`),I.join("｜")}if(a){const u=[],c=a.processedRows??0,_=a.totalRows??0;if(a.status&&u.push(`文件状态：${a.status}`),u.push(`文件进度：${c}/${_}`),n?.finished_files!=null){const k=n.file_total&&n.file_total>0?`/${n.file_total}`:"";u.push(`已完成文件：${n.finished_files}${k}`)}return n?.phase&&u.push(`阶段：${n.phase}`),u.join("｜")}if(!t?.line_progress?.has_progress||!n){const u=t?.task?.status;return u?`任务状态：${u}`:""}const r=[];if(n.phase&&r.push(`阶段：${n.phase}`),n.file_index&&n.file_total&&r.push(`文件：${n.file_index}/${n.file_total}`),n.file_name&&r.push(`当前文件：${n.file_name}`),n.current_line!=null&&n.total_lines!=null&&r.push(`${P(s)?"当前文件进度":"进度"}：${n.current_line}/${n.total_lines}`),n.current_country&&r.push(`国家：${n.current_country}`),n.current_asin&&r.push(`ASIN：${n.current_asin}`),n.finished_files!=null){const u=n.file_total&&n.file_total>0?`/${n.file_total}`:"";r.push(`已完成文件：${n.finished_files}${u}`)}return r.join("｜")}function Y(e){const s=e.taskId;if(!s)return 0;const t=g.value[s]?.line_progress?.info;if(P(s)){const r=R(s,e);if(g.value[s]?.task?.status==="SUCCESS"||r?._completed)return 100;const c=Math.max(0,e.totalRows??le(e)?.totalRows??0);if(!!(t?.file_name&&t.file_name===e.sourceFilename)){if(t?.current_line!=null&&t?.total_lines&&t.total_lines>0)return Math.max(0,Math.min(100,Math.round(t.current_line/t.total_lines*100)));if(t?.current_line!=null&&c>0)return Math.max(0,Math.min(100,Math.round(t.current_line/c*100)))}return 0}const a=le(e);return a?Math.max(0,Math.min(100,a.percent??0)):t?t.current_line!=null&&t.total_lines&&t.total_lines>0?Math.max(0,Math.min(100,Math.round(t.current_line/t.total_lines*100))):t.finished_files!=null&&t.file_total&&t.file_total>0?Math.max(0,Math.min(100,Math.round(t.finished_files/t.file_total*100))):g.value[s]?.task?.status==="SUCCESS"?100:0:0}function we(e){const s=g.value[e]?.task?.status;return he(s)}function L(){const e=new Set;return i.value.forEach(s=>{s.items.some(t=>t._pushed)&&e.add(s.taskId)}),Array.from(e)}function E(e){const s=e.taskId;if(!s||!ae(s))return"";const n=R(s,e),a=_e(s),o=g.value[s]?.line_progress,r=P(s);if(!r&&(a==="SUCCESS"||a==="FAILED"||e.taskStatus==="SUCCESS"||e.taskStatus==="FAILED"))return"已被全局判定为终态";if(n?._completed)return"本文件解析完毕";if(a==="RUNNING"&&o?.has_progress&&o?.info?.file_name===e.sourceFilename)return"处理中";if(r&&!n?._pushed&&!n?._completed)return"未入队";if(r&&a==="SUCCESS")return"本文件解析完毕";if(!r){const u=g.value[s];if(u?.items&&u.items.find(_=>M(_,e))&&a==="SUCCESS")return"本文件解析完毕"}return n?._pushed?"已入队":"未入队"}function Ie(e){if(e.downloadUrl)return!0;const s=e.taskId;return s?g.value[s]?.task?.status==="SUCCESS":{success:!1,retryable:!1}}function Ke(e){const s=e?.task?.id;if(!s)return!1;const t=i.value.find(r=>r.taskId===s);if(!t)return{success:!1,retryable:!1};const n=e?.items||[];let a=!1;const o=t.items.map(r=>{const u=n.find(ce=>M(ce,r));if(!u)return r;const c=Array.isArray(u.countries)?u.countries:void 0,_=Array.isArray(r.countries)?r.countries:void 0,k=c&&c.length>0?c:_&&_.length>0?_:c??_,m=Array.isArray(u.previewRows)?u.previewRows:void 0,w=Array.isArray(r.previewRows)?r.previewRows:void 0,I=m&&m.length>0?m:w&&w.length>0?w:m??w,C={...r,...u,countries:k,previewRows:I,_pushed:r._pushed,_completed:r._completed};return JSON.stringify(C)!==JSON.stringify(r)&&(a=!0),C});for(const r of n)o.some(u=>M(u,r))||(o.push({...r,_pushed:!1,_completed:!1}),a=!0);return JSON.stringify(o)!==JSON.stringify(t.items)&&(t.items=o,a=!0),a&&ne(),a}async function re(e){const s=e||L();if(s.length)try{const t=await ns(s);let n=!1;for(const a of t.items||[]){const o=a?.task?.id;typeof o=="number"&&o>0&&(g.value[o]=a,Ke(a)&&(n=!0),pe(o)&&(n=!0))}n&&x()}catch{}}function He(){return document.visibilityState==="visible"?4500:1e4}function oe(e=!1){if(T.value){if(!e)return;clearTimeout(T.value),T.value=null}const s=async()=>{if(T.value=null,ee.value){oe();return}const t=L();if(!t.length)return;ee.value=!0;let n=!1,a=!1;try{await re(t),await $e();for(const o of t)we(o)&&(ve(o),n=!0,a=!0)}finally{ee.value=!1}a?await O():n&&x(),L().length>0&&oe()};e?s():T.value=window.setTimeout(s,He())}function ue(e=!1){T.value&&!e||oe(e)}function Z(e){const s=e.taskId?g.value[e.taskId]?.task?.status:null;return s==="SUCCESS"?{className:"success",text:"已完成"}:s==="FAILED"?{className:"failed",text:"失败"}:s==="RUNNING"?{className:"running",text:"执行中"}:e.taskStatus==="SUCCESS"?{className:"success",text:"已完成"}:e.taskStatus==="FAILED"?{className:"failed",text:"失败"}:e.taskStatus==="RUNNING"?{className:"running",text:"执行中"}:e.success?{className:"success",text:"已完成"}:{className:"failed",text:"失败"}}function be(){T.value&&(window.clearTimeout(T.value),T.value=null),ie()}async function Se(e){const s=G();if(!s?.upload_file_to_java)throw new Error("当前桌面端未提供文件上传桥接能力");const t=[];for(const n of e){const a=typeof n=="string"?n:n.absolutePath,o=typeof n=="string"?void 0:n.relativePath,r=await s.upload_file_to_java(a,o);if(!r?.success||!r.data)throw new Error(r?.error||r?.message||`上传失败：${a}`);t.push(r.data)}return t}async function Je(){const e=G();if(!e?.select_brand_xlsx_files){p.warning("当前环境不支持文件选择，请在本机客户端中打开");return}try{const s=await e.select_brand_xlsx_files();if(!s?.length)return;$.value=s,j.value=await Se(s),p.success(`已选择 ${s.length} 个删除品牌文件`)}catch(s){p.error(s instanceof Error?s.message:"选择失败")}}async function Ge(){const e=G();if(!e?.select_brand_folder){p.warning("当前环境不支持文件夹选择，请在本机客户端中打开");return}try{const s=await e.select_brand_folder();if(!s)return;const t=await ds(s);if(!t.success||!t.items?.length){p.warning(t.error||"该文件夹下没有 xlsx 文件");return}$.value=t.items.map(n=>n.relativePath||n.absolutePath),j.value=await Se(t.items),p.success(`已选择文件夹内 ${t.items.length} 个 xlsx 文件`)}catch(s){p.error(s instanceof Error?s.message:"选择失败")}}async function je(){if(!j.value.length){p.warning("请先选择待处理文件");return}try{B.value=!0;const e=await as({files:j.value.map(a=>({fileKey:a.fileKey,originalFilename:a.originalFilename,relativePath:a.relativePath}))}),s=ge(e.items||[]),t=s.some(a=>a.matchStatus==="MATCHED"),n=s.some(a=>a.matchStatus&&a.matchStatus!=="MATCHED");b.value=t?"解析完成，可在左侧点击“推送到 Python 队列”开始串行处理":"解析完成，当前没有可推送的已匹配文件",S.value="",s.length&&s[0].taskId&&te(s[0].taskId,s,b.value,S.value),x(),n?p.warning("部分文件尚未命中可用店铺索引，已保留状态信息，请等待后台刷新后重试。"):t?p.success("删除品牌解析完成，请在左侧推送到 Python 队列"):p.warning("当前没有可推送的已匹配文件，请先等待店铺索引刷新。"),await O()}catch(e){p.error(e instanceof Error?e.message:"执行失败")}finally{B.value=!1}}async function Te(e){const s=e.taskId;if(!s){p.warning("未找到任务ID");return}const t=G(),n=ls(s),a=e.outputFilename||e.sourceFilename||`delete-brand_${s}.xlsx`;if(t?.save_file_from_url_new){const o=await t.save_file_from_url_new(n,a);o.success?p.success(`已保存：${o.path||a}`):o.error&&o.error!=="用户取消"&&p.error(o.error);return}}async function O(){try{const e=await rs();q.value=ge(e.items||[]),Be(q.value),x(),await re(),ue(!0)}catch(e){console.error("loadHistory error:",e)}}function Ce(e){i.value.forEach(t=>{t.items=t.items.filter(n=>n.resultId!==e)});const s=i.value.length;i.value=i.value.filter(t=>t.items.length>0),i.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(N(),JSON.stringify(i.value)),q.value=q.value.filter(t=>t.resultId!==e),x(),L().length===0&&be()}async function Fe(e){try{await os(e),Ce(e),await O(),p.success("已删除")}catch(s){const t=s instanceof Error?s.message:"删除失败";if(typeof t=="string"&&t.includes("记录不存在")){Ce(e),p.success("已删除");return}p.error(t)}}function Ee(e){const s=e.slice(0,5).map(n=>`${n.country}:${n.asin}${n.status?`（${n.status}）`:""}`);return e.length-s.length>0?`${s.join("、")} 等 ${e.length} 条`:s.join("、")}function kt(e,s){}function ie(){U.value&&(window.clearTimeout(U.value),U.value=null)}function ze(e=3e3){ie(),U.value=window.setTimeout(()=>{U.value=null,$e().catch(()=>{})},e)}function Ve(e){return e.includes("当前店铺正在执行中")}function Pe(){for(const e of i.value)for(const s of e.items){const t=E(s);if(t==="已入队"||t==="处理中")return!0}return!1}function K(e){return e.resultId!=null?`result:${e.resultId}`:`task:${e.taskId||0}:${e.sourceFilename||""}`}function Re(e){return!!(e.taskId&&(e.matchStatus==="MATCHED"||e.matched))}function xe(){return F.value.find(e=>!Re(e)||K(e)===D.value||R(e.taskId,e)?._completed?!1:E(e)==="未入队")}async function Ne(e,s){if(s?.auto&&Pe())return e.taskId,e.sourceFilename,{success:!1,retryable:!0};const t=G(),n=e.taskId;if(!n)return{success:!1,retryable:!1};const a=i.value.find(c=>c.taskId===n);if(!a)return{success:!1,retryable:!1};if(!t?.enqueue_json)return p.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）"),{success:!1,retryable:!1};const o={type:"delete-brand-run",ts:Date.now(),data:{taskId:n,items:[e]}};S.value=JSON.stringify(o,null,2);const r=await t.enqueue_json(o);let u="";if(r?.success){u=`已推送文件 ${e.sourceFilename}，当前队列长度：${r.queue_size??"-"}`;const c=R(n,e);return c&&(c._pushed=!0,c._completed=!1),D.value=K(e),te(n,a.items,u,S.value),ue(!0),b.value=u,{success:!0,retryable:!1}}else{const c=r?.error||"未知错误";if(u=`推送到 Python 队列失败：${c}`,b.value=u,te(n,a.items,u,S.value),s?.auto&&Ve(c))return{success:!1,retryable:!0}}return b.value=u,{success:!1,retryable:!1}}async function Qe(){const e=xe();if(!e){p.warning("当前没有可推送的已匹配文件");return}V.value=!0,A.value=!0,ie();const s=await Ne(e);if(V.value=!1,!s.success){A.value=!1,D.value="";return}p.success("已开始按顺序推送到 Python 队列")}async function $e(){if(!A.value||Q.value){A.value,Q.value;return}if(Pe())return;const e=D.value;if(e){const t=F.value.find(n=>K(n)===e);if(t){const n=t.taskId,a=P(n);a&&(pe(n),E(t),void 0);const o=E(t);if(o==="已入队"||o==="处理中"){t.sourceFilename;return}if(a){const r=R(n,t);if(r&&!r._completed){t.sourceFilename,r._pushed,r._completed;return}}}}const s=xe();if(!s){D.value="",A.value=!1;return}Q.value=!0;try{s.taskId,s.sourceFilename,K(s);const t=await Ne(s,{auto:!0});if(!t.success){if(t.retryable){s.taskId,s.sourceFilename,ze();return}s.taskId,s.sourceFilename,A.value=!1}}finally{Q.value=!1}}return Ye(()=>{Me();const e=L();e.length>0?re(e).then(async()=>{let s=!1,t=!1;for(const n of e)we(n)&&(ve(n),s=!0,t=!0);t?await O():s&&x(),ue(!0)}):x(),O().catch(()=>{})}),Ze(()=>{be()}),(e,s)=>(d(),f("div",fs,[es(ss,{active:"delete-brand"}),l("div",vs,[l("aside",hs,[s[2]||(s[2]=l("div",{class:"section-title"},"选择文件",-1)),l("div",ps,[s[0]||(s[0]=l("div",{class:"hint"},"上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。",-1)),l("div",{class:"btns"},[l("button",{type:"button",class:"opt-btn",onClick:Je},"选择 Excel 文件"),l("button",{type:"button",class:"opt-btn",onClick:Ge},"选择文件夹")]),l("div",_s,[$.value.length?(d(),f(H,{key:0},[(d(!0),f(H,null,de(se.value,t=>(d(),f("span",{key:t},v(t),1))),128)),$.value.length>se.value.length?(d(),f("span",ys," 还有 "+v($.value.length-se.value.length)+" 个文件未展开显示 ",1)):h("",!0)],64)):(d(),f("span",gs,"暂未选择删除品牌文件"))])]),s[3]||(s[3]=ts('
执行说明
',2)),l("div",ms,[l("button",{type:"button",class:"btn-run",disabled:B.value,onClick:je},v(B.value?"解析中...":"开始解析"),9,ks),l("button",{type:"button",class:"btn-run btn-queue",disabled:V.value||!Ue.value.length,onClick:Qe},v(V.value?"推送中...":"推送到 Python 队列"),9,ws),l("span",Is,v(B.value?"正在读取删除品牌数据，请稍候…":"解析后会在右侧展示按国家分组的去重结果"),1)]),b.value||S.value?(d(),f("div",bs,[s[1]||(s[1]=l("div",{class:"section-title queue-debug-title"},"Python 队列推送结果",-1)),b.value?(d(),f("div",Ss,v(b.value),1)):h("",!0),S.value?(d(),f("pre",Ts,v(S.value),1)):h("",!0)])):h("",!0)]),l("section",Cs,[s[12]||(s[12]=l("div",{class:"panel-header"},"删除品牌结果",-1)),l("div",Fs,[l("div",Es,[l("div",Ps,[s[4]||(s[4]=l("span",{class:"summary-label"},"已处理文件",-1)),l("strong",null,v(z.value.total),1)]),l("div",Rs,[s[5]||(s[5]=l("span",{class:"summary-label"},"成功结果",-1)),l("strong",null,v(z.value.successCount),1)]),l("div",xs,[s[6]||(s[6]=l("span",{class:"summary-label"},"失败文件",-1)),l("strong",null,v(z.value.failedCount),1)])]),l("div",Ns,[s[11]||(s[11]=l("div",{class:"result-list-header"},[l("span",null,"删除品牌结果列表")],-1)),qe.value?(d(),f(H,{key:1},[F.value.length?(d(),f("div",As,[s[8]||(s[8]=l("div",{class:"result-subsection-title"},"当前任务",-1)),l("ul",Ds,[(d(!0),f(H,null,de(F.value,t=>(d(),f("li",{key:`current-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[l("div",Ms,[l("span",{class:"id",title:t.sourceFilename},v(t.sourceFilename||"-"),9,Bs),l("div",qs,"店铺名："+v(t.shopName||"-"),1),l("div",Us,"匹配结果："+v(me(t)),1),t.platform?(d(),f("div",Ls,"平台："+v(t.platform),1)):h("",!0),E(t)?(d(),f("div",Os,"队列状态："+v(E(t)),1)):h("",!0),t.countryCount!==void 0&&t.matched?(d(),f("div",Ks,"国家数："+v(t.countryCount),1)):h("",!0),t.totalRows!==void 0&&t.matched?(d(),f("div",Hs,"去重后 "+v(t.totalRows)+" 条 ",1)):h("",!0),ye(t)?(d(),f("div",Js,[l("div",Gs,[s[7]||(s[7]=l("span",null,"任务进度",-1)),l("span",null,v(Y(t))+"%",1)]),l("div",js,[l("div",{class:"delete-brand-progress-bar-fill",style:Ae({width:`${Y(t)}%`})},null,4)]),l("div",zs,v(ke(t)),1)])):h("",!0),t.previewRows?.length?(d(),f("div",Vs,v(Ee(t.previewRows)),1)):h("",!0),W(t)?(d(),f("div",Qs,"错误信息："+v(W(t)),1)):h("",!0)]),l("div",Xs,[l("span",{class:De(["status",Z(t).className])},v(Z(t).text),3),Ie(t)?(d(),f("button",{key:0,type:"button",class:"download",onClick:n=>Te(t)}," 下载 ",8,Ws)):h("",!0),t.resultId?(d(),f("button",{key:1,type:"button",class:"btn-delete",onClick:n=>Fe(t.resultId)}," 删除 ",8,Ys)):h("",!0)])]))),128))])])):h("",!0),X.value.length?(d(),f("div",Zs,[s[10]||(s[10]=l("div",{class:"result-subsection-title"},"历史记录",-1)),l("ul",et,[(d(!0),f(H,null,de(X.value,t=>(d(),f("li",{key:`history-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[l("div",st,[l("span",{class:"id",title:t.sourceFilename},v(t.sourceFilename||"-"),9,tt),l("div",nt,"店铺名："+v(t.shopName||"-"),1),l("div",at,"匹配结果："+v(me(t)),1),t.platform?(d(),f("div",lt,"平台："+v(t.platform),1)):h("",!0),t.countryCount!==void 0&&t.matched?(d(),f("div",rt,"国家数："+v(t.countryCount),1)):h("",!0),t.totalRows!==void 0&&t.matched?(d(),f("div",ot,"去重后 "+v(t.totalRows)+" 条 ",1)):h("",!0),ye(t)?(d(),f("div",ut,[l("div",it,[s[9]||(s[9]=l("span",null,"任务进度",-1)),l("span",null,v(Y(t))+"%",1)]),l("div",ct,[l("div",{class:"delete-brand-progress-bar-fill",style:Ae({width:`${Y(t)}%`})},null,4)]),l("div",dt,v(ke(t)),1)])):h("",!0),t.previewRows?.length?(d(),f("div",ft,v(Ee(t.previewRows)),1)):h("",!0),W(t)?(d(),f("div",vt,"错误信息："+v(W(t)),1)):h("",!0)]),l("div",ht,[l("span",{class:De(["status",Z(t).className])},v(Z(t).text),3),Ie(t)?(d(),f("button",{key:0,type:"button",class:"download",onClick:n=>Te(t)}," 下载 ",8,pt)):h("",!0),t.resultId?(d(),f("button",{key:1,type:"button",class:"btn-delete",onClick:n=>Fe(t.resultId)}," 删除 ",8,_t)):h("",!0)])]))),128))])])):h("",!0)],64)):(d(),f("div",$s," 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])]))}}),gt=us(yt,[["__scopeId","data-v-04852f65"]]);is(gt).use(cs).mount("#app"); diff --git a/app/new_web_source/delete-brand.html b/app/new_web_source/delete-brand.html index 0da4abe..e210015 100644 --- a/app/new_web_source/delete-brand.html +++ b/app/new_web_source/delete-brand.html @@ -1,19 +1,16 @@ - - - - - 删除品牌 - 数富AI - - - - - - - - -
- - - \ No newline at end of file + + + + 删除品牌 - 数富AI + + + + + + + +
+ + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java index bf00c99..3645a2e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java @@ -6,12 +6,19 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor @Slf4j public class PermissionMenuSchemaInitializer { private final JdbcTemplate jdbcTemplate; + private static final List DEFAULT_ADMIN_MENUS = List.of( + new DefaultAdminMenu("数据去重总数据", "admin_dedupe_total_data", "dedupe-total-data"), + new DefaultAdminMenu("店铺管理", "admin_shop_manage", "shop-manage"), + new DefaultAdminMenu("跳过跟价ASIN", "admin_skip_price_asin", "skip-price-asin") + ); @PostConstruct public void initialize() { @@ -27,6 +34,7 @@ public class PermissionMenuSchemaInitializer { executeQuietly("ALTER TABLE columns ADD COLUMN menu_type VARCHAR(20) NOT NULL DEFAULT 'app' COMMENT '菜单类型: app/admin' AFTER column_key"); executeQuietly("ALTER TABLE columns ADD COLUMN route_path VARCHAR(255) NOT NULL DEFAULT '' COMMENT '菜单路由或页面标识' AFTER menu_type"); executeQuietly("UPDATE columns SET menu_type = 'app' WHERE menu_type IS NULL OR menu_type = ''"); + ensureDefaultAdminMenus(); executeQuietly(""" INSERT INTO columns (name, column_key, menu_type, route_path) SELECT '店铺管理', 'admin_shop_manage', 'admin', 'shop-manage' @@ -45,6 +53,18 @@ public class PermissionMenuSchemaInitializer { """); } + private void ensureDefaultAdminMenus() { + for (DefaultAdminMenu menu : DEFAULT_ADMIN_MENUS) { + executeQuietly(""" + INSERT INTO columns (name, column_key, menu_type, route_path) + SELECT '%s', '%s', 'admin', '%s' + WHERE NOT EXISTS ( + SELECT 1 FROM columns WHERE column_key = '%s' + ) + """.formatted(menu.name(), menu.columnKey(), menu.routePath(), menu.columnKey())); + } + } + private void executeQuietly(String sql) { try { jdbcTemplate.execute(sql); @@ -52,4 +72,7 @@ public class PermissionMenuSchemaInitializer { log.debug("[permission-menu] schema init skipped: {}", ex.getMessage()); } } + + private record DefaultAdminMenu(String name, String columnKey, String routePath) { + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java new file mode 100644 index 0000000..fadfbe9 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java @@ -0,0 +1,55 @@ +package com.nanri.aiimage.modules.shopkey.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinPageVo; +import com.nanri.aiimage.modules.shopkey.service.SkipPriceAsinService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/admin/skip-price-asins") +@Tag(name = "跳过跟价 ASIN", description = "维护店铺按国家跳过跟价的 ASIN") +public class SkipPriceAsinController { + + private final SkipPriceAsinService skipPriceAsinService; + + @GetMapping + @Operation(summary = "分页查询跳过跟价 ASIN") + public ApiResponse page( + @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page, + @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, + @Parameter(description = "分组ID") @RequestParam(required = false) Long groupId, + @Parameter(description = "店铺名") @RequestParam(required = false) String shopName, + @Parameter(description = "ASIN") @RequestParam(required = false) String asin) { + return ApiResponse.success(skipPriceAsinService.page(page, pageSize, groupId, shopName, asin)); + } + + @PostMapping + @Operation(summary = "新增或覆盖跳过跟价 ASIN") + public ApiResponse create(@Valid @RequestBody SkipPriceAsinCreateRequest request) { + return ApiResponse.success("保存成功", skipPriceAsinService.createOrUpdate(request)); + } + + @DeleteMapping("/{id}/countries/{country}") + @Operation(summary = "删除指定国家的跳过跟价 ASIN") + public ApiResponse deleteCountry( + @Parameter(description = "主键ID", required = true) @PathVariable Long id, + @Parameter(description = "国家编码", required = true) @PathVariable String country) { + skipPriceAsinService.deleteCountry(id, country); + return ApiResponse.success("删除成功", null); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java new file mode 100644 index 0000000..6274f42 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.shopkey.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SkipPriceAsinMapper extends BaseMapper { +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java new file mode 100644 index 0000000..537d03e --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java @@ -0,0 +1,24 @@ +package com.nanri.aiimage.modules.shopkey.model.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +public class SkipPriceAsinCreateRequest { + + @NotNull(message = "分组不能为空") + private Long groupId; + + @NotBlank(message = "店铺名不能为空") + private String shopName; + + @NotEmpty(message = "请至少选择一个国家") + private List countries; + + @NotBlank(message = "ASIN 不能为空") + private String asin; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java new file mode 100644 index 0000000..63cc68d --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java @@ -0,0 +1,44 @@ +package com.nanri.aiimage.modules.shopkey.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("biz_skip_price_asin") +public class SkipPriceAsinEntity { + + @TableId(type = IdType.AUTO) + private Long id; + + @TableField("group_id") + private Long groupId; + + @TableField("shop_name") + private String shopName; + + @TableField("asin_de") + private String asinDe; + + @TableField("asin_uk") + private String asinUk; + + @TableField("asin_fr") + private String asinFr; + + @TableField("asin_it") + private String asinIt; + + @TableField("asin_es") + private String asinEs; + + @TableField("created_at") + private LocalDateTime createdAt; + + @TableField("updated_at") + private LocalDateTime updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java new file mode 100644 index 0000000..963db9a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java @@ -0,0 +1,21 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class SkipPriceAsinItemVo { + + private Long id; + private Long groupId; + private String groupName; + private String shopName; + private String asinDe; + private String asinUk; + private String asinFr; + private String asinIt; + private String asinEs; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.java new file mode 100644 index 0000000..71de8ff --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class SkipPriceAsinPageVo { + + private List items = new ArrayList<>(); + private Long total = 0L; + private Long page = 1L; + private Long pageSize = 15L; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java new file mode 100644 index 0000000..199c2fb --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java @@ -0,0 +1,212 @@ +package com.nanri.aiimage.modules.shopkey.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.shopkey.mapper.SkipPriceAsinMapper; +import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity; +import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinPageVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +public class SkipPriceAsinService { + + private static final List SUPPORTED_COUNTRIES = List.of("DE", "UK", "FR", "IT", "ES"); + + private final SkipPriceAsinMapper skipPriceAsinMapper; + private final ShopManageGroupService shopManageGroupService; + + public SkipPriceAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin) { + long safePage = Math.max(page, 1); + long safePageSize = Math.min(Math.max(pageSize, 1), 100); + String safeShopName = normalizeBlank(shopName); + String safeAsin = normalizeBlank(asin); + + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(groupId != null && groupId > 0, SkipPriceAsinEntity::getGroupId, groupId) + .like(!safeShopName.isEmpty(), SkipPriceAsinEntity::getShopName, safeShopName) + .and(!safeAsin.isEmpty(), wrapper -> wrapper + .like(SkipPriceAsinEntity::getAsinDe, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinUk, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinFr, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinIt, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinEs, safeAsin)) + .orderByDesc(SkipPriceAsinEntity::getId); + + Long total = skipPriceAsinMapper.selectCount(query); + List rows = skipPriceAsinMapper + .selectList(query.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize)); + + Map groupNameById = buildGroupNameMap(rows.stream() + .map(SkipPriceAsinEntity::getGroupId) + .filter(id -> id != null && id > 0) + .distinct() + .toList()); + + SkipPriceAsinPageVo vo = new SkipPriceAsinPageVo(); + vo.setItems(rows.stream().map(row -> toItemVo(row, groupNameById.get(row.getGroupId()))).toList()); + vo.setTotal(total); + vo.setPage(safePage); + vo.setPageSize(safePageSize); + return vo; + } + + @Transactional + public SkipPriceAsinItemVo createOrUpdate(SkipPriceAsinCreateRequest request) { + ShopManageGroupEntity group = shopManageGroupService.getById(request.getGroupId()); + String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); + String asin = normalizeAsin(request.getAsin()); + Set countries = normalizeCountries(request.getCountries()); + + SkipPriceAsinEntity entity = skipPriceAsinMapper.selectOne(new LambdaQueryWrapper() + .eq(SkipPriceAsinEntity::getGroupId, group.getId()) + .eq(SkipPriceAsinEntity::getShopName, shopName) + .last("LIMIT 1")); + if (entity == null) { + entity = new SkipPriceAsinEntity(); + entity.setGroupId(group.getId()); + entity.setShopName(shopName); + } + + for (String country : countries) { + setCountryAsin(entity, country, asin); + } + + if (entity.getId() == null) { + skipPriceAsinMapper.insert(entity); + } else { + skipPriceAsinMapper.updateById(entity); + } + SkipPriceAsinEntity saved = getById(entity.getId()); + return toItemVo(saved, group.getGroupName()); + } + + @Transactional + public void deleteCountry(Long id, String country) { + SkipPriceAsinEntity entity = getById(id); + String normalizedCountry = normalizeCountry(country); + setCountryAsin(entity, normalizedCountry, ""); + if (isEmptyRow(entity)) { + skipPriceAsinMapper.deleteById(entity.getId()); + return; + } + skipPriceAsinMapper.updateById(entity); + } + + private SkipPriceAsinEntity getById(Long id) { + SkipPriceAsinEntity entity = skipPriceAsinMapper.selectById(id); + if (entity == null) { + throw new BusinessException("记录不存在"); + } + return entity; + } + + private SkipPriceAsinItemVo toItemVo(SkipPriceAsinEntity entity, String groupName) { + SkipPriceAsinItemVo vo = new SkipPriceAsinItemVo(); + vo.setId(entity.getId()); + vo.setGroupId(entity.getGroupId()); + vo.setGroupName(groupName == null ? "" : groupName); + vo.setShopName(entity.getShopName()); + vo.setAsinDe(blankToEmpty(entity.getAsinDe())); + vo.setAsinUk(blankToEmpty(entity.getAsinUk())); + vo.setAsinFr(blankToEmpty(entity.getAsinFr())); + vo.setAsinIt(blankToEmpty(entity.getAsinIt())); + vo.setAsinEs(blankToEmpty(entity.getAsinEs())); + vo.setCreatedAt(entity.getCreatedAt()); + vo.setUpdatedAt(entity.getUpdatedAt()); + return vo; + } + + private Map buildGroupNameMap(List groupIds) { + if (groupIds == null || groupIds.isEmpty()) { + return Map.of(); + } + LinkedHashMap map = new LinkedHashMap<>(); + for (Long groupId : groupIds) { + try { + ShopManageGroupEntity group = shopManageGroupService.getById(groupId); + map.put(groupId, group.getGroupName()); + } catch (Exception ignored) { + map.put(groupId, ""); + } + } + return map; + } + + private Set normalizeCountries(List countries) { + LinkedHashSet normalized = new LinkedHashSet<>(); + if (countries != null) { + for (String country : countries) { + normalized.add(normalizeCountry(country)); + } + } + if (normalized.isEmpty()) { + throw new BusinessException("请至少选择一个国家"); + } + return normalized; + } + + private String normalizeCountry(String country) { + String normalized = normalizeBlank(country).toUpperCase(Locale.ROOT); + if (!SUPPORTED_COUNTRIES.contains(normalized)) { + throw new BusinessException("国家参数不支持: " + country); + } + return normalized; + } + + private String normalizeAsin(String asin) { + String normalized = normalizeRequired(asin, "ASIN 不能为空").toUpperCase(Locale.ROOT); + if (normalized.length() > 64) { + throw new BusinessException("ASIN 长度不能超过 64"); + } + return normalized; + } + + private String normalizeRequired(String value, String message) { + String normalized = normalizeBlank(value); + if (normalized.isEmpty()) { + throw new BusinessException(message); + } + return normalized; + } + + private String normalizeBlank(String value) { + return value == null ? "" : value.trim(); + } + + private String blankToEmpty(String value) { + return value == null ? "" : value; + } + + private void setCountryAsin(SkipPriceAsinEntity entity, String country, String asin) { + String value = normalizeBlank(asin); + switch (country) { + case "DE" -> entity.setAsinDe(value); + case "UK" -> entity.setAsinUk(value); + case "FR" -> entity.setAsinFr(value); + case "IT" -> entity.setAsinIt(value); + case "ES" -> entity.setAsinEs(value); + default -> throw new BusinessException("国家参数不支持: " + country); + } + } + + private boolean isEmptyRow(SkipPriceAsinEntity entity) { + return normalizeBlank(entity.getAsinDe()).isEmpty() + && normalizeBlank(entity.getAsinUk()).isEmpty() + && normalizeBlank(entity.getAsinFr()).isEmpty() + && normalizeBlank(entity.getAsinIt()).isEmpty() + && normalizeBlank(entity.getAsinEs()).isEmpty(); + } +} diff --git a/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql b/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql new file mode 100644 index 0000000..4b224e7 --- /dev/null +++ b/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql @@ -0,0 +1,33 @@ +CREATE TABLE IF NOT EXISTS biz_skip_price_asin ( + id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键', + group_id BIGINT NOT NULL COMMENT '分组ID', + shop_name VARCHAR(128) NOT NULL COMMENT '店铺名', + asin_de VARCHAR(64) NOT NULL DEFAULT '' COMMENT '德国 ASIN', + asin_uk VARCHAR(64) NOT NULL DEFAULT '' COMMENT '英国 ASIN', + asin_fr VARCHAR(64) NOT NULL DEFAULT '' COMMENT '法国 ASIN', + asin_it VARCHAR(64) NOT NULL DEFAULT '' COMMENT '意大利 ASIN', + asin_es VARCHAR(64) NOT NULL DEFAULT '' COMMENT '西班牙 ASIN', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + UNIQUE KEY uk_group_shop_name (group_id, shop_name), + KEY idx_shop_name (shop_name), + KEY idx_created_at (created_at) +) COMMENT='跳过跟价 ASIN'; + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`) +SELECT '数据去重总数据', 'admin_dedupe_total_data', 'admin', 'dedupe-total-data' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_dedupe_total_data' +); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`) +SELECT '店铺管理', 'admin_shop_manage', 'admin', 'shop-manage' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_shop_manage' +); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`) +SELECT '跳过跟价ASIN', 'admin_skip_price_asin', 'admin', 'skip-price-asin' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_skip_price_asin' +); diff --git a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc index df04bc038782306ad9394bffbd3bed7131cb18f4..df68f2e66d7b68fbdffee433b375e0923bab2257 100644 GIT binary patch delta 16592 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 delta 10660 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 b>t9_AuYJA9y4Wn7HqT65lBYdm7ZLson#TzR diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index 00694bb..2988c8e 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -19,6 +19,8 @@ ALLOWED_DEDUPE_TOTAL_DATA_ADMIN_USERNAMES = {'刘丽泓'} def _can_access_dedupe_total_data(role, current_row): + _, _, denied = _ensure_admin_menu_access('dedupe-total-data') + return denied is None if role == 'super_admin': return True if role != 'admin' or not current_row: @@ -27,6 +29,7 @@ def _can_access_dedupe_total_data(role, current_row): def _ensure_dedupe_total_data_access(): + return _ensure_admin_menu_access('dedupe-total-data') role, current_row = get_current_admin_role() if not _can_access_dedupe_total_data(role, current_row): return None, None, (jsonify({'success': False, 'error': '无权限访问数据去重总数据'}), 403) @@ -41,6 +44,24 @@ except ImportError: admin_api = Blueprint('admin_api', __name__, url_prefix='/api/admin') +ADMIN_MENU_ACCESS_CONFIG = { + 'dedupe-total-data': { + 'column_key': 'admin_dedupe_total_data', + 'route_path': 'dedupe-total-data', + 'error': '鏃犳潈闄愯闂暟鎹幓閲嶆€绘暟鎹?', + }, + 'shop-manage': { + 'column_key': 'admin_shop_manage', + 'route_path': 'shop-manage', + 'error': '鏃犳潈闄愯闂簵閾虹鐞嗘ā鍧?', + }, + 'skip-price-asin': { + 'column_key': 'admin_skip_price_asin', + 'route_path': 'skip-price-asin', + 'error': '鏃犳潈闄愯闂烦杩囪窡浠稟SIN 妯″潡', + }, +} + def _safe_version_key(version): """将版本号转为安全的 OSS 对象名部分""" @@ -90,6 +111,47 @@ def _sync_user_column_permissions(user_id, column_ids): return error_response, status +def _get_current_admin_permission_sets(): + user_id = session.get('user_id') + if not user_id: + return set(), set() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute( + """SELECT c.column_key, c.route_path + FROM user_column_permission ucp + INNER JOIN columns c ON c.id = ucp.column_id + WHERE ucp.user_id = %s AND c.menu_type = 'admin'""", + (user_id,), + ) + rows = cur.fetchall() + finally: + conn.close() + key_set = {(row.get('column_key') or '').strip() for row in rows if (row.get('column_key') or '').strip()} + route_set = {(row.get('route_path') or '').strip() for row in rows if (row.get('route_path') or '').strip()} + return key_set, route_set + + +def _ensure_admin_menu_access(*menu_names): + role, current_row = get_current_admin_role() + if role == 'super_admin': + return role, current_row, None + if role != 'admin' or not current_row: + return role, current_row, (jsonify({'success': False, 'error': '闇€瑕佺鐞嗗憳鏉冮檺'}), 403) + key_set, route_set = _get_current_admin_permission_sets() + for menu_name in menu_names: + config = ADMIN_MENU_ACCESS_CONFIG.get(menu_name) or {} + column_key = (config.get('column_key') or '').strip() + route_path = (config.get('route_path') or '').strip() + if (column_key and column_key in key_set) or (route_path and route_path in route_set): + return role, current_row, None + fallback_menu = menu_names[0] if menu_names else '' + fallback_config = ADMIN_MENU_ACCESS_CONFIG.get(fallback_menu) or {} + error_message = fallback_config.get('error') or '鏃犳潈闄愯闂綋鍓嶆ā鍧?' + return role, current_row, (jsonify({'success': False, 'error': error_message}), 403) + + # ---------- 用户管理 ---------- @admin_api.route('/users') @@ -936,6 +998,9 @@ def delete_dedupe_total_data(item_id): @admin_api.route('/shop-manages') @admin_required def list_shop_manages(): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied page = max(1, int(request.args.get('page', 1))) page_size = min(100, max(1, int(request.args.get('page_size', 15)))) group_id_raw = (request.args.get('group_id') or '').strip() @@ -986,6 +1051,9 @@ def list_shop_manages(): @admin_api.route('/shop-manage', methods=['POST']) @admin_required def create_shop_manage(): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied data = request.get_json() or {} payload = { 'groupId': data.get('group_id'), @@ -1022,6 +1090,9 @@ def create_shop_manage(): @admin_api.route('/shop-manage/', methods=['PUT']) @admin_required def update_shop_manage(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied data = request.get_json() or {} payload = { 'groupId': data.get('group_id'), @@ -1057,6 +1128,9 @@ def update_shop_manage(item_id): @admin_api.route('/shop-manage/', methods=['DELETE']) @admin_required def delete_shop_manage(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/shop-manages/{item_id}', @@ -1072,6 +1146,9 @@ def delete_shop_manage(item_id): @admin_api.route('/shop-manage-groups') @admin_required def list_shop_manage_groups(): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'GET', '/api/admin/shop-manages/groups', @@ -1093,6 +1170,9 @@ def list_shop_manage_groups(): @admin_api.route('/shop-manage-group', methods=['POST']) @admin_required def create_shop_manage_group(): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied data = request.get_json() or {} payload = {'groupName': (data.get('group_name') or '').strip()} result, error_response, status = _proxy_backend_java( @@ -1118,6 +1198,9 @@ def create_shop_manage_group(): @admin_api.route('/shop-manage-group/', methods=['PUT']) @admin_required def update_shop_manage_group(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied data = request.get_json() or {} payload = {'groupName': (data.get('group_name') or '').strip()} result, error_response, status = _proxy_backend_java( @@ -1140,9 +1223,123 @@ def update_shop_manage_group(item_id): }) +@admin_api.route('/skip-price-asins') +@admin_required +def list_skip_price_asins(): + _, _, denied = _ensure_admin_menu_access('skip-price-asin') + if denied: + return denied + page = max(1, int(request.args.get('page', 1))) + page_size = min(100, max(1, int(request.args.get('page_size', 15)))) + group_id_raw = (request.args.get('group_id') or '').strip() + shop_name = (request.args.get('shop_name') or '').strip() + asin = (request.args.get('asin') or '').strip() + params = {'page': page, 'pageSize': page_size} + if group_id_raw: + try: + group_id = int(group_id_raw) + if group_id > 0: + params['groupId'] = group_id + except (TypeError, ValueError): + pass + if shop_name: + params['shopName'] = shop_name + if asin: + params['asin'] = asin + result, error_response, status = _proxy_backend_java( + 'GET', + '/api/admin/skip-price-asins', + params=params, + ) + if error_response is not None: + return error_response, status + payload = result.get('data') or {} + items = [ + { + 'id': item.get('id'), + 'group_id': item.get('groupId'), + 'group_name': item.get('groupName') or '', + 'shop_name': item.get('shopName') or '', + 'asin_de': item.get('asinDe') or '', + 'asin_uk': item.get('asinUk') or '', + 'asin_fr': item.get('asinFr') or '', + 'asin_it': item.get('asinIt') or '', + 'asin_es': item.get('asinEs') or '', + 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], + 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], + } + for item in (payload.get('items') or []) + ] + return jsonify({ + 'success': True, + 'items': items, + 'total': payload.get('total') or 0, + 'page': payload.get('page') or page, + 'page_size': payload.get('pageSize') or page_size, + }) + + +@admin_api.route('/skip-price-asin', methods=['POST']) +@admin_required +def create_skip_price_asin(): + _, _, denied = _ensure_admin_menu_access('skip-price-asin') + if denied: + return denied + data = request.get_json() or {} + payload = { + 'groupId': data.get('group_id'), + 'shopName': (data.get('shop_name') or '').strip(), + 'countries': data.get('countries') or [], + 'asin': (data.get('asin') or '').strip(), + } + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/skip-price-asins', + json_data=payload, + ) + if error_response is not None: + return error_response, status + item = result.get('data') or {} + return jsonify({ + 'success': True, + 'msg': result.get('message') or '淇濆瓨鎴愬姛', + 'item': { + 'id': item.get('id'), + 'group_id': item.get('groupId'), + 'group_name': item.get('groupName') or '', + 'shop_name': item.get('shopName') or '', + 'asin_de': item.get('asinDe') or '', + 'asin_uk': item.get('asinUk') or '', + 'asin_fr': item.get('asinFr') or '', + 'asin_it': item.get('asinIt') or '', + 'asin_es': item.get('asinEs') or '', + 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], + 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], + }, + }) + + +@admin_api.route('/skip-price-asin//country/', methods=['DELETE']) +@admin_required +def delete_skip_price_asin_country(item_id, country): + _, _, denied = _ensure_admin_menu_access('skip-price-asin') + if denied: + return denied + result, error_response, status = _proxy_backend_java( + 'DELETE', + f'/api/admin/skip-price-asins/{item_id}/countries/{country}', + ) + if error_response is not None: + return error_response, status + return jsonify({'success': True, 'msg': result.get('message') or '鍒犻櫎鎴愬姛'}) + + @admin_api.route('/shop-manage-group/', methods=['DELETE']) @admin_required def delete_shop_manage_group(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/shop-manages/groups/{item_id}', diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 3092098..d450729 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -114,6 +114,7 @@
数据去重总数据
店铺密钥管理
店铺管理
+
跳过跟价 ASIN
查看生成记录
版本管理
@@ -421,6 +422,79 @@ +
+
+

新增 ASIN

+
+
+ +
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+ +
+

+
+
+

店铺列表

+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + + + + + + + + + + + + + +
序号分组店铺名德国英国法国意大利西班牙
+ +
+
+

筛选条件

@@ -627,6 +701,23 @@ diff --git a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue index 691d605..9df24a1 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue @@ -181,10 +181,27 @@ function loadTaskSnapshotsFromStorage() { try { const raw = window.localStorage. function saveTaskSnapshotsToStorage() { setStorageJson(taskSnapshotsStorageKey(), taskSnapshots.value, Object.keys(taskSnapshots.value).length === 0) } function loadMatchedItemsFromStorage() { try { const raw = window.localStorage.getItem(matchedItemsStorageKey()); matchedItems.value = raw ? JSON.parse(raw) : [] } catch { matchedItems.value = [] } } function saveMatchedItemsToStorage() { setStorageJson(matchedItemsStorageKey(), matchedItems.value, matchedItems.value.length === 0) } +function isTaskMissingError(error: unknown) { const message = error instanceof Error ? error.message : String(error || ''); return message.includes('任务不存在') } function syncPollingIdsWithTaskState() { const nextIds = pollingTaskIds.value.filter((taskId) => (taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status) === 'RUNNING'); if (nextIds.length === pollingTaskIds.value.length) return; pollingTaskIds.value = nextIds; savePollingIds() } function addPollingTask(taskId: number) { if (!pollingTaskIds.value.includes(taskId)) { pollingTaskIds.value = [...pollingTaskIds.value, taskId]; savePollingIds() } } function clearDispatchTimer(taskId: number) { const timer = dispatchTimers.get(taskId); if (timer) { window.clearTimeout(timer); dispatchTimers.delete(taskId) } } -function removePollingTask(taskId: number) { clearDispatchTimer(taskId); pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } +function removePollingTask(taskId: number) { + clearDispatchTimer(taskId) + pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId) + delete taskDetails.value[taskId] + if (taskSnapshots.value[taskId]) { + const nextSnapshots = { ...taskSnapshots.value } + delete nextSnapshots[taskId] + taskSnapshots.value = nextSnapshots + saveTaskSnapshotsToStorage() + } + savePollingIds() + saveTaskDetailsToStorage() +} +function removeTaskLocally(taskId: number) { + removePollingTask(taskId) + historyItems.value = historyItems.value.filter((row) => normalizeTaskId(row.taskId) !== taskId) +} function stopPollingTask(taskId: number, keepStatus = true) { pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); if (!keepStatus) delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } function isTaskTerminalStatus(status?: string) { return status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED' } function isTaskTerminalById(taskId?: number) { if (!taskId) return false; const status = taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status; return isTaskTerminalStatus(status) } @@ -230,12 +247,12 @@ function restoreScheduledDispatches() { const taskIds = new Set(pollingT function startScheduleHeartbeat() { if (scheduleHeartbeatTimer) return; scheduleHeartbeatTimer = window.setInterval(() => { void pumpScheduledQueue() }, 1000) } function stopScheduleHeartbeat() { if (!scheduleHeartbeatTimer) return; window.clearInterval(scheduleHeartbeatTimer); scheduleHeartbeatTimer = null } function handleScheduleRecovery() { restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) } -async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removePollingTask(missingId); delete nextSnapshots[missingId] } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } +async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removeTaskLocally(missingId); delete nextSnapshots[missingId]; settledTaskIds.add(missingId) } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } function getPollIntervalMs() { return document.visibilityState === 'visible' ? 4000 : 10000 } function scheduleNextPoll(immediate = false) { if (pollTimer.value) { if (!immediate) return; window.clearTimeout(pollTimer.value); pollTimer.value = null } const run = async () => { pollTimer.value = null; if (pollingInFlight.value || !pollingTaskIds.value.length) { if (pollingTaskIds.value.length) scheduleNextPoll(); return } pollingInFlight.value = true; try { const { settledTaskIds } = await refreshTaskBatch(); if (settledTaskIds.length) await Promise.allSettled([loadHistory(), loadDashboard()]) } finally { pollingInFlight.value = false } if (pollingTaskIds.value.length) pollTimer.value = window.setTimeout(run, getPollIntervalMs()) }; if (immediate) void run(); else pollTimer.value = window.setTimeout(run, getPollIntervalMs()) } function ensurePolling(immediate = false) { scheduleNextPoll(immediate) } function stopPolling() { if (pollTimer.value) { window.clearTimeout(pollTimer.value); pollTimer.value = null } } -async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } +async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); if ((batch.missingTaskIds || []).includes(taskId)) { removeTaskLocally(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return 'FAILED' } const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } function resolvedTaskStatus(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); if (!taskId) return item.taskStatus || ''; return taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status || item.taskStatus || '' } function taskSnapshotOf(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); return taskId ? taskSnapshots.value[taskId] : undefined } function currentTaskStageText(item: ShopMatchHistoryItem) { const snapshot = taskSnapshotOf(item); const task = snapshot?.task; const stages = task?.scheduleStages || []; if (!stages.length) return ''; const total = stages.length; const activeIndex = typeof task?.activeStageIndex === 'number' ? task.activeStageIndex : undefined; const currentIndex = typeof task?.currentStageIndex === 'number' ? task.currentStageIndex : undefined; if (typeof activeIndex === 'number') return `执行进度: 第 ${activeIndex + 1}/${total} 次执行中`; if (typeof currentIndex === 'number') return `执行进度: 等待第 ${currentIndex + 1}/${total} 次`; return `执行进度: 共 ${total} 次`} @@ -250,10 +267,7 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { try { if (taskId > 0) { await deleteShopMatchTask(taskId) - removePollingTask(taskId) - historyItems.value = historyItems.value.filter((row) => normalizeTaskId(row.taskId) !== taskId) - delete taskSnapshots.value[taskId] - saveTaskSnapshotsToStorage() + removeTaskLocally(taskId) } else if (resultId > 0) { await deleteShopMatchHistory(resultId) historyItems.value = historyItems.value.filter((row) => Number(row.resultId || 0) !== resultId) @@ -262,7 +276,14 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { throw new Error('缺少可删除的任务标识') } await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) + ElMessage.success('删除成功') } catch (error) { + if (taskId > 0 && isTaskMissingError(error)) { + removeTaskLocally(taskId) + await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) + ElMessage.success('任务已在服务端删除，本地记录已同步清理') + return + } ElMessage.error(error instanceof Error ? error.message : '删除失败') } }