From b482e5582b7e1dbae356328cf60b525527f78eae Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 13:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E4=BA=86=E8=B0=83=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=BA=86=E4=B8=AA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/IcDangerAreaImportExcel.java | 10 +++++++--- .../IcDangerAreaExcelImportListener.java | 1 + .../excel/ic_danger_area_template.xlsx | Bin 9140 -> 9172 bytes 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java index 7358f3ee39..afee6099db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -22,13 +23,16 @@ public class IcDangerAreaImportExcel { @Data public static class IcDangerAreaError{ - @ExcelProperty("风险地区") + @ColumnWidth(30) + @ExcelProperty(value = "风险地区") private String name; - @ExcelProperty("风险等级") + @ColumnWidth(20) + @ExcelProperty(value = "风险等级") private String dangerLevel; - @ExcelProperty("错误信息") + @ColumnWidth(40) + @ExcelProperty(value = "错误信息") private String errorInfo; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 0227d89e1b..9ab01d6a9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -105,6 +105,7 @@ public class IcDangerAreaExcelImportListener implements ReadListener1!a0V&0VG#|Dd0a9RSL4o!T(}dz5uLrB#p9P~bbE?MgOql5qcg~h#FHY{QYbImg z_er0PF+zTdUmxzD#!=%&54#e8%3KO2EO6i1vgf+qHe7#g!Xd{qW!PfNoqq@mUpF9c zb|nv_!S!1S$Z>)_7i1JNvHb)%N985Ey{lHJOi7x?B#Sdr(Q8H*jF7jX@k#xVasQwW z?f)ZE8lV-;*n+af#f*3alwnx#5o>Vz4lm!u#5e59^HY;U|cAK7smkLsYuPvV*#iiZp z@bKV-U!Em`OTJca!gJ43JN0txjgS1ylM|pX1S==vrYau+a0$+TU1uy)cgEe85LE}9 zx~|>2lx|WqEP4ULu}9TqB^A$?L=iNfnhd-W-h7&75JjDON6_^QUEs-8fIx37-e$Cx zJ=sy@`VD0?Q8a~8LC#N{=Wi0ipe%3zh10#i)JbQJRu{@O=QkSe865OA0|TS)C5g&* z^pY|#zX+k$-Weu;4=%#VgCAGRP_ywmI(@mNwlWp=N;oN9lZvTJ&VI;JwVk1{iwD7I z7`IQZ)oe2?g5|f379d6((P|yIu+5im(uJ4b3#;pUu@+=^TpDF+LM$&;Y^O0)=jfgW;Ly!Ojo?;>~$HbmIZ`d-*uaqqqTrwFL^@UW73)JPQa$ znN3y{jt*X(R!Ik@YtJU!RG@C3`Bd=Qfzbk)mnG4I4^Lt!=|n3pw04FdiBMV+w7a=K z^>!Mju~?jcTHs@gOIsKkZg~)&9K_W@yfUH(lsaB;w=FZ<7so_{j%c4^a74gjWUltuHy=a@1W3LxN>eA%`%=>jfjljperG^|PX^)C(#l z+2~mUF$CokA-FhF+R<`-7{T*@Z{Ag0eY?N^1dCNo zz0PLp9rOBMc`oo|5jcx*viMK7pZ|Kl|KBL;tL-tKW~3IG5?PXGW70001ZY%gMbb>o!A$w){GTB$`s0#r@xaWc|)CXB~bvIwcrErCTvLR~1V zR$|#zC=WEig4k-=cK?~$O`i5&;5+BcoQr+tk~SVsPe`EI}Oa=w3a8E;%W9C^xZ zCmg$h-&M8sx~e#SKNz_FURVA8O>3>KD&xrZ2eudZPFFp0#_F}ruYYZ0936SijeW<7 z6ky?xyXt-v9bB!|#{GR~WRKT_1ILGNhCw*8BlsBZ)y4;*V-LoNXyn!Odc9d2*{-i{ zZupatHHyYcKbZJYS2cg>C53$RodI0bRfTZt1p`p!mh#P?OoHgmuf9AXZ{AR@eCx`U z`Yq*6$yYyG%lMMeuaSS4{@b?{wU+3`D`6H>V!fWNN9y;2D%Y-MD`U(n6GM=2e?y7Q zW*08RUrXVSwW7@9PXcFN?^^8L&5dE;GbihH@G`oxxiNl6xov-Y5Pv!Xy&rf%s6-G( z;AIWF!5%r}j_K)do)e$A3VKS zek;iJ4duEoE=HXEa_c({pI)mhmvV)7C0KV@;V*v|>&1a*CGt7@U$Io;X)R2ocY|;M z8%#>Px1*tDe{yYe!*hlai~ym#w~ziu!2uc%f+z|`@MhrJdx39z@V1svB>xd5>`cKX zR9B7m@g@>kg0m-45N{jQ&`mM-+J`L=+KG87X2BWK`FMt~eK zaLIfP++~3mC3zhR+G#4pyFkK|bLw1p(sEs-J z4uZ+9=TLlOIhF-$t9VJWFqS!T()@_W9h=iNX<#t(*cI5Ins^oK)kiyw|apuJ*re#oYKU8G6Wv%?;ag_xzFL z!w$3)Ms6SNU-#joLpGfchv{t5L57&E0bBSyU&TH+@Q%JW8SOfug^x~PE%4PXJdl5~ z&({+T*rm6_AaeQ!^4pBO*irgL0K4B9|yywTdH` zC`hveIvrqS(7{br9Jk?2XH}Jij)Fp2*{Z|!;jkxPRVdN$9VfJq&u~2>C@rBCT5`V& zr6o~Ouk2vW;i!SFlw zWWczx?!>69lHAe;U{@4Ku`hou0ag=5)uYNTBBgcEPz5rQU5wG? z)=aJ*Rd>;Yc^UvMn&~CvHcFB>wYk+oAzuL0l09AHci+igJhu&RywondayWe1?RePt zry!*j6}X-VkfEi$#0GncSO|9(KTw&o#S&#mI>OD^kx5u3pSkoD_1u3CLiZhr4(_}{ z`UwW?G;kAlc0xQkL7l3gr_8(R^vRR6NAGe5>`q({9&jRVf|DKd1kL(4lr?4g#ph@L zygU2D@$~V-^N&9~`}L;^L@q%AEaI3n@L9BZE_xalh;zaPANWElf=fKJ$o>{cancd1X7LyjweVYnrV82IHEV2%`mwJe*B@Z^^^-5i8wCgiRF3i z|MO`2=MCSROUp#;En93Bx4i2VBNK%uX zIZq5fQyK%)lc!Xy7rHb6AA@2< zy%(Ny?=lA`P2JQGtWPGKM{{7!c1v7 z-DjVkoql=#@btw8@1Fhl-uZ)Pv)`Uj24X}>lawGuDa1H}1viPVsU}k&fm3*s4Jn(m z$A6vv?maO^;7*OsVB!d4kO_iR9Gi1bL*U8)A8C zNZCj#E3JQT&;|&qOQB2k0M!Fb=Gio)KrRFfS~=hbSZRsoBbCb)v?aokN()1rl{8Gy zvOh-y2Ph?&r`k#(L+AB4Hl~zKESrXiITvYiTQhoB7o-QmS+PwFTsGM z^+MH$&V{FiGb2FDCS%arM>ahAfX_wK-W~#D;0%B5i5K0ZUv^dY{=4{b6!1}e*W2#x zAi^xVDtrGHdaQ?(f9EiIYYflgz<*^Dx?T0BJ6o;J_Ku~mwd-5$HPdh!Yn{f{_FBX2 zZEbH`ow{D{{R}b&{kYuKL(N?Hfw_^}4})Ng6 zw}+g2Qt$e$c;qm_$ORerOl+Ju;H11HclX5_TN z+y6(TG$gbjOSV`tdNm`S0Qr#n{9okXv-<+F0ST|y={J4@003;0wge%6!H(ND5WN@Z zKL|w8QzD77EZMH@Al}Vx12jd@wCR~E(KfM^sF0Mk+f%K43nTBtV9lBCeOhT>ov>hrO4`nmfC?x%83U4YRf9sq21+Y;pLJvaMq5`5yeY4 z)8pazgkQljDU?`iKNCgZsGXj28cYZ0EV2`zPb8}#^0uxX18@a@hr3~%>3e(Jju6!c zoTh2~rc!=Zwk(bkgwufPi&|+>ToO&ta&9Z|QU=R;&LE4X^q!>a1$v5S*CPae8}XXa zMjhFnCO5ArrrHf6ETHa1IDIv_LSnKymDc;bht!09c-X1vF}bVC)#hev(X+E)~-= zfuIVO5sV$s$RFWoeCB$Hv+IF)yB?4IG{)gkJNElmBQBhOFbv$~!F+ZwuMXz5H3Oj3^8x`mnYnv0BpUTZA*`nu4GFA{=SKb9U>8u= z$Gh|w)ukziWW6Sw!DxE2mx;QB9Swuwl&9}2XdRp>jXc7+XjYt*w~qK$G|$Vb)-R}1 zWMeuEBp95}q!e=CbPeM=o?YWGhTE6GM&_+kbAp$DU%sh@{%Zg5=RZIH@@W6?2Mo?N z5BivSFy!^W@?3p^XYliH#ImcQe4qm?h^>}w_s=wG<`aK`_nc#& zOL81%rnz_;sgpQ+d(z@87mJe`=}{ z#cjXa_5$B&sK-vE-q`;7*S4bg*mG_jI8Lkp3qNY82XTCOy;O=i2Ts2oZ3c&q58w2H zu-}g1W4K?64nwEijSx}aD;b(rDfQc~uWoPogTCF5Bc&4z{J5c7^pZlpd9w=_O;sV> zT0s|7xubkbx%TaA*R)MdyQ92;e?I5=)ppo)leDe><1Rxj|G zlMM~LjIL~NMeitg+aAQ9fjrX*ydYF!2qW;aj(yecJLHbx*{@$de}wNke`tphL?0nE zEp!dXUUFyO^@9*yED;$Kk}zK)Dcs*{sJ3n2tnO&qT;lLumlJj&vtD1$((OsXvo-j) zNbm;8pJ`l7d#eWGY6}&(mmx6mm^qhm`n-XdB`w8s;lb!;n3o8w+UPZxjdMn2o`sNc z_Cf{Dh?aV*QeJF$&JYIUf118nVL7>gQg5+P3cf3&s1SRIm3DN7Jyk< zkuYReb)mup$JJKqI2;t~2$RJQskmK;pfhnjk2a)G)yb9Zt;2R4JE3pG*GlsK_VFQf zDn2yG2=Ef3%)NU*Y#-|ePObR}qQG;zNQ?az-ycC=7rUru);4hqf3%l;?fPBk$bq)G zf-jdiwdYkaUt+lq|IAvwV$^H8hK*Uie3+4>7OzEqoyo6)`8B;#tJUh3sV^J+!W=!)wV{CvkPNj9yEYmDFl3 zhu4Fvz1yrWJBJcne_NGZyS2L-Tvz12Wmmc+O1SJ_OZDN#*0spT{oC@3JU5`NrO4t2 zc=={>W7%qJP7=*rG_6HGS98}A%`0jdI5)30nrVC1sxH0UGg+A*qMS&sD>IJ;7ug5_Rt>0L9%U7LN_JcbMM7EU=?z21vOJG zbMGa_X`mO%vs~n+DRS_e zCdfl^nqm<)f3kJ%d2Qq<=ChF_nA1j%;-WUn1A{G@%B;+#nYJ^RL}FT5PFzm5vPQL=iNd>#t(XQII`*xI7dD1e;fcDfk1o3=*R(j3yZnQTQc;J z58GR9&)xU?jt@J~P8ho#w13@!j}F;%KI&z&MF$xYwk8}7;Q1=;!$a@*dxQR-6WaLb z1l9syZQ_BHeZHA$z%IQV2C>tL@nH@$&c23{=+r{0Bq&@=C3z&lS;bURhbc)4r2(@r zrX@@Xe`ol6W&SllL8cVoI76xCx`NOsR;F0syZkaikhGzkupG4^tJtU2;>qQU0mq#R zI@If?i6Xcca9p2OT)h^Qg4#Vpsa3`tGzlqg zf`;&6ZVj93ns61iq2;F2MMl*^l{+%3JpPlnE>|=-xk0DMu?o7S zf1!#d4Oh2lnZlqsyUwn*vT|eS6^R6Hd@XFhgaS9|OoS;L=ss(N6&B={+dOdv^-3&k z6n5C>fP_Z}xz@NyS&nAAX+T~;Nqg06!WNqQUb*H(&uXZP)ADovFYJ;+Rs#*_&MKNh zj4romazhV1BU8{^=Uff?vZ;EZ>QP2He*)cC?CKJ~`%d=axovp!QoHcVQSY+b@v!ed zPXSB?$k5U+vB91p7Tm$&2TJp7u|yd%X28wZk!drVe&+I1)bk(+-FKk!bLSPZPcUGo zft$Fq6XMAU>Qu#tXY?ED@Y%ERllM3S_6Dv8k82S(!HJwnf{OMHWkVT$`NjAjfA>ef zKN&uKeE!Kt<6nKIK#?LSfJGdWGCp@Q$;HUx0yUU$K?pNdU~VqaMWO|zM;Xr1lLyk% z^CXG!;}?&H4^C5wsQfbuXjvo@tt`Dk9MKz9KgPwxhkfU^o^nCGF~@~G7&@u_zn=`B z{VbJ>I(|lhANZIQD}jp&L~93(f84}}cPHsz{qe={m%kYO{ex5{YCRbdewJmDCNo^X zze%{Dwu^Bw@zVu!vjMmhHe%RWQph9-Fg?VGGs)wz6PRb31JV;c#K42|LXt4bWJALj z?{6?v;Piro&G_ukug)G*$ztfi`3nh&1OcYH72&z;cf$wwM<0JlX~j^2-6RPus$nNzP?CuvCM|oTk5A4&`Gdk> z5CaE}Kgr}g`Skqc{n5QAe^B&CAN`FA6l10=)iE;wX!79=9tJDslR$AYn4G>h9LYL_Qst1_Nvnfk~oC+AUbifU;(h|)_Dwiv0ON1kp7KS7%X_%mO ze~t#0rzMzY+Daiqf9Lf$HkOo4BAbSYH4$lYTW9pHF!BgerP-CKJgumpEzbsWUV;Hh z>#3>_oeNKE;E|tA#-O#2+wf=!J{L`UdkBoK(`ygB_%{8rp|bbi#YgVJN6B4pyLW>a zvuLR7{afg<9#a0Dqxh`|p2dN`${=(b>Q8r@)%wn^ZEV!EU}kN@GM(~9z1-Z{C|j-O z&W>Hz46XGpWDNRox$8%|HT45?eYX<^QP7JwJMgqn(CfJ!XZk1R>ZN-6BXhvydgQ@f zVPb5e{4I8^p>iLH`UvV0s7?OIMwBA@<9FNt2eTg;!Uh8W9h2i9KLKZxBOo&Yi<4I% zlLUo?vw@TDAjbi-leQr?0os%8Ax8rL7?U<4CIwCk`s+@UVIma)hLd+9IssFYvLZGC jdXwoQKmikzDkEMAuh;1}eggmiY?F~AJqDK_00000*PFzv