From 612fcc050f05573760a7cdfa005cdbce766f77ba Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Apr 2022 14:19:05 +0800 Subject: [PATCH] =?UTF-8?q?house=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ .../java/com/epmet/model/HouseInfoModel.java | 3 +++ .../epmet/model/ImportHouseInfoListener.java | 19 ++++++++++++++++++ .../main/resources/excel/house_template.xlsx | Bin 9581 -> 9649 bytes 4 files changed, 27 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index ae31756ed4..583a76ee91 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -162,4 +162,9 @@ public class ImportGeneralDTO implements Serializable { * 小区重复状态 */ private Boolean neighborHoodExistStatus = false; + + /** + * 排序 + */ + private Integer sort; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java index 740892f4cd..332fc6b6bb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java @@ -50,6 +50,9 @@ public class HouseInfoModel { @ExcelProperty(value = "房主身份证") private String ownerIdCard; + @ExcelProperty(value = "排序") + private Integer sort; + @ExcelIgnore private Integer num; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 08eb31a9cc..515e8127bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -34,6 +34,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import static com.epmet.constant.ImportErrorMsgConstants.*; @@ -152,6 +154,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener0) { + Pattern pattern = Pattern.compile("[0-9]*"); + Matcher isNum = pattern.matcher(str); + if (!isNum.matches()) { + return false; + } + return true; + } + return false; + } + public void disposeErrorMsg(HouseInfoModel data,String msg){ HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class); err.setErrorMsg(msg); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index cf5681e1f4074e88e34c73d26e98414785921bc0..37c0cc1c02b9a740d5135585b1bff8f7ed773a72 100644 GIT binary patch delta 5666 zcmZ9Qbx@qmvWHompdq-+5(qBA9fAc7?vUVai_43{;>+S1oP^*G!QFzhSg-^OZb5?F zeD|DNr|y}mnLm2EW~TaA-8KCjy{%QQNdcj0+}T8H!81WLz~tM0Zi2y+&=U=J7dYgJ zuH-0mG|!me3(J}eZ@ZD>Y|@+dKhJ17{4Wki^ay|RsH}WnmV3UFoaqvDF_Glc^a}fg zykUebla7MmXUNag;cZsw=A~6h*}PhnXS&*igbiq6*8BTP<2wCpxQI5*k4|`l9$-6$ zD#C^)T{$w!P9QQlv-?#s8z-9y??Ikl1o4kVM>HX@WsGu-3ip^R%B7C_8~@@BaZU04 zLNv^Tf?&d8{tR@YCtHranfs+FUG!1jW}|Jdl>4LzB2Pk}=nn(yY4>-E zz^_zif_*e5E6YdzS5>Nt+lv0)yVQ5T&xq zMSZK;&?c04VVumL{CdS_|Wnk<(uywX2bfL_?ib+@sHGO zqa>EMxjV=zJYvWrLTK;$ZQhZU?TNmfp5Msl?3v$Ys#<*@Gu4pM*Pe4wA;qSe&H%qR zNp+kUrBnI5CrAmAnA?uO#ely@HNvZI?&S+aMM6r(MnWP(f{Qaz00X*4E|hXaK?+-v zU*w6^tGp42{>7@SSjuLoHf%~leZk^{rCxMp$t~v;oxuqNrJL4V#vmxyd54XK3{7cx z_Y{XvdPKAFvS9Xq6~jP(Z|*-C;J+ifE^MpGaRkG9NSnW~8$F74))By7XvWYj;+{6>-H{f>4$;{rF9;IkJToCp{8dYG$^3 zdkAUd)UU;*U6}($-uv}%v$lnOieGx>7=t`9pV|zA7#Uv$qEIu~StXICLuV z-~^~cFbEDZCdp$wrbqkp4c?x4lryzVw)48UDI}Jc6y+=cWfpECx})zR_3=m?0#A5_ ze$%z+jFzwB^vO;5v23aq2p&*B<1Jsc3x!bbeKs&+rK^dGHcG*{=X>IZ>ZM~brh%!4 z`De88^n}f{x&<qLf8 z5V!mhgKy5jY(fKNx%p4Fl3wjrd--)+oZD!863n9|!eN~Y;^MPT%Q>c4%Uo`K?Hqc6 zSiVKnPX4IRS#nunf)wSLXI~vq%$#{yOoI&r&D?jxM;1+fmP58|{kDeLnKSdoU|6a| zn!IcSuTK5w4gH9$%g?CNS`0`7K1!>~5_CrC3}x~I^_b-KDOaC)!9&6$rZ-sF$vtaiU<_OOP&u1eUOM}8F*g#x{yl2SecR4tzU-XT|DEmUB5P! zn|ORi0;6;Bb8DHo0USk{`4XJrPhUhVJ(CUREy+LW?4XCrWEBsnluN)tO2ZP_Af-Kt zbdVAzAej$RVp*q<)yB<|mx*`yG0)cnCag~aDOsZ9eJln?ys@rQARqt=4e5Kf2gwL| zInpL%YPGAhUqDD0wQs)^&E7{$VAxa@T0}Z|w<)Ep?AgW{wxGlZVDmle`qeqZzUCcb zie(zdW#>K{h7$YEi~*N#5Q7h=-QnH!O2CvC(9vnk(3$8z-MSOzW{S!AVQ{Y>eInb_ z^Z7NoKsN2_zQ^t6-ct7TLv!oKiDX~?AFiRDM#1LrQC!2%%;rG1wb!=JpJ_Zq&L zLC9I%;oWEvw|tI2(9c_vkhMOQ!flIm_g?Ty`5!y69=#Z~@1OarPGKDP04vH@^kVhW z{T<1_)rkTw#fVz3gvE#s-0gRfeSU_7w4i~6g!{MN`#5rWKztpoJUD%v9OsRlTvir{ zA0^D6LNsauF|A{Z%SlVq>h%ReK;H@I$TiFrAZBz`QKdK`} zTWCD3!;fwD?4y9F-q|n=JkE91c$_eu#6oVjbPM;$qQNn{c^-MdMUDr)FIS`6gXsXTO(IY1f+;42i9XygGsqSK{p^!gUI%2ifb73xh0T?ng#{ zny6X1!v*d2e)pYj7&eOhI$G&Fw*4+yBYtDOfzjuTNgLMjYmcs`{oy$wMVpR^4(0rN z#2ITg<(iKzZXaw0xEL~BtRlNilIgsarp2Qmj)+@0`(r*zz1=QJ`)AX^EYMeG%~+=@ z;AE88(?sWlrCO=;Vc+oX+A@Xz-2Fj>=I0;pl(+m%iGrm94&!mZD@NnmDqyX`LkOFp zbkXczpYD}=CLqj>28;~MwM19kcPT>7{4vKngWcEqNuIccKwN^ObKIKtv6sn4enQVN zp3}Ln``x#(-NdQdwID$<5MtPlABDPta5IzsbwJz6T?iraix8HZ=yd+_n4jFfjN7t9 z7h#s-i*suOSGN5(j;ig$d1M)PIePpM@NC8Ea(SumJvVP=miyN3si|9AXvcT2fx4_4 zu5<@s;)GdZph;WDiDOQd-dX4^vN8#kpfqKaP5%R$1H2X-ljB*`TFFT?Ok~AhVa-n& zTdYKw0P|LSKVg{FOG4qB`C6%G=1}SxJJA@CRT|nT$!Kz1x53Ri14{Z2=>sP;ga7ETGpI3iUet7z`+rH7m)(<>dDn`&@L z%MEEozI(?kPr8YOg-IJ4p!}^uKYiZL%PZ{*o4s=j6>C}_tXlBbUNxCnYrv}})2WtY z$4s>Oolxs}D;u+Z&45o$_aoT{FkP7>HH#sDmG!JuzC_=wD9K%)RMhv)o$ymEM*u9S z%2yxygf?$nrJ#>BZaiTIecX{N69_QCCY@;ynu_9QWiq6h(Qb)m8WIpR_9y6-v)DL1 zDnd+2N~I?Sk=@Dq%zC%^cOpDDo%qwD&0t`5=N=K=cEaNyo-FRzRibzgwo4yl)M5bn zNiouuVAWwU;_2?_F=Oql@Ql99p>5lStRKIlm zYknpJp*o+{`5o&{Y)X%e>R6MUkoZKL?XTd>a+~&Jj@MRSc|Oj<-plX{QMtCGn3JLz zrpmXIOc}LgQg$$D;osJ@PJ8BxyV&~Id~w1kn3YxD5Wlg-Xo;c0OOBHBrw0n(d)l(y zxTPNVg!o?;ow*|L*uVZkHVR2}-h`$Ec0M=i#`}(QKXn}8BZ--1(-i`<{Uc=wZlKw2 zfT7f(`-_a)fnSReDYYn!8(`I{V|l;dtduTSenuT-+`6Uwn-9hs;`L{^0u`$oZ9crD z9IdQQePHKxI+tJTX?W~n%N}6*R_Og%MX_-Ika4+$Mw;g5$mus+esk zRD|T4{OgmH7mB#Y^Fzd1FS25FzC}|(YT9eROo3#0Ab!3mBv6glx`)YhFyW8Xrp(w$t-&X4_;R1hf7QFW}#~Dp#<#7uII~rO<4vZk$2Qq zs+j?2w@Z>I>cEq$nD5=q{SW-fpzBY_fz%;*0bA&weoWZZ7wst(Nqwg)qTAus+OUr5 zCxH@c)3_zVnbl!~ln{p9NmH>bF(D{_C<`+vKJ85r%u=wN(W?(U6tCI$=h4GoT|ruv zx4u)J29)3UD5?H(GKly!@L&#ZyKoP$>Eu#t-vx z?b=}I)41Ep6~iH3#AhJiIlSbmR-@HIee+A&g7G^`VUwhBI6jQrgE1IM^7qYad{l4I>jqk#IBM^Xc7a@H{!4Tq|d zA`(wGiO<5M!FcRuBbQ>gKksjj_B)t0F3V_v$6Qt-VXgG#3`L}@fZ$jS)M7~DVX1Iv z^^5`gFv?batx%uNIrFc{@&N|#VvrL1g|^_Dd@rPL!UD@09(8Rd0buf9+=pF%xbhLC zdXX{~_jvn(a~xdTJVmE#q_*7pr{v0*MLD3_-XI*I%szC|R15a)v!=#L!*nA!?wdbI5Hv z!Z;m|@za-vPHD<+d~?MD4H#H(Qr~HaL?GsfI3~q%MH6Sa4{lEsTxPpdWkK?(dSD{Fuq+-i0@c$V`j@?DJ7YGUI78wcYAF}b! zPuCW{z=#hx&5Wt_N)e%NbU;t0#!da`&(fL>1CRrQ(dFq2w0h&@y$P6Nf_-|(WM6~r z!J~2{&kE?cW@i_gYgnLed+v`e-wf{g>>bxtu>FOUwMeFus9;IKN~>>+hZ7>31O(G` zVN#jWg!0P_`mz`qg&CbKA2mnA&C@h+naIb!#4-T!%(Zq?(WyP)Bqufp3U(oD?>AW^ z9~hb^4%Mu-2T#QC9xj%6FG+65rc=}KAT z8rIC361BM_5x*)A6)ZQF-6Z%NNYm+@Wm-#xd_02c$5d_8_psWOIiF?LO3~$NT}JE7 zNeg`V)*ZRaCR81st>=H;?!CE#Z$|BZ=)H@`GwH1v#h2bj7xC>{zoLe$jTJc9(J63xzS{%jV4ce9gJtR4C@AM$Fkg&x&7&jXsXCw_|SIwF@@A($i4rnt_79w(quyZy2nB`oc|D8 zc5aQBJJ+&%N~yX*l<4&AF~9?x{pDr~_u6~VI@x>EQnNr7Fuea>DSf0$;WVz^&1uSx6ImTG&}h@YGU zd*6@wz0Nc=Pv{RCv^xEz1Iu6Jx(ZL$2cX74fj6-ghcmu#e{!nkOG;(X&AXdHE?xC z0b~RXyqboJO+y)kO!U9W^Div;-zoKPE1qCNF(Nq3^s`ii1|2_H(T#ShgJ%#=s%l`mgJCSby delta 5588 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