From 5a7b65c7046b67a21d519c95e8ac11b83c1b629e Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 26 Dec 2023 15:48:04 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=88=BF=E6=BA=90=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address/main.css.baiduyun.uploading.cfg | Bin 3472 -> 0 bytes .../audit/list.css.baiduyun.uploading.cfg | Bin 3130 -> 0 bytes .../style/theme.css.baiduyun.uploading.cfg | Bin 3472 -> 0 bytes .../datepicker.css.baiduyun.uploading.cfg | Bin 3472 -> 0 bytes .../whyGreen/img.gif.baiduyun.uploading.cfg | Bin 3472 -> 0 bytes .../style/common.css.baiduyun.uploading.cfg | Bin 3130 -> 0 bytes .../datepicker.css.baiduyun.uploading.cfg | Bin 3130 -> 0 bytes .../dialogBox.css.baiduyun.uploading.cfg | Bin 3146 -> 0 bytes .../groovy/com/fangjia/script/Watcher.groovy | 3 +- .../script/majintao/sdklog/getAllCity.groovy | 57 +++++++++++++++++ .../sdklog/sdkclient_CommunicateLog_info | 0 .../sdklog/sdklog/sdkclient_EMAYSDK_info | 0 .../com/fangjia/script/majintao/test.groovy | 59 +++++++++--------- .../com/fangjia/script/majintao/test2.groovy | 54 ++++++++++++++++ .../sync/CommunityHouseSampleBatch.groovy | 13 ++++ .../com/fangjia/script/util/ExcelUtils.groovy | 2 +- .../datastore/CzbankSampleServiceImpl.java | 3 +- 17 files changed, 158 insertions(+), 33 deletions(-) delete mode 100644 projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/datepicker.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/img.gif.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-pds/src/main/webapp/static/v1.2/style/common.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-pds/src/main/webapp/static/v1.2/style/datepicker.css.baiduyun.uploading.cfg delete mode 100644 projects/fangjia-pds/src/main/webapp/static/v1.2/style/dialogBox.css.baiduyun.uploading.cfg create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_CommunicateLog_info create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_EMAYSDK_info create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy diff --git a/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg deleted file mode 100644 index 74aacef5ada7833601f385ed190fe1df87d9b2c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3472 zcmW;PNmnXC3Bp}Y>v;#yy5JVjL_3ulaK23M0lAD{G>Z)d(_S111 zr9pa0)pU?f(=NTHzf@26>_2JZxJ#XMmA=wAO?h_GdAdm(-VdI?({oy+qts{p;qj4b zBEHiW&RaTTz2^7KcAk2WkBv{$UTUUQT0&c-f1c(%?qsN@g3L2Mx1LXUFQAOrUejax zO&6?1u@{atpSs^QpAPGvJY5k}(QVZ{q$gE%#V_!xrlCxA_ouEUSodl;cdfcE9G{dZ z@ovb!Oo!>6_X$3?#v1ZP1vAxrr%FYcgSZ#@S`f-K=u&bjrpWT4;-$!IJy`11p|LT=SL|!?F>lUj_HJ~c<~glv z(2vzwh49O}!n2R#i_CreOFaL{@&si;!E+4DS(PJvN^%V|?-h?B^ew-+YYoRI`O6t~ zq`I{{7cf?^w{)8unYiA{S;F$u@3E)gyioZy+nPtr`>Lw`(XB!EHTxwNzjT^X;E1h7 zfdM{es%&FB^gK1A_C8h7jp0WX3IiHTPmnfVC45hT+IGcFnNp1<&ZljO9d~O_q*KV?0N6I>NG@eg5cM!0Zc` z4XjXbjYvdYl#}&jjoqyRvyFvE9$er0@eM8BK>zl5;^14#v8JrR> zKahURyvWhWv8&vtHLL-3&hXh$V648VE9TA^uSZNT;e5Nh`J&Ov?=dQPEXkxgeOo4x_H&?lWlDklF zja962F^{^Qn|NNR`xx2?#?bf>=8>oyn)YFR%Xh%*lFwSy9woZ!nwe48&Y>KG>>D$q z$+E+x?1-qEylox@Z%T*nLawozpCDAs(X!uH_6e`}t&1v(8}g~i^PrY^b0=(XkdNgG z70S*xjOOM_4_aSDneK0VpJb`i;S;MrjAE6Y<^EJMheNd$)O7;;SoQ|xE+{n9^#+_% z$}MG|yNlUdRQrTdJ$Ng~E1p-GL#+70A=b39-){K~W?^Df@DdY+F}Y#!7Yb1LRu z%$bStSOcTx=vO0icz6AB^kFSvwpCKm?|ZtB_%Bpc@-FW=U*!1X*~T;8@S(f5{0r*E zPP5<@T`9A6VaCoel&vQJm%QifKh8#0=n02wV;3qa=?cQ73K#tMReLA@HAV}1#V*vr<|cP4 zX37rxG24%8bZ_pwbw88q+kFROh1aWYY~U39&cwy~{wj0qk3AXNSaxNps=hAcugE2g zHU_b0KIgv1yIO+VrqUzT+iE;kZxN#s|1u66`A%evx!uikVL+vO2rU_7&A#RxUrzB| zRFMAz;(&kjA=Z`9=mOTx``pf+KVoB#>>4>!N$lJ2)OwIF`WRYmRJ+5Z>+Tzy*iYjt z;+F3(^li3uXd3Fo${6qODV(zB_&R8?7Cb-Uu@7?&f9n2G<_k4-WsY^Qic_p_$GI;v zj5h2~?0fhu_-~Ev$-UCwJ=g;gLw8LY%~f)W>sY2Qs%+Hpf@1^v#OM->QRaIie}M*< zdG>8Q-D4BG`3LrE+Wg4fQelOEUEUSUBZx=1#v3uv-#779d9HA)^By_hjqkI?{CTF? z9OJ(H6;GkVDf~;%#}F&V;v4D9$R_t|p7$ZFLf#2R+5 z@+WNHFo?Ml_s_UT|F$eM6}6z&9FN9N)YzBd&|L+Sv5KaA+kEeN#tdvyZHP~sA{+L( zh)=WUjmI6{4Hd?h*AIp-bohl7h}SsvjK$pl!1KXb$EYIe9Y%Dr!)u982iAeAVt?DH zZSMRt7VF%B>c4n3bAMv@FRG}3-FdEZD{~80L)4v2BhMe1Ls9Lq_PmPT$`QNzMuy1w z0rL-|cc^8E6ZSgXruY(sF02=R=SIeKSc!@{+j@KgYb4vd-zT-kZdSnko=1~5@%<8C zo-ub~J&iAiVb-!DXO+TpelZVv@ZvvD>|$N$bG+ich#fz6^%bm|v9^&|$7;EPP%^%G ezHy3g#-7~q1$ttJ-im*~uRzt9F>C!;$?+fcv_iT7 diff --git a/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg deleted file mode 100644 index f612f71b524355fba633a11914c31a0045cf7c33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3130 zcmW;P%T_Ww5C!0jeH8{GDC*!0L_iTmQB+{YMG?8lL;6mCshr;R@6(6tE#0P8`j>`j%h?s(s&QJSX9bgy^M zVx2B{?9v9#JU!@rW;fE;Om~p4jE~cCs-#7lL7S#CZxa@8B9zjR$X{&Q-fvh>p$znW zr*8Vy^OkbP9avQjcK$9@jCgXPHBxjgn{Wb3)br{W4t zeb#SKHVwQt@{O?>Z##&-m@F~K%%yRXF{e#v5?gF0! z)wfV9#=EX2tUBaZif>tL<)w+`ea7G*?*$A8n14Wz`7X0*&~*&y(p=W~eX@C%-7hT0 z-bOrT`s-L9XZh*y`xLJVp&$o!nH=-U=~+`e{o_Uf|dh zzmTC0s9TEj2x9?zBX1KUAD(S7^H^@(ue=54Ddo@lmMo&~OH`f7+qJwe^*>?pD^Ft? zxYSpbfmeJUsH|bz_dZrpCp^}4e2bIg6LWG2=T7EpdQZh{KtF*t#kJ#p<97Eqg4uuGBChlKq7#u z-=i#-dv9-|gvL`fGQw@yO=(~*=aqotivm0-~Anh zWg3=HzujMPjuq|1Z>Hzob8Y;ZUzL&*+(xdY_Y=IklmxR8ui)JDY|~J|a3=Fd>|?!Y zWeW0ID;Zp36{}p-QQdn5&qunivUzO69r}%oOkgco&2T@V`%&CK{&l?e?pvJR&Eq@! z7WQEql~K`iz@^{{uM3tn7Ds0GmhDum7R^1#MOE_dzSaMsCnEpy+VUG}T|isV@weaTVqtkJ#hp&|*erq90RPlIf_w zE!?JPJNFmkEqJl_#C%oc<%`81UK{z0@3=1hn$AZUd-ff@711uBo_qiDehzm;$180$ zehq#%tbbL>F|;pP=|kH27NW+xytiW1RA3F(8>K~7Lu1dzKFt0R`w9EKku!6$$6}A? zfOj{`f9za6?4Dr7*H(n`BPR`dI--7v-@|$gx54V1hHp&%;Ivu3W~)K0bx&D!#y&E3 zMJ-L>7R24)e2}TwFRoN&tOoJDwITkBRK2f(VSWi^!*^jA>lge|( z{T}+#@7oMS1x2Mq6@2K6lgppki#hG;8^ha)+=1L<_040I)z3=CX0*-u$LS_^wqI5o z+3%X~U>5aUcHPkaA&c=1-^=$I#!)S6`RPKdVS1&vpdGpkFiRp0MeK=P7q?2m5Bt6d z-(p{g&|$GQ68RZu?XsL#v}0ZAyT=!C;8$aNPTdclHL8}@sDaVgL%TS|dYjZL#zrP$UFyM#wfoesDB@g>W3A2M8vElB4zXi|XN^Ui_ukpWZ0Fn$`pz)# zLMUMtC)y^9*eCap%2dW06Q{E#27j2xdK9y94?oTY0mn$v)0uu_MIJAFEalTC7^nIK|ob$><77M-F?gIIBjLO)?d+ O_6CpmkFZbwx&8+h3kqxi diff --git a/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg deleted file mode 100644 index 0c2959a189fbb34962c4435e33a0b7b4d772ef0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3472 zcmXBX$yPE;5Cq^_^C~Vx@K;>QBp^4Qg-P5P(?yAhl$jI!f<|!Sd z(=<+Z=`|gt!*rhh(meg9YI-pKon9RGsg-WhS9(elmaTM|Zqu6eqvu_EPK$Jsx<S>wYpe@orPcs(xA{?cH$Wu0b&u6R`P{zjQ zX^?(!y3cc0sg_o3s(x2&T4@jG$JFLAVbPS$V;ah;&3}Q{Q5uO*`$=6K z?ueX5tnZ<2WV&3BxhwFVLgjRW|4H+J|(amQ8-IY#yjP z#bV;=na7*)HrD%DpGSVL;x!Av zI26B>QOB}diE{;G3424gnVA>YzL-TUw|-AO1?Pp#d&X8QqVJDn^^a~fy0461WAQ_$ z2?b7!H7Ib0&xI_T*p56;bkqTlPkGG6+2a#6If2umeADQmnCH+Bpe=BH^n2z!gn8q9 z$kpy=1{?N!yhfSrI_FsQRLN?e()5|#0@6h8f9?yp_FdhwP|=1A$`lyqw`Y{Q|D12z z$b^P#(OWFWVh&sv>bLJ&Y z{N8tDU6sQM>fG-g&at8$INywPT|dp&_%&p5fZMZU<@o^bflPwgGq2!$>Dre=9m6;8 zc7c7YH#a$hqPsN(S6Ia=7k$+BT*vcD-lx#UFh=G_Fi&{h(zFX}C*C2eYc?xh`;=(Q zYpSDq&XE{**)}?(ZsZS_sO6y^tBBiVQGnGFBi@UioQG`7Y)gLUFkY}2seUheUAd1H zyRD*M&Z7BPFaLPoWfe-eykj)eI~{0U9woZJvmNTGDjl|1{bCfW>@?S>jKj#xEj~M* zU-0HM?nD1z^W%P`jtzOonsRQwEQ@RLH{vWERp(SjEAe8*4-T=WMfdL@bY%Q1;@E7w zZB_m)ow$`plQOZl{ogY$=3@=4$~o#)%N#yjzo2(vox(iBx2)a|bRV-{$fyW!-}x%W zFUuy&c*95Tn&L007dy>@RaB*9v<)?Oj*(~;yuQS}H2&?ZWrc<~^vqq!sDSf~?S1 zHsbVh?{sN85Fz%LU+1w%eSWbEenb8hvxaZYF=e~Ms70l+@j2@?oPyt}NU^@p#gF~5 zgIiO)HuNLeS7rQ@0kO|Acr)t*Aq+E3xNX!TR$)H?!q8-`FGDW-eqB`}T*tAH|D0 zE+DLB`-e%}-42`BPva}1&-MrUCXYmYLY-I{->vY90dkP)S;a__`g;+Kh-$-9(*129w&+#SDkn0x83*UId z_l*9rkN&*MYE>Y_8ulRbA-3-rM6bmCGwxBpjghI08c-{af%!9xyCNLBD`WD6|AcLm z?E}l`z&h1N_%u}{GM@3+>YjHN_xUaO|I6ze!&f@|KnlbjP951t?|_ePA^)z>0K%ukrV7=1u3L3uG=rBt1N5kebQd}~~qd7{ITSLE5$eP^)7qJ8)s z$~AVg0`3ni>a>ZkiTLu2-ih@zz8pqb%d(h96pnA3=z|Wt_|Fr&SR48buXrzF$B$io s39DkRY39IKC1(&yHpSlI6yJ;;vEvK$OwaZC$G261s?jkk^;nAWA0pgA00000 diff --git a/projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/datepicker.css.baiduyun.uploading.cfg b/projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/datepicker.css.baiduyun.uploading.cfg deleted file mode 100644 index 898a600ea14498d104d6ffb39aa0af439aaa6072..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3472 zcmW;P%T_8e5CzbT{S^lypcjWAA}9!o_+W;jJmnz@!q?wjy?S+%PO46wI;l>=dpb?! z^p<+*Go7bmx=n{PP5V?y&-!=i!}XNv=|26Y_cUTzPj{)C)~sK=Z__Z%(nV_O-Ld#i zB_7+ff%BDGdLP&g_1&c#$YtZBbdsuRk>=25>CD@N#gho<=}6=;n@8{0tY=W(^i9)i z`b%xSG1g93Y3X<9xnxsM$2h;F29FVonrvQDUsetNGrZ2zK%|QHt=}B1XF1&YJ@-3v z{ZJyu`cnLP`j=L$ukm>_b}3?HFqX|$?3G-1V&3y^^BKBtMVxA__!h-(LM*yRa;;`L z4Ol-x-NpIk`@mJR!tOn$sjO#3Z=yHc;Gh=X|dmh6#%s-&Vd{@}q%IgHug}JQp`(*P>-7yv; zZ$ln){SB;7GJUH2-dSBi$kU)f$q}DpJ>N2(^L$`2H&_3Ry;FRlf5|`UrbV-r(V3hl zv@Ss}%kvz?VFoH0g_< z&rsiFw-l!hV*z_Zw~3JtzmH<(u>A2XdkfApnLp@TvWU7rm(>~FF6qA1-}d|yV?==q zeODCd;nR|34cmeDk%~Iy@hy+3ILDaBoLs=Up?pnmQOsNDr_g4&zIa}{i!krq&)IB0 zW(+p$k9iF;w(Bg%oVQY@cA2I_b~8vLxgWHTvbk@nmYEs7l0gCUH_sP-d)#jMG~^hw zu-01_`Ay6Qn;qWAYQ2J8Xx_zrlGWP<+;6r~QF+%Vhf!8{lfatmuD5G4f<$cQP z9+MW9Iox+5>{MQn&t>Mj$mS_Ld(>&+bD+Sx{HEAO?Y#RcUoq{#*=luIHsIy6@BT*C z6`Yn(r=C5WV?{f4&-FC@ejC5!cO`>U+=i~D_fx!IWfIJWyn^$c-$yxAF`Uc$h<&U# z_gMxxt+i@dVil`g)KSBG70;LP>gd;< zGal>Zfp;%cA&<)!MiaGi1Fgv;PxmjjeKlI4!w=*=MzP9{v-v6DFfh`^XUp>!-jv3% zGpyMBX%EcfmAqq3xiwzErz8GGoQ1369?NJcUaa`RA=b2a&n<+TtU_b=8N=POKNj^I zn-@w%O-1cR&3qVtF~K=E$bVz-QrTGQURAK>ouGs&#_3czE90d?2k9FYvMI9 zIhTD!#6O;M7&UswdN|DHHNMpx+!~c$ajVg}EZ<{{a_sXMti`()F>1R3XGWQC_CwVf z*|xCgiXW>)?58hUTQ>b{9%5aIm8}iy;9IL@mOH+&M>dSKWD@)K%FMlp7xOrSu$Jus zlZI9(7yD_PA|BcPLEmIOp;V|7E8{eq^;Pyg#OdHt?-ATSMyD_*@JHIOBDdw#5INSt zbDUy*i+Oy7)e>>SD{6bs?^Ud__Px1?-QXa*SfAn)c*e4>uHvk?qV16Hr|SpeKZ;JM z7~f0q?TUXygHATLF>lW@>&hlLg;F~xJsC#L#g4Op7T-~*@Zi}qzia--;@oRh=vZ~H zjGr0{W#&dFqBX@YunQe-snhXZhFCBbXQW>v>ukOj-s2>2CD$J+e(;Si{8;aSeVl*V znOY?Xv4%a1+Q&9_(x{ba4{?wA+vpj~=n87d^=kYYuciq9v;Wzi`xIj^Tl1ksK9FlBWAMBYK~7G zR#8^5zpdpqaqo@AI#-naFRN-cKjSQq*iWzEMwT0quV7vBdJ^f)`*+46W+T>~DesLK zv8%5|h?w6n_ZY39=AnG(uTZMWKL?=!>yzD`k#{;QctxHy)prf+O|+F~U#_v69pV1W zqDq@MO~lEwsCHsKjg!M5)3PAuIfdhF6LoL{FaGnyF4llP!7ILt*zsdmU%)CEs~I`f lSIRO7C2L}Daf&nJjo5Jly;h-*{NrqOMAfL6I6KBV_8(;YLcst4 diff --git a/projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/img.gif.baiduyun.uploading.cfg b/projects/fangjia-pds/src/main/webapp/static/v1.2/js/skin/whyGreen/img.gif.baiduyun.uploading.cfg deleted file mode 100644 index 8a5c576b88e91f764f7f98014b7504746bce445f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3472 zcmXBWOII?z5(VIl{VNPWP}IR0C>KEl1-u|LP(4UB;9#U z$LTVS(_?y1<#du-=`Vez-*lCp^&is2^^_W^oBpNOG=*%WPU@#`=z-^bdQ0ud)a;N z+F>g|SLiR&S^9#$=I6m!g<@pzA)9@w89TUgs!}$xZegDq=4gD`hpf<^RUjH`b+H<)?(_BCFLs_ie2e-W5N8 zvTk6l8h>$ha5XVM%D4fsQ0V(^lW6j5ZQxRn5#2muPVOMzZM_srmbdQM(1*# zsr5PbOL>+t{6Lo=Z+U#De9M0U@|4OD%UlIJw2N6)F8C?X8fCs$5F_kcxS9L8nhfa| zGuE-})^zT0tZ;ADZDwTR{y?+9<<9@5r|>+Nc~9ROBG!FbR;TJ#QTMg}JO4j4rYdlu zuciWz{Iq3R=XT_IYDFE3*vR9PPLA`KlM6gIDqq)oLbHYa7~7oJf&Xj26P#VY=WMng zG6!4uoTyRe_B+e5;ORW8_NAJ>!ObyE<^HFAl+FFE)iO7uH5rsRADiEIaZ43wK{oaL zx2smPzdV(*8CjaYJZD$p*SvK(pULIIb&%Dy>r`aS#xbS7$O>eGQkTycJn^omL&T0f z<>!*CgZe#jaKgb0jR9{{*amlP?J};hd+d&`y4A)0=!@Dt!jI$-GqY8PzDiEqm!3bN zx>VX+7U&)*94MWLsbsOMY@Q{Xq^@4j1*JVt#1`va}{s7SVv9IRX*={xx_ZcF)}`)60_5{x^Hpq>778`!>mQ+RiY`c4=bwY zH=^;FVPj=f_5ATtbVby;_&UT9t_JL!R=l%^G)k~V|5N?(wFu=OQ9E(3TIbkSa_P%( z!vB(XXvGYbWViJHYvt6i-FPbEF2Xjc)YM@odWNHC?89?Q6;@OpF&^>N#~r({BIZs_ zhBPa5S{N48D_S>P=k!goj8~X`{5E{7^~Vb9(^z77rMc(l2D+?gn9az7dS0Hf5@Y@C z@OG%}{rAmS7himPV!ou#W3VrX{FXV?ARN86CmT;15Pl`G{S5;Bzec zC98jYxrVB9kLy!Z3Cow7wB$3OI-x)0dWyFNbtZ>6A;b=Rz);KH26tSK;l3%ydnb0n z0_NIGovPWVyxMkneBbweUFv)BF_$s3@r_zz_~S3Wd6!0ZYVZWPr`l1AeKx;wQt64_ z8tub2F!U+?<2KgwmFrsW6IF~o9NtdNN352O`n+JPb9$+_s9ntNXBbM@|ER|K~ z$~p06wP|X{m!<2vz#gZK0v8SXGcMxY8)u`I$fD;9UZMs^cv~DDo2waoTl)m6O8?`yXGlxwd6$qW*TvB z+iQKA!yA6;MkdC;RA@(O>9@diDZ^JzV)vJLIu_IArYB zp2q1e{YwX_md?{Qy{5l(k{#_9A@CT4P9Uv>w8U4 z={IYMv8&WdOZT`gVLGWq^JD6Yn2Bzw<}nRb)fHdRb&y6fooJuCmvKF);nMxUy>P5J zQHE~FzetDa1G-Jmz*s}Zs9>&|bviY+ag?}nVC0SZH@uHjPK_P%ambOC`-+~XBWfB! z-(&q&>DoEq$d$Tg@}6jar|VR~UNu(D9`xuxbM%ef$lau;isv|cbxr++);r#JdbXUKjO(y{z_&Y z=hageUl{)f)r5*Q*5qLo&nGv^lnk=wLglymmJqS-4^*|!w+7#r`mbDn<(P5cSl=lJ z?&!HtWsBO8=b06?C*n&Tukw^Ak2yKUbH@3W-kO}}*!Qp%v_87Foi&^{&WAkPgRI~i zz9edt)qdt0%bt$1+jX8!;R;MMwQsd|^4#~Vmcopls-Q~w*!4?X!GWIVuAXlmesQL) zHI_5xVPSMvt`q8Jw6*X@#4&X>=ni%JdMf<<71uY`H0K==H_#V+ioK#mOU0U6(NnjA z*ZS{OT9fYyen{IwUq^kD{O*K?xtJSyo8td6e|UEXKcYEi=9{)YC!gKlJikKSP;^04 zS>BBd8<}ci8aeho&r?L+QE@@fmirU+y;2ctXX34VqVyWiTI(9Jn`?~s{!G;;G%c~d zy57+oJKCOep(p(MGTsn(s)9Y*rjDiOJ-VM%63V8cLi45jKn>yAf-^htvESU}3d&mH z;F7A?)jALYcg!5QbpQk-sYx!zW*Dy;_yPW8%Yi`bNog+E!GB#F5 zQ_q%`ilb(Y9nsQ)*um3*E#w-jd5EDZuI>7w|5;C5=Q-+1`(A9<-2UV@_nCq>%ylv0 zLdE$;(F=w%u{{wLzQ1u}D9Z^SR#g2_6uay^&rdaLI8 z*1U-w@Q9Y!pTfOZ%YW4T!hKr96MffWV+Kb?w(v_zVmEk(9%au4YKZsY4(cT{>|Jn7ryzEJRvE57M%@oz?2YL0)LLlL+1d>UJ+tYFMsS3 z@jZRiTEh(UJjA{dJKGhmt@pW=ksGn`jqDn^P)XgaeaOF-?>^Vk6SbhOWbBjX+dTgh zzW3Gm>-igF%+GFiXP~M%hI8mPC5_x)rssqEU!31U-;4jEa6`|Z>?IKu%-`^l=}v2| zvU8OcygSe;D4ZBO6gx8;yHu88UUP?1$aebV!w=RD6r3(pFFyz>u`B`jMUF~7sSmKK>|VYFeD z#UESjD)Ig;sEI%5zdVm~eDPISS^G~I+Z2uYx2sj~&4fO)+fbdX;OYKX&|Eqf^SSp+B`Ad3Z_DpS};=FWT==F`pgo#I6&6 GME?Ouc?#qJ diff --git a/projects/fangjia-pds/src/main/webapp/static/v1.2/style/datepicker.css.baiduyun.uploading.cfg b/projects/fangjia-pds/src/main/webapp/static/v1.2/style/datepicker.css.baiduyun.uploading.cfg deleted file mode 100644 index 20cd31e152242f4a6f34e924019ff6e20fa5f20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3130 zcmW;O%U0?@5Cza4`zs7YP_GU_MG#a3-!lXS0eOgm@b!0BudF1U?y6I#PE|VTr-M{U zZ|Na@q~mm$nrWBDX`8C)$^0h0J04R#-KF2uPeYdVbd$Pi$@67;gQa?Z1b|COU_?N01-e9AI8&04jwzc!k|o#C^S zbsg%t^%utttOn!<8P{3-(B%fpR%WoHdkMog%-^9$y{l}R^4f=Vs+Ki=A8ekeJHle< zX~1J@zJc|A*5{mGpVb9~5)B%Z9P%lc`IhmNXNSd9t^Qf-Q+#HA&OiF*nq~{D6FGm< z`UHAKp2raWSeIG0aQqOtg@2LdktnZFCKS98yOdQq#iuA%FY}(U=s{nx`*c5{$*cIK zjQS?Kxj45lX0TUu`?T`zelKPb%OBT@r{Fx1dB@zGMfCl#td8h*M)$e-Th~7^h7>q8 zcR_&%e6D3#!?x#nsG|;ee9L1jP66|%$tj#G%Gb;uirIvI0BwTnv+Jev5aylpDOdYG zGgz@N@ako@%ba7;(@9plLel}e38bOicgB0U_AT8qQPB$-lrevEedf2tt;we$$Ed>6 zY+d9xF&k_)co+0~6}!;9i~DEpw^O*^Y@?$}jt|Hyy#HCGq-2?lc9HKHSI&>-d?*8R@%<2x4 zYb=YnZ$#MWyhA=`*>{%f6rK;%xyENlfxi64*hcU4y_GMRw&ARe+AJIJO8LFNl64iQ zIn=T11J1Fd9XO|ETJGQ0&-h))-~hLQWA6C??-!W_vjMN*eB*vEhjR?4^4?<~`^{a> zplGzzEpx15my14Xcs|GTR^An8Z!mh+doWLVb!pmywHEJ?Rh!M6*FGg0@*3%=jk5Cud`@9 z_RAgbhpa*gmoJPy^~x2r7LO9$zu3O&(JCE&Aa5~>U3Qe~Q^uiZrHjv+=P$f5jpNI( zVDo3(Q^yN=$DY!(UdE>_{z{ygqv{;VXf9st_`xCew7%;a!d33j`1*|CuGtqvJ;vsl z646u9d(kuR)}O6cFYHqawV0XY~7)WsPOL;XR|8 z_!H{ImuA8$s!}rBfEizoo@giH|B8EKe&amL3ccdcv34t?J#jzTUW6{h74gMc;8Hc}vTkS19^^0;DSBzE zHecc{jCWYZ{u8=a=^lINCENx3j$@<}J#3buMJHcUx+VXpP+Qh3_R&9&;&=4I(CVc) z@n!3Zw9TDzkNvB;c(-Ei(`v=si0vAeI+e<}j9D+??75Caiv4}8F7bW5f?X4@fyuG# zt0MmKoWiKlJNCmtu4}xjMYuI8z2H`(b49)djEd|_7%auR6ft_c0cS#)Z}tP-8QETA z(G@>-iTIvA8?D*A<~qc_5naD#q71Gz}#tctxyx9O7T^LhZke;!87^@eaSXNU;OPf9XxO3A6+2MKONZ zjNry!M^nUd?xiz!(SsGo40`;hz2o`;c@Kwswo!u`oFDj0m40GbfU<)T^?l8~G|dQ8 zt7p0_-k;c2;{BUq6MxX#T*nc-_$vH(A73C|V)RD8eWNmU;%_Vd1>);}kK0;=9ZofT z;@cS2h@I<))t7q3J9kdG0fdcMW3h(jW5@4U9bn#Oy)=5J;SEMxa|_s?#xqt?&pLHt I*NH!(|6U^t761SM diff --git a/projects/fangjia-pds/src/main/webapp/static/v1.2/style/dialogBox.css.baiduyun.uploading.cfg b/projects/fangjia-pds/src/main/webapp/static/v1.2/style/dialogBox.css.baiduyun.uploading.cfg deleted file mode 100644 index e271d60c6d7179abb5c6a6d1fbf205b49b833855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3146 zcmXBWOII?@4h7&E`&S%*+|ZUuD?7fpzSJitu zN!9e09@A&4q*7|7Lz z1$K?)7)ldzGhOhTQdrZ0Erx>UGRz{6K8`$uPxaZVdC%C9w;`_)tQNFe_XRaY*T~qF zYF(<|5^kPxz_5|)hVKDl!N`u!r~W=uQxo@1-5KjS{SB49l+7~*6TD-d z=ULaTc}M4>K1Fe#BI|wyo^_S1P;!iCqhr6A`jpQ3g_5PpPx&k%x8)i=oZy-n`%;l+ z#(E87B6dVUV0UnQ@*l`&Mqku;?&-$8MAh0=q9?CT#}J-fulR4}aSHcNRxjR8ur$nw zp|~YQ9hK=qp3?YbH24mgl3^BEW&g*2?%sp9LP+mtu$*-pZtQo!cJpbGe*egbJ6jWpr z)o#eENx_DWGgw2TFK{~WK48r7=2`YxzqWYVu&SziPf1kc&Alk@z}|-1#ImLOOl__) zzlp5!_%#}Hx0ZFUpdSAyXl9i!;g9d3tO5n~yvq<`HkM$-{BGz+bgAX3K>Z)zBe*+H zYgz_87j(wVp3uJ*_a&!T54JQ+MBVehbp6RD=JP=Qr_^+KhgU&$Zy@Hy*HyE~tBm)H zB_}4Lp6EP<9bZONJ63|Nj$F(9h=vNzz1Ua1-tvlSu2rqf_Ci5j#uZF+if)YbV18x2 z+e5tLmxGXFU8q-lFJp?k)W#Z9=kbB7o2ibj#0u0Bm4_P9F%yp|oXP4)C)$+U!^->B zvOJscqn<07HnZ8Z^>%}$f~}uraDwHW$_F~%TqAt(9dx1mH(z3Pe3iq8>sj~ivmDwK zP1JZ`Hk8fRSR*=WyTfo#&xZCPjH|lNs`yeLfdfxcZ zckv4;*1Kg^k8kz|2=9E`{0h9E*_J9$Rmb?6{wR7E8OmC?7LaSAj*M2s)c9P$?$CD* z|Aw^%XP&XQj1|>1zTF@BF5pbuzv}_d=#{FV|nWuSNW~`}8yBW3d$&vG1Hw za|?f`V+EGJh#JJ`SIn#l-#=GQMzJQunzo_gQ)a)O2ddSV{gy}0+r-!#+;@2lXlYPi zk$+b=;#JKz@<$a=ikD019?N!yRd;j)) z#kZVgc@Vdwr{-Q$_ZR_n zTs3%c_L#WdXe?v@;PvY1US)TDpZQiq#Yw5m`+@yLbz|2r;yh&kQSZDAzWKjmoO-(z zagBc^m)K7qq3z`UDw7-yZ*Z4X6kyz77_sc>x>loRHqy=%uJm*x-?kpk)oU%sQ#1I| z(+|I*iZyY))BY=qSSw?XJQp+JS#lrgN0B}D`W&t}Z>;cbUVO~NW6uQ$ zv8Tl>z4tU>Z^ipBY>Vl>W=v2)dFSbDmokX!@E4uP2|1nMP80Knt zn$6Y+{IQ?LJ{c#_1@@T#u>vjqF6p|%68re8n#3xx@gGV`DmYc!4n!*67)hCR+J zO`V8SWL{)^^>MChK!~s8BFnX_{?!aIYTv=zg?!{2+3=11u`cc(mX4S^u{kIQh-GSr z^i^aRC)zpPHTmvYYuG9{^CE85?vGELwMzWjV&crwG4J+t#u*^y=Vw-zIF;Ut9`M|; z^ySl{r@{Wmz7`SZmN8|>JSIO7`;|xD@@9ABfDkmyX^SqYn0BY=*dq^ueMlJii WeyEKKm5jdekMrr&TbxS%=l6e?G6w7b diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy index 004d6bd4a..dabf9a38b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy @@ -32,7 +32,8 @@ public enum Watcher { BaYi('15300424133','bayi@fangjia.com'), WeiLei('18101751850','weilei@fangjia.com'), JiangYaHui('13684913780','jiangyahui@fangjia.com'), - ShenJian('13764369683', 'shenjian@fangjia.com') + ShenJian('13764369683', 'shenjian@fangjia.com'), + MaJinTao('13607600062','majintao@fangjia.com') private final String mobile; private final String email; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy new file mode 100644 index 000000000..641c20b24 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/getAllCity.groovy @@ -0,0 +1,57 @@ +import com.fangjia.core.ProvinceData +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.util.ExcelUtils +import com.lowagie.text.Row +import javafx.scene.control.Cell +import jxl.Sheet +import jxl.Workbook +import org.apache.poi.ss.usermodel.WorkbookFactory + +String excelFilePath = "F:\\估家\\文件\\安徽省联社\\全国省级行政区房屋覆盖情况表 - 副本.xlsx" +ExcelUtils.removeEmptyRow(excelFilePath) +ExcelUtils.singleThreadingModify(excelFilePath, { List items -> + + province1 = items['A'] + if (!province1.equals('黑龙江省') || !province1.equals('内蒙古自治区')) { + province = province1.substring(0, 2) + } else { + province = province1.substring(0, 3) + } + + println('province: ' + province) + + def citys = ProvinceData.getAllCity(province) + println(citys) + if (citys.size() > 0) { + ExcelUtils.writeToExcel(excelFilePath, citys, province) + } + +}) + + +// +//import com.fangjia.core.ProvinceData +// +//import com.fangjia.script.util.ExcelUtils +// +// +//String excelFilePath = "F:\\估家\\文件\\安徽省联社\\全国省级行政区房屋覆盖情况表.xlsx" +//ExcelUtils.removeEmptyRow(excelFilePath) +//ExcelUtils.singleThreadingModify(excelFilePath, { List items -> +// +// def province1 = items['A'] +// def province +// +// if (!province1.equals('黑龙江省') && !province1.equals('内蒙古自治区')) { +// province = province1.substring(0, 2) +// } else { +// province = province1.substring(0, 3) +// } +// +// println('province: ' + province) +// +// def citys = ProvinceData.getAllCity(province) +// println(citys) +// items['D'] = citys.toString() +// +//}) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_CommunicateLog_info b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_CommunicateLog_info new file mode 100644 index 000000000..e69de29bb diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_EMAYSDK_info b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/sdklog/sdklog/sdkclient_EMAYSDK_info new file mode 100644 index 000000000..e69de29bb diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy index e6b861ff6..b84e7f062 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy @@ -5,14 +5,15 @@ import com.fangjia.script.util.ExcelUtils import net.sf.json.JSONObject -ExcelUtils.removeEmptyRow("F:\\估家\\文件\\北交所\\testcopy.xlsx") -ExcelUtils.singleThreadingModify("F:\\估家\\文件\\北交所\\testcopy.xlsx", { List items -> - String excelFilePath = "F:\\估家\\文件\\北交所\\testcopy.xlsx"; - String comprehensiveUrl = "http://192.168.10.15:9180/comprehensiveQuery/houseValueInformation"; - String communityUrl = "http://192.168.10.15:9180/addrSvc/avgPrice"; - String valueUrl = "http://192.168.10.15:9180/property/addressEvaluate"; - String caseUrl = "http://192.168.10.15:9180/house/case"; - String poiUrl = "http://192.168.10.15:9180/district/addrFacilitys"; +String excelFilePath = "F:\\估家\\文件\\北交所\\testcopy1.xlsx"; +ExcelUtils.removeEmptyRow(excelFilePath) +ExcelUtils.singleThreadingModify(excelFilePath, { List items -> + + String comprehensiveUrl = "http://open.fangjia.com/comprehensiveQuery/houseValueInformation"; + String communityUrl = "http://open.fangjia.com/addrSvc/avgPrice"; + String valueUrl = "http://open.fangjia.com/property/addressEvaluate"; + String caseUrl = "http://open.fangjia.com/house/case"; + String poiUrl = "http://open.fangjia.com/district/addrFacilitys"; HttpRequest httpRequest = new HttpRequest(); map = new HashMap() @@ -34,27 +35,27 @@ ExcelUtils.singleThreadingModify("F:\\ long start long end -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(communityUrl, map, "UTF-8") -// -// -// end = System.currentTimeMillis(); -// items['D'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(valueUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['E'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(caseUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['F'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(poiUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['G'] = String.valueOf(end - start); + start = System.currentTimeMillis(); + httpRequest.getJsonContent(communityUrl, map, "UTF-8") + + + end = System.currentTimeMillis(); + items['D'] = String.valueOf(end - start); + + start = System.currentTimeMillis(); + httpRequest.getJsonContent(valueUrl, map, "UTF-8") + end = System.currentTimeMillis(); + items['E'] = String.valueOf(end - start); + + start = System.currentTimeMillis(); + httpRequest.getJsonContent(caseUrl, map, "UTF-8") + end = System.currentTimeMillis(); + items['F'] = String.valueOf(end - start); + + start = System.currentTimeMillis(); + httpRequest.getJsonContent(poiUrl, map, "UTF-8") + end = System.currentTimeMillis(); + items['G'] = String.valueOf(end - start); start = System.currentTimeMillis(); def content = httpRequest.getJsonContent(comprehensiveUrl, map, "UTF-8") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy new file mode 100644 index 000000000..be231cc4f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy @@ -0,0 +1,54 @@ +package com.fangjia.script.majintao + +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.util.ExcelUtils +import net.sf.json.JSONObject + + +String excelFilePath = "F:\\估家\\文件\\北交所\\暂时不能估值数据 - 副本.xlsx"; +ExcelUtils.removeEmptyRow(excelFilePath) +ExcelUtils.singleThreadingModify(excelFilePath, { List items -> + + String comprehensiveUrl = "http://open.fangjia.com/comprehensiveQuery/houseValueInformation"; + String communityUrl = "http://open.fangjia.com/addrSvc/avgPrice"; + String valueUrl = "http://open.fangjia.com/property/addressEvaluate"; + String caseUrl = "http://open.fangjia.com/house/case"; + String poiUrl = "http://open.fangjia.com/district/addrFacilitys"; + + HttpRequest httpRequest = new HttpRequest(); + map = new HashMap() + + String city = items['A'] + String address = items['B'] + double size = items['C'] + + System.out.println(city + "---" + address + "----" + size); + + map.put("city", city) + map.put("address", address) + map.put("size", size.toString()) + map.put("strctureArea", size.toString()) + map.put("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") + + if (!address.contains("%")) { + // 发送HTTP请求 + long start + long end + + def addressValue = httpRequest.getJsonContent(communityUrl, map, "UTF-8") + items['D'] = addressValue.get('result').toString() + + def value = httpRequest.getJsonContent(valueUrl, map, "UTF-8") + items['E'] = value.get('result').toString() + + def houseCase = httpRequest.getJsonContent(caseUrl, map, "UTF-8") + items['F'] = houseCase.get('result').toString() + + def poi = httpRequest.getJsonContent(poiUrl, map, "UTF-8") + items['G'] = poi.get('result').toString() + + } + + +}) + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy new file mode 100644 index 000000000..41494caf2 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy @@ -0,0 +1,13 @@ +package com.fangjia.script.sync + +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher + +@BatchOwner(Watcher.MaJinTao) +class CommunityHouseSampleBatch extends BaseBatch{ + @Override + void process(Object args) { + + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy index 87c14b741..60076381a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy @@ -456,7 +456,7 @@ public class ExcelUtils{ def body = data.subList(1, data.size()) def nThread = Runtime.getRuntime().availableProcessors() * 3 println nThread - ExecutorService executorService = Executors.newFixedThreadPool(3) + ExecutorService executorService = Executors.newFixedThreadPool(1) final AtomicInteger counter = new AtomicInteger(0) final double total = body.size() for(int i = 0 ; i < body.size(); i++){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index d066c60a4..89cd6a07e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -467,8 +467,7 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { //将数据放入样本仓库 for (Map.Entry> entry : map.entrySet()) { //超过两个,只取两个 - // 取三个 - if (entry.getValue().size()>=3){ + if (entry.getValue().size()>=2){ querySamples.addAll(entry.getValue().subList(0,2)); }else { // 不超过两个,全部放入 From 8dd7ad650a20a857f8e26bc3dc5721159c1e63d9 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 29 Dec 2023 09:35:52 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=8C=89=E5=B0=8F=E5=8C=BA=E5=AD=98?= =?UTF-8?q?=E6=88=BF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-script/pom.xml | 8 +- .../sync/CommunityHouseSampleBatch.groovy | 343 +++++++++++++++++- sdklog/sdkclient_CommunicateLog_info | 0 sdklog/sdkclient_EMAYSDK_info | 0 4 files changed, 347 insertions(+), 4 deletions(-) create mode 100644 sdklog/sdkclient_CommunicateLog_info create mode 100644 sdklog/sdkclient_EMAYSDK_info diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index cd1282a81..4d279deb8 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -530,7 +530,13 @@ + + + + + + - + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy index 41494caf2..7e007ed94 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy @@ -1,13 +1,350 @@ -package com.fangjia.script.sync - +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import com.fangjia.datastore.driver.DSCollection +import com.fangjia.datastore.driver.DataStore import com.fangjia.script.BaseBatch import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection @BatchOwner(Watcher.MaJinTao) -class CommunityHouseSampleBatch extends BaseBatch{ +class CommunityHouseSampleBatch extends BaseBatch { + + DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) + DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) + DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "192.168.0.43", 28017) + DSCollection SEABIRD = new DataStore("seabird.db.fangjia.com").getCollection("fangjia.seabird") + + static void main(String[] args) { + runBatch(new CommunityHouseSampleBatch(), args) + } + + def findHouseCase(Object district_stat, Map houseMap) { + // 查本小区的房源 + def houseQuery = new BasicDBObject() + houseQuery.put("cat", "sell") + houseQuery.put("city", district_stat.city) + houseQuery.put("region", district_stat.region) + houseQuery.put("district_name", district_stat.district_name) + def houseListAll = SEABIRD.find(houseQuery).toList() + + // 将均价符合的房源放入结果集 + def houseList = houseListAll.findAll() { housecase -> + def totalPrice = housecase.total_price + def houseArea = housecase.area + def houseAvgPrice = totalPrice / houseArea + def avgPrice = district_stat.avg_price + houseAvgPrice >= avgPrice * 0.8 && houseAvgPrice <= avgPrice * 1.2 + } + + // 将样本数据按面积段分,200以下每10为一段,200以上每30为一段 + // 分段的字段规则 area: 23.4 对应[20,30] 标记为 g20 + for (def housecase : houseList) { + if (housecase.area <= 200) { + def area = housecase.area.toInteger() + def key = "g" + (area / 10).toInteger() * 10 + def gList = houseMap.get(key) + + if (gList == null || gList.size() == 0) { + def gHouseCaseList = [] + gHouseCaseList.add(housecase) + houseMap.put(key, gHouseCaseList) + } else if (gList.size() < 10) { + gList.add(housecase) + houseMap.put(key, gList) + } + } else { + def area = housecase.area.toInteger() + def startPoint = 200 + def segmentSize = 30 + def rangeStart = (startPoint + (Math.floor((area - startPoint) / segmentSize) * segmentSize)).toInteger() + def key = "g" + rangeStart + def gList = houseMap.get(key) + + if (gList == null || gList.size() == 0) { + def gHouseCaseList = [] + gHouseCaseList.add(housecase) + houseMap.put(key, gHouseCaseList) + } else if (gList.size() < 10) { + gList.add(housecase) + houseMap.put(key, gList) + } + } + } + } + + @Override + void process(Object args) { + ExecutorService executorService = Executors.newFixedThreadPool(5) + + try { + def cityList = CommonUtils.findAllCity() + +// cityList = cityList.subList(0,150) + cityList.each { city -> + executorService.submit({ + def count = 0 + def documents = [] + def weekend = DateUtils.getFirstDayOfWeek(new Date()) + def districtPriceMap = CommonDatautils.queryAllDistrictPrice(city, weekend) + List districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lat", "lng"]) + + // 测试,只选一个 +// districts = districts.subList(0, 1) + + districts.each { district -> + Map houseMap = [:] + def district_stat = districtPriceMap.get(district.city + "##" + district.region + "##" + district.name) + + if (district_stat != null) { + findHouseCase(district_stat, houseMap) + } + if (houseMap.size() == 0) { + def aroundDistrictList = DbUtils.findAroundDistrictByRadius(district, 3000) +// def aroundDistrictList = (aroundDistrictListAll.size() >= 50) ? aroundDistrictListAll.subList(0, 50) : aroundDistrictListAll + aroundDistrictList.each { aroundDistrict -> + def aroundDistrict_stat = districtPriceMap.get(aroundDistrict.city + "##" + aroundDistrict.region + "##" + aroundDistrict.name) + if (aroundDistrict_stat != null) { + findHouseCase(aroundDistrict_stat, houseMap) + } + } + } + + def document = new BasicDBObject() + document.put("city", district.city) + document.put("region", district.region) + document.put("district_name", district.name) + document.put("house_case", houseMap) + + documents.add(document) + count++ + if (count % 10 == 0) { + println(city + "已处理小区数----------------------------------------------------" + count) + } + } + HOUSE_CASE.insert(documents) + } as Runnable) + } + } finally { + executorService.shutdown() + executorService.awaitTermination(Long.MAX_VALUE, java.util.concurrent.TimeUnit.NANOSECONDS) + + } + } +} + + +/* +package com.fangjia.script.sync + +import com.fangjia.datastore.driver.DSCollection +import com.fangjia.datastore.driver.DataStore +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection + + +@BatchOwner(Watcher.MaJinTao) +class CommunityHouseSampleBatch extends BaseBatch { + + DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) + + DBCollection STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.43", 28017) + + DBCollection HOUSE_CASE = MongoUtils.getCollectionByName("business", "house_case", "192.168.0.43", 28017) + +// DBCollection SEABIRD = MongoUtils.getCollectionByName("fangjia", "seabird", "192.168.0.43", 28017) + + DSCollection SEABIRD = new DataStore("seabird.db.fangjia.com").getCollection("fangjia.seabird") + + static void main(String[] args) { + runBatch(new CommunityHouseSampleBatch(), args) + } + + def findHouseCase(Object district_stat, Map houseMap) { + + // 查本小区的房源 + def houseQuery = new BasicDBObject() + //houseQuery.put("city", "深圳") + + //houseQuery.put("region", "福田") + + //houseQuery.put("district_name", "中泰燕南名庭") + + houseQuery.put("cat", "sell") + + houseQuery.put("city", district_stat.city) + + houseQuery.put("region", district_stat.region) + + houseQuery.put("district_name", district_stat.district_name) + + def houseListAll = SEABIRD.find(houseQuery).toList() + + // 将均价符合的房源放入结果集 + def houseList = houseListAll.findAll() { housecase -> + def totalPrice = housecase.total_price + def houseArea = housecase.area + def houseAvgPrice = totalPrice / houseArea + def avgPrice = district_stat.avg_price + if (houseAvgPrice >= avgPrice * 0.8 && houseAvgPrice <= avgPrice * 1.2) { + return true + } else { + return false + } + } + + + // 将样本数据按面积段分,200以下每10为一段,200以上每30为一段 + // 分段的字段规则 area: 23.4 对应[20,30] 标记为 g20 + + for (def housecase : houseList) { + if (housecase.area <= 200) { + def area = housecase.area.toInteger() + + def key = "g" + (area / 10).toInteger() * 10 +// println(key) + // 获取该面积段的房源列表 + def gList = houseMap.get(key) + + // 如果为空,说明该面积段没有房源,新建一个list,放入 + if (gList == null || gList.size() == 0) { + def gHouseCaseList = [] + gHouseCaseList.add(housecase) + houseMap.put(key, gHouseCaseList) + } else { + // 如果该面积段已经有10个房源,就不再放入 + if (gList.size() < 10) { + // 如果不为空,说明该面积段已经有房源,直接放入 + gList.add(housecase) + houseMap.put(key, gList) + + } + + } + } else { + def area = housecase.area.toInteger() + def startPoint = 200 + def segmentSize = 30 + def rangeStart = (startPoint + (Math.floor((area - startPoint) / segmentSize) * segmentSize)).toInteger() + def key = "g" + rangeStart +// println(key) + // 获取该面积段的房源列表 + def gList = houseMap.get(key) + + // 如果为空,说明该面积段没有房源,新建一个list,放入 + if (gList == null || gList.size() == 0) { + def gHouseCaseList = [] + gHouseCaseList.add(housecase) + houseMap.put(key, gHouseCaseList) + } else { + // 如果该面积段已经有10个房源,就不再放入 + if (gList.size() < 10) { + gList.add(housecase) + houseMap.put(key, gList) + } + } + } + + + } + } + @Override void process(Object args) { + + def count = 0 + + + def cityList = CommonUtils.findAllCity() + + // 测试用,先只取一条 +// cityList = cityList.subList(0, 1) + + print(cityList.size()) + print(cityList.toString()) +// cityList.each { city -> + def city = cityList.get(0) + print(city) + def documents = [] + //查询该城市的所有小区 + List districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lat", "lng"]) + + //测试用,先只取5个小区 +// districts = districts.subList(0, 2) + + // 查询所有的小区均价 + + def weekend = DateUtils.getFirstDayOfWeek(new Date()); + def districtPriceMap = CommonDatautils.queryAllDistrictPrice(city, weekend) + for (def district : districts) { + Map houseMap = [:] + + + + def district_stat = districtPriceMap.get(district.city + "##" + district.region + "##" + district.name) + // 拿到小区对应的均价之后,去查房源 + if (district_stat != null) { + findHouseCase(district_stat, houseMap) + + } + // 没有拿到小区对应的均价,找小区周边的三十个小区 + + def aroundDistrictListAll = DbUtils.findAroundDistrictByRadius(district, 3000) + def aroundDistrictList = (aroundDistrictListAll.size() >= 50) ? aroundDistrictListAll.subList(0, 50) : aroundDistrictListAll + + + // 遍历周边小区,找到均价符合的房源 + + aroundDistrictList.each { aroundDistrict -> + def aroundDistrict_stat = districtPriceMap.get(aroundDistrict.city + "##" + aroundDistrict.region + "##" + aroundDistrict.name) + // 拿到小区对应的均价之后,去查房源 + if (aroundDistrict_stat != null) { + findHouseCase(aroundDistrict_stat, houseMap) + } + } + print(houseMap) + + // 创建一个新的文档 + def document = new BasicDBObject() + + // 将 houseMap 和 communityStr 放入文档 + document.put("city", district.city) + document.put("region", district.region) + document.put("district_name", district.name) + document.put("house_case", houseMap) + + // 将文档插入到 MongoDB 中 +// HOUSE_CASE.in(document) + + documents.add(document) + count++ + if (count % 10 == 0) { + print("已处理小区数----------------------------------------------------" + count) + } + } + HOUSE_CASE.insert(documents) + } + +// } } + +*/ + + + diff --git a/sdklog/sdkclient_CommunicateLog_info b/sdklog/sdkclient_CommunicateLog_info new file mode 100644 index 000000000..e69de29bb diff --git a/sdklog/sdkclient_EMAYSDK_info b/sdklog/sdkclient_EMAYSDK_info new file mode 100644 index 000000000..e69de29bb From d9a0aaf52ea4efca3388ff0df1fa683709cc8ce3 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 2 Jan 2024 16:26:35 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=B0=8F=E5=8C=BA=E5=8F=96=E4=BA=94=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComprehensiveQueryController.java | 1 + .../com/fangjia/script/majintao/test.groovy | 44 +++++++++---------- .../sync/CommunityHouseSampleBatch.groovy | 12 ++--- .../com/fangjia/script/util/ExcelUtils.groovy | 2 +- .../datastore/CzbankSampleServiceImpl.java | 9 ++-- 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 710ced096..458b5fc42 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -228,6 +228,7 @@ public class ComprehensiveQueryController { JSONObject matchResponse = null; try { matchResponse = httpRequest.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v2/match", communityAvgPriceParams, "UTF-8"); +// matchResponse = httpRequest.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v2/match", communityAvgPriceParams, "UTF-8"); } catch (HttpRequestException e) { } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy index b84e7f062..350ffa191 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy @@ -9,7 +9,7 @@ String excelFilePath = "F:\\ ExcelUtils.removeEmptyRow(excelFilePath) ExcelUtils.singleThreadingModify(excelFilePath, { List items -> - String comprehensiveUrl = "http://open.fangjia.com/comprehensiveQuery/houseValueInformation"; + String comprehensiveUrl = "http://localhost:9180/comprehensiveQuery/houseValueInformation"; String communityUrl = "http://open.fangjia.com/addrSvc/avgPrice"; String valueUrl = "http://open.fangjia.com/property/addressEvaluate"; String caseUrl = "http://open.fangjia.com/house/case"; @@ -35,27 +35,27 @@ ExcelUtils.singleThreadingModify(excelFilePath, { List items -> long start long end - start = System.currentTimeMillis(); - httpRequest.getJsonContent(communityUrl, map, "UTF-8") - - - end = System.currentTimeMillis(); - items['D'] = String.valueOf(end - start); - - start = System.currentTimeMillis(); - httpRequest.getJsonContent(valueUrl, map, "UTF-8") - end = System.currentTimeMillis(); - items['E'] = String.valueOf(end - start); - - start = System.currentTimeMillis(); - httpRequest.getJsonContent(caseUrl, map, "UTF-8") - end = System.currentTimeMillis(); - items['F'] = String.valueOf(end - start); - - start = System.currentTimeMillis(); - httpRequest.getJsonContent(poiUrl, map, "UTF-8") - end = System.currentTimeMillis(); - items['G'] = String.valueOf(end - start); +// start = System.currentTimeMillis(); +// httpRequest.getJsonContent(communityUrl, map, "UTF-8") +// +// +// end = System.currentTimeMillis(); +// items['D'] = String.valueOf(end - start); +// +// start = System.currentTimeMillis(); +// httpRequest.getJsonContent(valueUrl, map, "UTF-8") +// end = System.currentTimeMillis(); +// items['E'] = String.valueOf(end - start); +// +// start = System.currentTimeMillis(); +// httpRequest.getJsonContent(caseUrl, map, "UTF-8") +// end = System.currentTimeMillis(); +// items['F'] = String.valueOf(end - start); +// +// start = System.currentTimeMillis(); +// httpRequest.getJsonContent(poiUrl, map, "UTF-8") +// end = System.currentTimeMillis(); +// items['G'] = String.valueOf(end - start); start = System.currentTimeMillis(); def content = httpRequest.getJsonContent(comprehensiveUrl, map, "UTF-8") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy index 7e007ed94..f5c0a94c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/CommunityHouseSampleBatch.groovy @@ -13,7 +13,7 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -@BatchOwner(Watcher.MaJinTao) +//@BatchOwner(Watcher.MaJinTao) class CommunityHouseSampleBatch extends BaseBatch { DBCollection SEAWEED = MongoUtils.getCollectionByName("fangjia", "seaweed", "192.168.0.43", 28017) @@ -85,8 +85,8 @@ class CommunityHouseSampleBatch extends BaseBatch { try { def cityList = CommonUtils.findAllCity() - -// cityList = cityList.subList(0,150) + // 测试 + cityList = cityList.subList(0, 5) cityList.each { city -> executorService.submit({ def count = 0 @@ -95,8 +95,8 @@ class CommunityHouseSampleBatch extends BaseBatch { def districtPriceMap = CommonDatautils.queryAllDistrictPrice(city, weekend) List districts = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lat", "lng"]) - // 测试,只选一个 -// districts = districts.subList(0, 1) + // 测试 + districts = districts.subList(0, 10) districts.each { district -> Map houseMap = [:] @@ -105,7 +105,7 @@ class CommunityHouseSampleBatch extends BaseBatch { if (district_stat != null) { findHouseCase(district_stat, houseMap) } - if (houseMap.size() == 0) { + if (houseMap == null || houseMap.size() == 0) { def aroundDistrictList = DbUtils.findAroundDistrictByRadius(district, 3000) // def aroundDistrictList = (aroundDistrictListAll.size() >= 50) ? aroundDistrictListAll.subList(0, 50) : aroundDistrictListAll aroundDistrictList.each { aroundDistrict -> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy index 60076381a..87c14b741 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy @@ -456,7 +456,7 @@ public class ExcelUtils{ def body = data.subList(1, data.size()) def nThread = Runtime.getRuntime().availableProcessors() * 3 println nThread - ExecutorService executorService = Executors.newFixedThreadPool(1) + ExecutorService executorService = Executors.newFixedThreadPool(3) final AtomicInteger counter = new AtomicInteger(0) final double total = body.size() for(int i = 0 ; i < body.size(); i++){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java index 89cd6a07e..f2185a8ad 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/CzbankSampleServiceImpl.java @@ -466,11 +466,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService { } //将数据放入样本仓库 for (Map.Entry> entry : map.entrySet()) { - //超过两个,只取两个 - if (entry.getValue().size()>=2){ - querySamples.addAll(entry.getValue().subList(0,2)); + //每个小区取5个样本 + + if (entry.getValue().size()>=5){ + querySamples.addAll(entry.getValue().subList(0,5)); }else { - // 不超过两个,全部放入 + // 不超过五个,全部放入 querySamples.addAll(entry.getValue()); } } From 669b3ccc931ec5a82d888a54b25a3c8e1b2a7496 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 9 Jan 2024 11:12:42 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E5=B0=86=E5=9F=8E=E5=B8=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/ComprehensiveQueryController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 458b5fc42..3fbd49d50 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -213,15 +213,15 @@ public class ComprehensiveQueryController { HouseValueInformationDto houseValueInformation = new HouseValueInformationDto(); RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress()) || StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(String.valueOf(model.getSize()))) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city),地址(address),面积(size)为必填字段")); + if (StringUtils.isBlank(model.getAddress()) || StringUtils.isBlank(String.valueOf(model.getSize()))) { + mav.setModel(BasicModel.buildBadRequestModel("地址(address),面积(size)为必填字段")); return mav; } HttpRequest httpRequest = new HttpRequest(); JSONObject json = null; Map communityAvgPriceParams = new HashMap(); - communityAvgPriceParams.put("city", model.getCity()); +// communityAvgPriceParams.put("city", model.getCity()); communityAvgPriceParams.put("address", model.getAddress()); communityAvgPriceParams.put("category", model.getCategory()); communityAvgPriceParams.put("useMap", String.valueOf(model.isUseMap())); From cf41916ef3d0dcf1846a52c60f7d12684d09f137 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 12 Jan 2024 13:23:51 +0800 Subject: [PATCH 05/26] update --- .../ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../com/fangjia/script/gj/PoiLocation.groovy | 1 - .../fangjia/script/gj/abc/SuzouPocTest.groovy | 223 +++++++++++++++++- .../gj/district/FangjiaClientUtils.groovy | 7 +- .../gj/village/communityLocation.groovy | 25 ++ .../gj/xiamen/SuggestionDataSynch.groovy | 3 + 6 files changed, 254 insertions(+), 7 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index 0c632d5cc..bdbbf0757 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2023-11-26", "2023-12-27") + def prices = CcbCommonUtils.findPersonPrice(city, "2023-12-27", "2024-01-10") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy index 440d7495e..f0678d5b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/PoiLocation.groovy @@ -158,7 +158,6 @@ class PoiLocation { gmap.lat = DataHandleUtils.getDoubleRound(6, gmap.lat) } return location; - } return null; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy index f1ca243e2..bc770b173 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy @@ -1,10 +1,17 @@ package com.fangjia.script.gj.abc +import com.fangjia.core.RegionData import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.district.FangjiaClientUtils import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.GeoHelper import com.fangjia.script.util.OpenApiClient +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBObject import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch @@ -19,11 +26,223 @@ class SuzouPocTest { static main(args) { def task = new SuzouPocTest() - task.run() +// task.run() + task.newRun() } + def newRun(){ + println("start:"+new Date().toString()) + def filePath = "D:\\数据\\江苏农行\\江苏农1500条-test.xlsx" + newMatch(filePath) + addEvalutePrice(filePath) + addLation(filePath) + addAroundPrice(filePath) + println("end:"+new Date().toString()) + + + } + + def newMatch(filePath){ + ExcelUtils.multiThreadingModify(filePath, { d -> + if(d['G']){ + def city = d['B'] + def address = d['E'] + def name = d['G'] + def region = d['C'] + if(region && name){ + address = region + name + } + + city = RegionData.formatCity(city) + if(region){ + region = RegionData.formatRegion(city, region) + } + def obj = CommonDatautils.findDistrict(city, region, name.trim(), "district"); + if(obj){ + d['M'] = obj._id.toString() + d['N'] = obj.get("city") + d['O'] = obj.get("region") + d['P'] = obj.get("name") + if(obj.lng){ + d['Q'] = obj.get("lng")/10000000000.0 + d['R'] = obj.get("lat")/10000000000.0 + } + d['S'] = "直接从库中查询" + }else{ + //新的匹配算法 + def jsonObject = FangjiaClientUtils.newMatch(city, address, "property", false) + if(!jsonObject && !jsonObject.containsKey("result")){ + jsonObject = FangjiaClientUtils.newMatch(city, address, "property", true) + } + if(!jsonObject && !jsonObject.containsKey("result")){ + def newAddr = d['E'] + if(!d['E'].contains(d['C'])){ + newAddr = d['C'] + d['E'] + } + jsonObject = FangjiaClientUtils.newMatch(city, newAddr, "property", true) + } + if(!jsonObject){ + //老匹配 + jsonObject = OpenApiClient.addressMatch(city, address, null, false, region, name) + if(jsonObject && jsonObject.credit>0){ + d['S'] = "老匹配" + } + } + if (jsonObject != null && !jsonObject.containsKey("result")) { + d['M'] = jsonObject.get("id") + d['N'] = jsonObject.get("city") + d['O'] = jsonObject.get("district") + d['P'] = jsonObject.get("name") + d['Q'] = jsonObject.get("lng") + d['R'] = jsonObject.get("lat") + } + } + } + }); + } + + def addEvalutePrice(filePath){ + ExcelUtils.multiThreadingModify(filePath, { d -> + def city = d['N'] + if(city && !d['J']){ + def region = d['O'] + def name = d['P'] + def area = d['F'] + def address = d['E'] + def floor = null + if (d['H'] && d['H'].toString().isNumber()) { + floor = d['H'].toString().toDouble().toInteger().toString() + } + def height = null + if (d['J'] && d['J'].toString().isNumber()) { + height = d['J'].toString().toDouble().toInteger().toString() + } + def ret1 = OpenApiClient.addressEvaluation(city, region, name, name, area, floor, height) + if (ret1) { + d['J'] = ret1.totalPrice + d['K'] = ret1.avgPrice + }else{ + def priceObj = CommonDatautils.findDistrictPrice(city, region, name) + if(priceObj){ + d['K'] = priceObj.avg_price_2b + if(area && area.toString().isNumber() && !area.toString().contains("+")){ + d['J'] = (int)(area.toString().toDouble()*priceObj.avg_price_2b) + } + } + } + } + }) + } + + def addLation(filePath){ + ExcelUtils.multiThreadingModify(filePath, { d -> + def city = d['B'] + if(city && !d['J']){ + def address = d['E'] + def map = parserByGaode(city, address) + if(map){ + d['Q'] = map.lng + d['R'] = map.lat + d['T'] = "地址反解析经纬度" + } + } + }) + } + + + + + def parserByGaode(def city, def address){ + def json = GaoDeApiUtils.geo(city, address) + println json + if(json && json.status=="1"){ + def ret = json.geocodes + if(ret){ + def str = ret.get(0).location + def level = ret.get(0).level + + if(str && ["门牌号","单元号","道路","道路交叉路口","热点商圈","村庄","兴趣点","门址","住宅区"].contains(level)){ + def arrs = str.split(",") + return ["lng":arrs[0], "lat":arrs[1]] + }else{ + println address +" "+level + return null + } + } + } + } + + + + def addAroundPrice(path){ + ExcelUtils.multiThreadingModify(path, { d -> + if(!d['J'] && d['Q']){ + def city = RegionData.formatCity(d['B']) + def dist = new BasicDBObject() + dist.city = city + dist.lng = d['Q'].toString().toDouble()*10000000000L + dist.lat = d['R'].toString().toDouble()*10000000000L + dist.estateType = "普通住宅"//d['H'] + if(dist.lat) { + List list = DbUtils.findAroundDistrictByRadius(dist, 1000) + if (list) { + list = sortByDistance(dist, list); + if (list && list.size() > 10) { + list = list[0..9] + } + if (list) { + def prices = [] + for (def s : list) { + def priceObj = CommonDatautils.findDistrictPrice(s.city, s.region, s.name) + if (priceObj) { + prices << priceObj.avg_price + } + } + if (prices) { + def arround_price = (int) (prices.sum() / prices.size()) + d['k'] = arround_price + def area = d["F"] + if(area && area.toString().isNumber() && !area.toString().contains("+")){ + d['J'] = (int)(area.toString().toDouble()*arround_price) + } + } + } + } + } + } + }); + } + + + def sortByDistance(d, list){ + def newList = [] + for(def nb : list){ + def distance = GeoHelper.GetDistance(d.lat/10000000000.0, d.lng/10000000000.0, nb.lat/10000000000.0, nb.lng/10000000000.0) + nb.distance = distance + newList << nb + } + //排序 + Collections.sort(newList, new Comparator() { + @Override + int compare(Object o1, Object o2) { + if(o1.distance > o2.distance) + return 1;//第二个元素(o1)比第一个元素(o2)大,返回-1 + if(o1.distance == o2.distance) + return 0; + return -1; + } + }) + + return newList; + } + + + + + + def run(){ - def path = "D:\\数据\\江苏农行\\江苏农1062条(合).xlsx" + def path = "D:\\数据\\江苏农行\\江苏农1062条(总).xlsx" addressEvalute(path) // addFjwTobPrice(path) // addThirdPrice(path) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index 797fff4eb..0f6684bdc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -225,10 +225,11 @@ class FangjiaClientUtils { public static def newMatch(city,address, property, useMap){ def jsonObj = null def content = null + def url = null; try { address = address.replace("{","").replace("\\","") - def url = "http://192.168.0.100:32080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" - // def url = "http://192.168.0.19:31080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" +// def url = "http://192.168.0.100:32080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" + url = "http://192.168.0.19:31080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" if(city){ url = url + "&city="+URLEncoder.encode(city,"UTF-8") @@ -240,7 +241,7 @@ class FangjiaClientUtils { content = new HttpRequest().newGet(url, null, "utf-8") jsonObj = JSONObject.fromObject(content) } catch (Exception e) { - println address +" "+content + println "报错地址:"+url e.printStackTrace(); } return jsonObj; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy new file mode 100644 index 000000000..bb7993201 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -0,0 +1,25 @@ +package com.fangjia.script.gj.village + +import com.fangjia.script.gj.OpenApiUtils +import com.fangjia.script.util.ExcelUtils + +filePath = "D:\\数据\\涉农\\2023居委相同包含.xlsx" +ExcelUtils.multiThreadingModify(filePath, {d-> + def poiName = d['N'] + def locstr = d['O'] + try{ + def name = poiName.substring(poiName.indexOf(" ")+4, poiName.indexOf("\n")) + def location = locstr.substring(locstr.indexOf("{"), locstr.indexOf("}")+1) + }catch(e){ + println "错误:"poiName + } + d["S"] = name + d['T'] = location +}) + + +//def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] +// +//def code = codeMap.get("北京"); +rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); +//println(rets) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index b9070a74a..e942ff1dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -64,6 +64,9 @@ class SuggestionDataSynch extends BaseBatch{ for (def c : citys) { def allRets = [] + if(["上海","北京","广州","深圳","成都","天津","西安"].contains(c)){ + break; + } index++ // if(!["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)){ def ret1 = updating(c, "district") From e81564b9699037c8b4521c1b2d0a20d5d333f7aa Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 12 Jan 2024 13:44:07 +0800 Subject: [PATCH 06/26] update --- .../com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index e942ff1dc..10a5f2cb9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -65,7 +65,7 @@ class SuggestionDataSynch extends BaseBatch{ for (def c : citys) { def allRets = [] if(["上海","北京","广州","深圳","成都","天津","西安"].contains(c)){ - break; + continue; } index++ // if(!["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)){ From 23e3af1754b1fd4597996fc2bff92663e58670d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=94=A6=E6=B6=9B?= Date: Mon, 15 Jan 2024 14:36:17 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E6=88=90=E4=BA=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=98=9Fscore=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/PropertyController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index d838ffcca..67989a7e9 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -3508,7 +3508,8 @@ public class PropertyController { if (model.getHall() != null) { params.add(new QueryParam("hall", model.getHall())); } - params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); + // 18年之后抓住的数据没有score字段 +// params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); List dealPrices = dealPriceService.findDealPrices(params, max); List distinctDealPrices = new ArrayList(); for (DealPrice dealPrice : dealPrices) { From 385f28239efbdd10f4d93759eb9d6c6c2f207b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=94=A6=E6=B6=9B?= Date: Mon, 15 Jan 2024 15:17:41 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2null=E6=8A=A5=E9=94=99=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddressController.java | 6560 +++++++++-------- 1 file changed, 3282 insertions(+), 3278 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index cf00f9e9c..4c6a40e59 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -83,3246 +83,3250 @@ import java.util.regex.Pattern; @Authority(role = Role.USER) public class AddressController { - private AddressService addressService; - private DistrictService districtService; - private EvaluationService evaluationService; - private CommDataService commDataService; - private RegionBlockService regionBlockService; - private BaiduApiService baiduApiService; - private AddressParser addressParser; - private ServerAreaService serverAreaService; - private AddressParserService addressParserService; - private WaitCrawlKeywordsService waitCrawlKeywordsService; - private HouseLoudongService houseLoudongService; - private FjtEvaluationService fjtEvaluationService; - private AddressMatchProxyService addressMatchProxyService; - - private final static String AK = OpenConfig.getConfig().getBaiduAk(); - private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); - - private static Map> districts_cache = new HashMap>(); - - private static final String FJW_LEVEL = "5CAE1FAC646CB2D8"; - private static final String GRADE_AREA = "区域评分"; - private static final String GRADE_CITY = "城市评分"; - private static final String GRADE_NATION = "全国评分"; - private static final String GRADE_CONSUME = "消费评分"; - - public final static OpenConfig CONFIG = OpenConfig.getConfig(); - private static final String ES_USER = "developer"; - private static final String ES_PASSWORD = "5e8edd851d2fdfbd7415232c67367cc3"; - - /** - * @deprecated see parse2Action - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object parseAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setModel(addressParser.parse(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); - return mav; - } - - @Authority(role = Role.USER) - public Object parse2Action(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (ServerAreaData.getServerAreaByCity(model.getCity()) == null) { - HashMap resMap = new HashMap(); - resMap.put("status", 0); - resMap.put("precise", -1); - resMap.put("searchKey", model.getAddress()); - mav.setModel(resMap); - return mav; - } - mav.setModel(addressParser.parse2(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); - return mav; - } - - /** - * 解析地址,能够返回多个结果 参数有:city 城市 address 地址 includeMaps - * 匹配的结果是否包含来自地图的数据,true表示结果包含来自地图的数据 max 返回的结果集中最多条数 - * - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object parseAsListAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setModel( - addressParser.parseAsList(model.getCity(), model.getAddress(), model.isIncludeMaps(), model.getMax())); - return mav; - } - - @Authority(role = Role.USER) - public Object cacheFlushAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.cacheFlush(convertModelToMap(model)); - mav.setModel(result); - return mav; - } - - @Authority(role = Role.USER) - public Object analyzeAction(AddressModel model){ - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - HttpRequest request = new HttpRequest(); - Map params = new HashMap(); - params.put("address", model.getAddress()); - params.put("city", model.getCity()); - try { - JSONObject result = request.getJsonContent("http://192.168.0.19:38080/FangJiaHelper/address/analyze/api", params, "UTF-8"); - mav.setModel(BasicModel.buildOKModel().setResult(result)); - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return mav; - } - - public Object rateAction(@Valid RateModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - JSONArray dataList; - try { - dataList = JSONArray.fromObject(model.getData()); - } catch (Exception e) { - mav.setModel(BasicModel.buildBadRequestModel("数据格式错误")); - return mav; - } - List metaDatas = new ArrayList(dataList.size()); - JSONObject item; - AddressMatchMetaData metaData; - Map idMap = new HashMap(dataList.size()); - for (int i = 0; i < dataList.size(); i++) { - item = dataList.getJSONObject(i); - metaData = new AddressMatchMetaData(); - if (item.containsKey("city")) { - metaData.setCity(item.getString("city")); - } else { - metaData.setCity(model.getCity()); - } - if (item.containsKey("district")) { - metaData.setDistrict(item.getString("district")); - } - metaData.setMainName(item.getString("name")); - metaData.addName(item.getString("name"), MatchText.MAIN_NAME_PRIORITY); - if (item.containsKey("address")) { - Map addrWeightMap = analyseAddress(model.getCity(), item.getString("address")); - for (String addr : addrWeightMap.keySet()) { - metaData.addAddress(addr, addrWeightMap.get(addr)); - } - } - if (item.containsKey("uid")) { - metaData.setId(item.getString("uid")); - idMap.put(metaData.getId(), item); - } - if (item.containsKey("lng")) { - metaData.setLng(item.getDouble("lng")); - } - if (item.containsKey("lat")) { - metaData.setLat(item.getDouble("lat")); - } - metaData.setBuildingType(BuildingType.DISTRICT); - metaDatas.add(metaData); - } - AddressRate addressRate = addressParserService.rate(model.getCity(), model.getAddress(), metaDatas); - List results = new ArrayList(metaDatas.size()); - for (AddressMatchMetaData meta : addressRate.getMetaData()) { - JSONObject result = idMap.get(meta.getId()); - results.add(result); - } - mav.setModel(BasicModel.buildOKModel().setResult(results)); - return mav; - } - - private Map analyseAddress(String city, String address) { - - if (StringUtils.isBlank(address)) { - return Collections.EMPTY_MAP; - } - try { - Address addr = addressParserService.standardize(city, address); - if (!addr.isAvailable()) { - return Collections.EMPTY_MAP; - } - Map addrWeightMap = new HashMap(); - - if (StringUtils.isNotBlank(addr.getStreet())) { - String street = addr.getStreet(); - List streets = new ArrayList(); - streets.add(street); - if (street.endsWith("弄")) { - addrWeightMap.put(street, MatchText.MAIN_ADDR_PRIORITY); - addrWeightMap.put(street.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); - streets.add(street.replaceAll("弄$", "号")); - } - if (StringUtils.isNotBlank(addr.getStreetNumber())) { - for (String s : streets) { - if (addr.getStreetNumber().endsWith("号")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("号$", "弄"), - MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("弄$", "号"), - MatchText.GEN_ADDR_PRIORITY); - } - } - } - - if (CollectionUtils.isNotEmpty(addr.getStreetNumbers())) { - addrWeightMap.put(street + addr.getStreetNumber(), MatchText.MAIN_ADDR_PRIORITY); - for (String s : streets) { - for (String streetNumber : addr.getStreetNumbers()) { - if (streetNumber.endsWith("号")) { - addrWeightMap.put(s + streetNumber.replaceAll("号$", "弄"), MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + streetNumber.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); - } - } - } - } - - } else { - addrWeightMap.put(addr.getMiniAddress(), MatchText.MAIN_ADDR_PRIORITY); - } - return addrWeightMap; - } catch (Exception e) { - - } - return Collections.EMPTY_MAP; - - } - - public Object standardizeAction(AddressModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - Address address = addressParserService.standardize(model.getCity(), model.getAddress()); - mav.setModel(BasicModel.buildOKModel().setResult(address)); - return mav; - } - - public Object realCertificateAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Certificate); - matchParams.setPreciseLevel(PreciseLevel.STRICT); - Building building = addressParserService.certificate(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - if (address.getDistrict() != null) { - dto.append("district", address.getDistrict()); - } else { - dto.append("district", building.getDistrict()); - } - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - dto.append("name", building.getSuggestName()); - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - dto.append("certified", address.getCertified()); - dto.append("floor", address.getFloor()); - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } - - public Object certificateAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.certificate(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object authAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.auth(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object realAuthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Certificate); - matchParams.setUseMap(true); - Building building = addressParserService.certificate(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - dto.append("district", address.getDistrict()); - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - List certified = address.getCertified(); - if (certified.contains("roomNumber")) { - dto.append("authLevel", "A"); - } else if (certified.contains("buildingNumber")) { - dto.append("authLevel", "B"); - } else { - dto.append("authLevel", "C"); - } - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } - - public Map analyseAddress(String address) { - Map ret = new HashMap(); - ret.put("address", address); - if (districts_cache.isEmpty()) { - List serverAreas = serverAreaService.findAll(); - for (ServerArea serverArea : serverAreas) { - if (StringUtils.isBlank(serverArea.getProvince())) { - continue; - } - String city = serverArea.getDisplay(); - String province = serverArea.getProvince(); - List cities = districts_cache.get(province); - if (cities == null) { - cities = new ArrayList(); - districts_cache.put(province, cities); - } - if (!cities.contains(city)) { - cities.add(city); - } - } - } - - for (Entry> p : districts_cache.entrySet()) { - if (address.startsWith(p.getKey())) { - ret.put("province", p.getKey()); - List cities = p.getValue(); - if (cities.size() == 1 && cities.contains(p.getKey())) {// 直辖市 - ret.put("city", p.getKey()); - } else { - String temp = address.substring(p.getKey().length());// 移除省份 - if (temp.startsWith("省") || temp.startsWith("市") || temp.startsWith("县") || temp.startsWith("区")) { - temp = temp.substring(1); - } - for (String c : cities) { - if (temp.startsWith(c)) { - ret.put("city", c); - break; - } - } - } - break; - } - } - return ret; - } - - @Authority(role = Role.USER) - public Object matchAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.parser(convertModelToMap(model)); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); - resultModel.setResult(json.get("result")); - mav.setModel(resultModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址匹配第二个版本,基于第一个版本的逻辑,对匹配出的结果进行正确性的判断 - * @author yinjihuan - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object matchV2Action(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.parser(convertModelToMap(model)); - JSONObject json = JSONObject.fromObject(result); - BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); - if (result != null) { - JSONObject jsonResult = (JSONObject) json.get("result"); - if (jsonResult != null && jsonResult.getDouble("credit") > 0) { - CheckMatchDistrictCorrectParam param = new CheckMatchDistrictCorrectParam(); - String city = jsonResult.getString("city"); - String region = jsonResult.getString("district"); - String name = jsonResult.getString("name"); - param.setCity(city); - param.setRegion(region); - param.setName(name); - param.setInputAddress(model.getAddress()); - if (jsonResult.containsKey("lng")) { - param.setBlng(jsonResult.getDouble("lng")); - } - if (jsonResult.containsKey("lat")) { - param.setBlat(jsonResult.getDouble("lat")); - } - param.setDebug(model.isDebug()); - District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); - if (district != null && district.getLng() != null && district.getLng() > 0) { - param.setGlng(district.getLng() / 10000000000.0); - param.setGlat(district.getLat() / 10000000000.0); - } - MatchDistrictResult matchResult = addressMatchProxyService.checkMatchDistrictCorrect(param); - jsonResult.put("matchResult", matchResult); - if (jsonResult.containsKey("category")) { - if ("office".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "写字楼"); - } else if ("shop".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "商铺"); - } - } - } else if (jsonResult != null) { - // 判断是否为自然村 - boolean matchedVillage = false; - try { - if (jsonResult.get("searchAddress") != null) { - JSONObject searchAddress = (JSONObject) jsonResult.get("searchAddress"); - String city = searchAddress.containsKey("city") ? searchAddress.getString("city") : null; - String region = searchAddress.containsKey("district") ? searchAddress.getString("district") : null; - String name = searchAddress.containsKey("keywords") ? searchAddress.getString("keywords") : null; - String township = searchAddress.containsKey("township") ? searchAddress.getString("township") : null; - if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { - List villages = findVillage(city, region, name); - if (CollectionUtils.isNotEmpty(villages)) { - if (villages.size() == 1 || StringUtils.isBlank(township)) { - JSONObject village = villages.get(0).getJSONObject("_source"); - jsonResult.put("id", villages.get(0).getString("_id")); - jsonResult.put("province", village.getString("province")); - jsonResult.put("city", village.getString("city")); - jsonResult.put("district", village.getString("region")); - jsonResult.put("township", village.getString("township")); - jsonResult.put("name", village.getString("name")); - jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); - jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); - matchedVillage = true; - } else { - for (JSONObject source : villages) { - JSONObject village = source.getJSONObject("_source"); - if (village.getString("township").contains(township) || township.contains(village.getString("township"))) { - jsonResult.put("id", source.getString("_id")); - jsonResult.put("province", village.getString("province")); - jsonResult.put("city", village.getString("city")); - jsonResult.put("district", village.getString("region")); - jsonResult.put("township", village.getString("township")); - jsonResult.put("name", village.getString("name")); - jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); - jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); - matchedVillage = true; - break; - } - } - } - } - } - } - } catch(Exception ex) { - ex.printStackTrace(); - } - if (matchedVillage == false) { - jsonResult.put("matchResult", new MatchDistrictResult()); - } - } - resultModel.setResult(json.get("result")); - mav.setModel(resultModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object realMatchAction(@Valid AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 - BuildingType buildingType = null; - if (StringUtils.isNotBlank(model.getCategory())) { - if ("property".equals(model.getCategory())) { - model.setCategory("district"); - } - try { - buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); - } catch (Exception e) { - - } - } - PreciseLevel preciseLevel = PreciseLevel.FUZZY; - if ("strict".equals(model.getPreciseLevel())) { - preciseLevel = PreciseLevel.STRICT; - } - MatchParams params = new MatchParams(); - params.setCity(model.getCity()); - params.setSuggestDistrict(model.getSuggestDistrict()); - params.setSuggestName(model.getSuggestName()); - params.setAddress(address); - params.setBuildingType(buildingType); - params.setPreciseLevel(preciseLevel); - params.setProvince(model.getProvince()); - params.setUseMap(model.isUseMap()); - params.setDebugName(model.getDebugName()); - long start = System.currentTimeMillis(); - Building building = addressParserService.parser(params); - long end = System.currentTimeMillis(); - if (end - start > 200) { - LOGGER.warn("匹配parser耗时:\t" + (end - start) + "ms"); - } - if ("true".equalsIgnoreCase(model.getVerify())) { - verify(building); - } - BasicModel baseModel = BasicModel.buildOKModel(); - Map result = convertBuildingToMap(building); - if (!APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) { - submitFetchTask(building); - result.remove("precise"); - result.remove("searchAddress"); - result.remove("map"); - } - baseModel.setResult(result); - mav.setModel(baseModel); - return mav; - } - - Map convertBuildingToMap(Building building) { - Map result = new LinkedHashMap(); - if (building != null) { - result.put("id", building.getId()); - result.put("credit", building.getCredit()); - result.put("precise", building.getPrecise()); - result.put("province", building.getProvince()); - result.put("city", building.getCity()); - result.put("district", building.getDistrict()); - result.put("name", building.getName()); - result.put("suggestName", building.getSuggestName()); - result.put("map", building.getMap()); - result.put("propertyType", building.getPropertyType()); - result.put("township", building.getTownship()); - result.put("suggestAddress", building.getSuggestAddress()); - if ("district".equals(building.getCategory())) { - result.put("category", "property"); - } else { - result.put("category", building.getCategory()); - } - result.put("address", building.getAddress()); - result.put("block", building.getBlock()); - result.put("lng", building.getLng()); - result.put("lat", building.getLat()); - result.put("alias", building.getAlias()); - result.put("searchAddress", building.getSearchAddress()); - } - return result; - } - - public Object cleanCacheAction(final AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - new Thread() { - @Override - public void run() { - addressParserService.clearCache(model.getCity()); - } - }.start(); - mav.setModel(BasicModel.buildOKModel().setMsg("开始刷新缓存")); - return mav; - } - - @Authority(role = Role.NONE) - public Object realMatchAllAction(@Valid AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 - BuildingType buildingType = null; - if (StringUtils.isNotBlank(model.getCategory())) { - if ("property".equals(model.getCategory())) { - model.setCategory("district"); - } - buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); - } - PreciseLevel preciseLevel = PreciseLevel.FUZZY; - if ("strict".equals(model.getPreciseLevel())) { - preciseLevel = PreciseLevel.STRICT; - } - MatchParams params = new MatchParams(); - params.setCity(model.getCity()); - params.setSuggestDistrict(model.getSuggestDistrict()); - params.setAddress(address); - params.setBuildingType(buildingType); - params.setPreciseLevel(preciseLevel); - params.setProvince(model.getProvince()); - params.setSuggestName(model.getSuggestName()); - AddressParseResult addressParseResult = addressParserService.parserAll(params); - List buildings = addressParseResult.getBuildings(); - List> buildingObjs = new ArrayList>(buildings.size()); - for (Building building : buildings) { - buildingObjs.add(convertBuildingToMap(building)); - } - BasicModel baseModel = BasicModel.buildOKModel(); - baseModel.setResult(buildingObjs); - mav.setModel(baseModel); - return mav; - } - - @Authority(role = Role.USER) - public Object matchAllAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - String result = addressMatchProxyService.parserAll(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Map convertModelToMap(AddesssMatchModel model) { - - Map params = new HashMap(); - Class clzz = model.getClass(); - for (Field field : clzz.getDeclaredFields()) { - field.setAccessible(true); - String paramName = field.getName(); - try { - Object val = field.get(model); - if (val != null) { - params.put(paramName, val.toString()); - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - return params; - } - - private void verify(Building building) { - String city = building.getCity(); - String region = building.getDistrict(); - String name = null; - if (building.getPrecise() > -1) { - name = building.getName(); - } else { - name = building.getSearchAddress().getOrgKeywords(); - } - if (StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { - String buildingNumber = AddressParserUtil - .standardizeBuildingNumber(building.getSearchAddress().getOrgBuildingNumber()); - if (buildingNumber != null) { - if (houseLoudongService.findHouseLoudong(city, region, name, buildingNumber, null, null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, buildingNumber, - null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } else if (evaluationService.findEvaluationByNum(city, region, name, buildingNumber, null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } - } - - String roomNumber = AddressParserUtil.standardizeRoomNumber(building.getSearchAddress().getOrgRoomNumber()); - if (roomNumber != null) { - if (houseLoudongService.findHouseLoudong(city, region, name, null, null, roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, null, - roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } else if (evaluationService.findEvaluationByNum(city, region, name, null, roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } - } - } - } - - @Authority(role = Role.NONE) - public Object sendFetchTaskAction(AddressModel model) { - - RestfulModelAndView json = new RestfulModelAndView(); - WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); - waitCrawlKeywords.setCity(model.getCity()); - waitCrawlKeywords.setDateCreated(new Date()); - waitCrawlKeywords.setRead(0); - waitCrawlKeywords.setKeywords(model.getAddress()); - waitCrawlKeywordsService.save(waitCrawlKeywords); - json.setModel(waitCrawlKeywords); - - return json; - } - - private void submitFetchTask(Building building) { - if (building.getPrecise() == -1) { - List keywords = new ArrayList(); - Address address = building.getSearchAddress(); - if (StringUtils.isNotBlank(address.getKeywords()) && address.getKeywords().length() > 2) { - keywords.add(address.getKeywords()); - } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 一般小区名不会超过10个字 - keywords.add(address.getOrgAddress()); - } - if (address.isStandardAddress()) { - if (address.getStreetNumbers() != null) { - for (String b : address.getStreetNumbers()) { - keywords.add(address.getStreet() + b); - } - } else { - keywords.add(address.getStreet()); - } - } - keywords = DataUtil.uniqueList(keywords); - for (String k : keywords) { - WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); - waitCrawlKeywords.setCity(address.getCity()); - waitCrawlKeywords.setDateCreated(new Date()); - waitCrawlKeywords.setRead(0); - waitCrawlKeywords.setKeywords(k); - waitCrawlKeywordsService.save(waitCrawlKeywords); - } - } - } - - /** - * 从Excel表中加载测试数据 - * - * @return - */ - private List> loadTestDataFromExcel(String excelFileName) { - List> ret = new ArrayList>(); - FileInputStream fileInputStream = null; - try { - fileInputStream = new FileInputStream(excelFileName); - HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); - HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 - boolean isFirstRow = true; - for (Row row : sheet) { - if (isFirstRow) { - // 第一行,过掉 - isFirstRow = false; - continue; - } - - // 得到列数 - // row.getPhysicalNumberOfCells(); - String in_name = row.getCell(1).toString(); - if (in_name.equals("")) { - // 跳过空内容 - continue; - } - Map data = new HashMap(); - // 第0列:城市 - data.put("city", row.getCell(0).toString()); - // 第一列:输入地址 - data.put("in_name", in_name); - // 第二列:期望名称,用于验证 - Cell cell = row.getCell(2); - if (cell != null) { - data.put("out_name", cell.toString()); - } - ret.add(data); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (fileInputStream != null) { - try { - fileInputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return ret; - } - - /** - * 从Excel表中加载测试数据 - * - * @return - */ - private List> loadJingDongTestDataFromExcel(String excelFileName) { - - List> ret = new ArrayList>(); - FileInputStream fileInputStream = null; - try { - fileInputStream = new FileInputStream(excelFileName); - HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); - HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 - boolean isFirstRow = true; - for (Row row : sheet) { - if (isFirstRow) {// 第一行,过掉 - isFirstRow = false; - continue; - } - String province = row.getCell(0).toString(); - String city = row.getCell(1).toString(); - String in_address = row.getCell(2).toString(); - if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 跳过空内容 - System.out.println("-->" + row.getRowNum()); - continue; - } - - Map formate = analyseAddress(in_address); - Map data = new HashMap(); - data.put("in_address", in_address); - data.put("city", city); - String formattedAddress = new String(in_address); - List huanxian = Arrays.asList("中环外环之间", "内环以内", "内环中环之间", "中环以内", "外环以外", "(内环高速以里)", "外环外其它地区", - "五环以外", "六环以内", "内环到三环里", "内环到二环里", "二环里", "三环到四环之间", "二环到三环", "四环到五环之间", "二环到三环", "五环至六环之间", - "五环到六环之间", "五环到六环之间", "三环以内", "四环到五环内", "六环以外(其他地区)", "六环以外(张家湾镇、台湖镇、漷县镇)", "六环以外(宋庄镇)", - "一环到二环", "六环以外", "四环至五环之间", "六环外(马驹桥镇)"); - for (String a : huanxian) { - formattedAddress = formattedAddress.replace(a, ""); - } - data.put("formatted_in_address", formattedAddress); - data.put("province", province); - if (formate.get("city") != null) { - data.put("formatedCity", formate.get("city")); - } else { - if (city.endsWith("市") || city.endsWith("县")) { - city = city.substring(0, city.length() - 1); - } else { - if (province.endsWith("市")) { - city = province.substring(0, province.length() - 1); - } else { - city = province; - } - } - data.put("formatedCity", city); - } - ret.add(data); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (fileInputStream != null) { - try { - fileInputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return ret; - } - - private JSONObject addTerm(String name, String value){ - JSONObject term = new JSONObject(); - JSONObject match = new JSONObject(); - match.put(name, value); - term.put("term", match); - return term; - } - - private JSONObject addMatchPhrase(String name, String value){ - JSONObject term = new JSONObject(); - JSONObject match = new JSONObject(); - match.put(name, value); - term.put("match_phrase", match); - return term; - } - - /*** - * 获取自然村 - * @param city - * @param region - * @param name - * @return - */ - private List findVillage(String city, String region, String name) { - JSONObject reqBody = new JSONObject(); - reqBody.put("from", 0); - reqBody.put("size", 5); - JSONObject query = new JSONObject(); - JSONObject bool = new JSONObject(); - JSONArray must = new JSONArray(); - must.add(addTerm("city", city)); - must.add(addTerm("region", region)); - must.add(addTerm("name", name)); - bool.put("must", must); - query.put("bool", bool); - reqBody.put("query", query); - Base64 token = new Base64(); - String authenticationEncoding = token.encodeAsString((""+ES_USER+":"+ES_PASSWORD+"").getBytes()); - HttpRequest request = new HttpRequest(); - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - headers.put("Authorization", "Basic "+authenticationEncoding+""); - try { - String response = request.postWithBody("http://192.168.0.45:9200/village/_search", reqBody, headers, "UTF-8"); - JSONObject json = JSONObject.fromObject(response); - if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ - return Collections.emptyList(); - } - JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); - List results = new ArrayList(); - for(int i=0 ;i < hits.size(); i++){ - JSONObject jsonObject = hits.getJSONObject(i); - results.add(jsonObject); - } - return results; - - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return Collections.emptyList(); - } - - /** - * 加载测试数据 - * - * @return - */ - private List> loadTestData() { - BufferedReader reader = null; - List> ret = new ArrayList>(); - try { - reader = new BufferedReader( - new InputStreamReader(new FileInputStream("D:\\data\\addr\\test20140923.txt"), "utf-8")); - boolean isFirst = true; - while (true) { - String line = reader.readLine(); - if (line == null) { - break; - } - if (isFirst) { - isFirst = false; - int c = line.charAt(0); - if (c == 65279) { - // 去掉UTF-8中头标示 - line = line.substring(1); - } - } - ret.add(parseTestData(line)); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - - } - } - } - return ret; - } - - /** - * 解析测试数据,其中输入字符串为以TAB分隔的字符串,例如: in_name:经济技术开发区贵园北里丁区 out_name:贵园北里 - * - * @param s - * @return - */ - private Map parseTestData(String s) { - Map ret = new HashMap(); - String[] columns = s.split("\t"); - for (String column : columns) { - int index = column.indexOf(":"); - String key; - String value; - if (index > 0) { - key = column.substring(0, index); - value = column.substring(index + 1); - ret.put(key, value); - } - } - return ret; - } - - @Authority(role = Role.USER) - public Object parseAddressAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - District district = addressService.parseAddress(model.getCity(), model.getAddress()); - if (district != null) { - Map resMap = new HashMap(); - resMap.put("city", district.getCity()); - resMap.put("region", district.getRegion()); - resMap.put("districtName", district.getName()); - resMap.put("address", district.getAddress()); - mav.setModel(resMap); - } - return mav; - } - - @Authority(role = Role.USER) - public Object geocoderAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - - double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - Map resMap = new HashMap(); - resMap.put("lng", lngLat[0]); - resMap.put("lat", lngLat[1]); - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object geocoderBaiduToGoogleAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - - double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - Map resMap = new HashMap(); - resMap.put("lng", lngLat[0]); - resMap.put("lat", lngLat[1]); - mav.setModel(resMap); - return mav; - } - - @Deprecated - @Authority(role = Role.USER) - public Object addressEvaluationAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { - return mav; - } - - Map resMap = new HashMap(); - resMap.put("totalPrice", - addressService.evaluationByAddress(model.getCity(), model.getAddress(), model.getArea(), AK)); - mav.setModel(resMap); - return mav; - } - - @Deprecated - @Authority(role = Role.USER) - public Object addressEvaluation2Action(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { - return mav; - } - - Date weekend = DateUtil.getThisSunday(new Date()); - if (model.getWeekend() != null) { - weekend = DateUtil.getThisSunday(model.getWeekend()); - } - - Map resMap = new HashMap(); - resMap.put("totalPrice", 0); - - District district = addressService.parseAddress(model.getCity(), model.getAddress()); - if (district == null) { - double[] lngLatBaidu = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - if (lngLatBaidu == null) { - mav.setModel(resMap); - return mav; - } - double[] lngLatGoogle = addressService.geoconvBaiduToGoogle(lngLatBaidu[0], lngLatBaidu[1]); - double lng = lngLatGoogle[0]; - double lat = lngLatGoogle[1]; - List params = new ArrayList(); - SdQuery sdQuery = new SdQuery(); - if (lat < -90 && lat > 90 && lng < -180 && lng > 180) { - mav.setModel(resMap); - return mav; - } - params.add(new QueryParam("city", model.getCity())); - params.add(new QueryParam("visible", 0)); - sdQuery.setPoint(lat + "," + lng); - sdQuery.setField("lat_lng"); - sdQuery.setDistance("" + (500 / 1000d)); - params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); - List districts = districtService.findAllByParams(params, 0, 3); - - int totalPrice = 0; - int tc = 0; - for (District dis : districts) { - Evaluation evaluation = new Evaluation(); - evaluation.setCity(dis.getCity()); - evaluation.setRegion(dis.getRegion()); - evaluation.setDistrictName(dis.getName()); - evaluation.setArea(model.getArea()); - evaluation.setSource("api_diZhiGuJia"); - evaluation = evaluationService.saveEvaluation(evaluation, weekend); - if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() > 0) { - totalPrice += evaluation.getTotalPrice(); - tc++; - } - } - if (tc > 0) { - resMap.put("totalPrice", totalPrice / tc); - } - // } - } else { - Evaluation evaluation = new Evaluation(); - evaluation.setCity(district.getCity()); - evaluation.setRegion(district.getRegion()); - evaluation.setDistrictName(district.getName()); - evaluation.setArea(model.getArea()); - evaluation.setSource("api_diZhiGuJia"); - evaluation = evaluationService.saveEvaluation(evaluation, weekend); - resMap.put("totalPrice", evaluation.getTotalPrice()); - - District dist = districtService.findDistrict( - new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); - if (null != dist) { - if (null != dist.getCarSiteCount() && dist.getCarSiteCount() > 0) { - resMap.put("carSiteCount", dist.getCarSiteCount()); - } - } - - CommData commData = commDataService.findCommDataByCity(district.getCity(), district.getRegion(), - district.getName(), "district"); - if (null != commData && commData.getLastCount() > 0) { - resMap.put("householdCount", commData.getLastCount()); - } - } - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object addressStandardParserAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object addressStandardAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - model.setAddress(AddressParserUtils.filteSpecialChar(model.getAddress())); - Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); - resMap.put("oldAddress", model.getAddress()); - - if (resMap.get("city") == null || model.getAddress() == null) { - return mav; - } - - District district = null; - // 根据地址查找小区 - if (resMap.get("address") != null) { - district = addressService.parseAddress(resMap.get("city").toString(), resMap.get("address").toString()); - } - // 根据地址中提取出的小区名称查小区 - String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 地址中疑似小区 - if (district == null && null != oldName) { - district = addressService.parseAddress(resMap.get("city").toString(), oldName); - // 百度查小区 - if (district == null && null != oldName) { - Map ret = baiduApiService.mapSearchSimple(resMap.get("city").toString(), oldName, AK); - List rets = (List) ret.get("content"); - if (null != rets) { - boolean flag = false; - for (Map vo : rets) { - List> vs = (List>) vo.get("cla"); - if (vs == null) { - continue; - } - for (List list : vs) { - String s = list.get(1); - if (s.indexOf("小区") != -1 || s.indexOf("楼盘") != -1) { - flag = true; - resMap.put("name", oldName); - String baiduAddress = (String) vo.get("addr"); - if (StringUtils.isNotBlank(baiduAddress)) { - - if (StringUtils.isBlank((String) resMap.get("address"))) { - resMap.put("address", baiduAddress); - } - - } - - break; - } - } - } - - if (!flag && resMap.get("address") == null) { - resMap.put("address", oldName); - } - } - } - } - - if (district != null) { - District dist = districtService.findDistrict( - new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); - if (dist != null) { - district = dist; - } - resMap.put("status", "0"); - } else { - resMap.put("status", "1"); - } - - // 当businessMatch=1,并且进行小区匹配没有成功的情况下,进行商铺写字楼匹配 通过keyword查找 - if (null != model.getBusinessMatch() && model.getBusinessMatch() == 1 && resMap.get("status").equals("1") - && StringUtils.isNotBlank((String) resMap.get("city"))) { - if (StringUtils.isNotBlank(oldName)) { - district = districtService.findFirstByKeyword((String) resMap.get("city"), oldName); - } - - if (null == district && StringUtils.isNotBlank((String) resMap.get("address"))) { - district = districtService.findFirstByKeyword((String) resMap.get("city"), - (String) resMap.get("address")); - } - } - - if (district != null) { - - resMap.put("name", district.getName()); - resMap.put("region", district.getRegion()); - resMap.put("block", district.getBlock()); - resMap.put("cat", district.getCategory()); - resMap.put("alias", district.getAlias()); - - String tempAddress = (String) resMap.get("address"); - if (StringUtils.isBlank(tempAddress)) { - resMap.put("address", district.getAddress()); - } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { - resMap.put("address", district.getAddress()); - } - } - } - - String lastAddress = (String) resMap.get("address"); - if (StringUtils.isNotBlank(lastAddress)) { - if (lastAddress.length() < 2) { - resMap.put("address", null); - } else { - resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); - } - - } - resMap.remove("louDong"); - mav.setModel(resMap); - return mav; - } - - public Object address2DistrictAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - String orgCity = model.getCity(); - String orgAddress = AddressParserUtils.filteSpecialChar(model.getAddress()); - if (StringUtils.isBlank(orgCity) || StringUtils.isBlank(orgAddress)) { - return mav; - } - - Map resMap = addressService.parseSelectAddressInfo(orgCity, orgAddress); - resMap.put("oldAddress", orgAddress); - resMap.remove("louDong"); - - if (null == resMap.get("city")) { - return mav; - } - - String city = (String) resMap.get("city"); - District district = null; - // 小区库匹配 - String address = (String) resMap.get("address"); - if (StringUtils.isNotBlank(address)) { - // 地址、小区名、别名匹配 - List params = new ArrayList(4); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("category", "district")); - params.add(new QueryParam("visible", 0)); - - TermQuery q1 = new TermQuery(new Term("name", address)); - TermQuery q2 = new TermQuery(new Term("alias", address)); - TermQuery q3 = new TermQuery(new Term("address", address)); - BooleanQuery bq = new BooleanQuery(); - bq.add(q1, Occur.SHOULD); - bq.add(q2, Occur.SHOULD); - bq.add(q3, Occur.SHOULD); - params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); - - List ds = districtService.findAllByParams(params, 0, 1); - if (CollectionUtils.isNotEmpty(ds)) { - district = ds.get(0); - } - } - - // 根据地址中提取出的小区名称查小区 - String oldName = StringUtils.trim((String) resMap.get("oldName")); - if (null == district && StringUtils.isNotBlank(oldName)) { - // 小区名、别名匹配 - List params = new ArrayList(4); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("category", "district")); - params.add(new QueryParam("visible", 0)); - - TermQuery q1 = new TermQuery(new Term("name", oldName)); - TermQuery q2 = new TermQuery(new Term("alias", oldName)); - BooleanQuery bq = new BooleanQuery(); - bq.add(q1, Occur.SHOULD); - bq.add(q2, Occur.SHOULD); - params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); - - List ds = districtService.findAllByParams(params, 0, 1); - if (CollectionUtils.isNotEmpty(ds)) { - district = ds.get(0); - } - } - - // 地址库匹配 - if (null == district) { - // todo - } - - if (null == district) { - resMap.put("status", 1); - } else { - resMap.put("status", 0); - resMap.put("name", district.getName()); - resMap.put("region", district.getRegion()); - resMap.put("block", district.getBlock()); - resMap.put("cat", district.getCategory()); - resMap.put("alias", district.getAlias()); - - String tempAddress = (String) resMap.get("address"); - if (StringUtils.isBlank(tempAddress)) { - resMap.put("address", district.getAddress()); - } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { - resMap.put("address", district.getAddress()); - } - } - } - - String lastAddress = (String) resMap.get("address"); - if (StringUtils.isNotBlank(lastAddress)) { - if (lastAddress.length() < 2) { - resMap.put("address", null); - } else { - resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); - } - } - - mav.setModel(resMap); - return mav; - } - - private String findStandardRegion(String city, String region) { - - List regionBloks = regionBlockService.getRegionBlockListByCity(city, null); - String s_region = ""; - if (regionBloks.size() > 0) { - for (RegionBlock regionBlock : regionBloks) { - List patterns = regionBlock.getPattern(); - if (null != patterns && patterns.contains(region)) { - s_region = regionBlock.getName(); - break; - } else { - if (regionBlock.getName().indexOf(region) != -1) { - s_region = region; - break; - } - } - } - } else { - s_region = region; - } - return s_region; - } - - /** - * 地址联想提示 (高德官方) /address/su 参数:address city - * 返回:[{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}] - * - * @return - */ - public Object suAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - try { - List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(list); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址真实性检查 (高德官方) /address/check 参数:chooseId address city - * 返回:{type:"存在|不存在|存疑",data:{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}} - * 存疑的时候才有data返回,返回高德搜索的第一条数据 (超过的时候,找到最大号码返回) - * - * @return - */ - public Object checkAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈 - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo2(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // if (StringUtils.isEmpty(check.getAddress()) || - // "[]".equals(check.getAddress())) { - // check.setAddress(check.getName()); - // } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setLevel(null); - check.setScoreIncity(null); - check.setScoreInnation(null); - check.setPriceScore(null); - check.setAreaScore(null); - check.setEstateScore(null); - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } - - /** - * 查询高德城市及城市编码 - * - * @return - */ - public Object cityAllAction() { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - List list = addressService.findAllCityAmap(); - BasicModel model = new BasicModel(HttpStatusCodeEnum.OK); - model.setResult(list); - mav.setModel(model); - return mav; - } - - /** - * 地址联想提示 (代理) - * - * @return - */ - public Object suAmapAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - try { - List list = addressService.su(model.getCity().trim(), model.getAddress().trim()); - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(list); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址真实性检查 (代理) - * - * @return - */ - public Object checkAmapAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.check(model.getChooseId(), city, model.getAddress().trim()); - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址评级 - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 经纬度, "lng": 经纬度, "name": "匹配POIName", "score": 评分 }, "type": "可能存在" } - * } - */ - public Object gradeAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址反欺诈 (地址验真+周边查询) - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 纬度, "lng": 经度, "name": "匹配POIName", "poiList":[ { "name" : - * "文洋大厦停车场(协和路)", "type" : "类型", "address" : "协和路1033号", "lat": 纬度, - * "lng": 经度, "distance":距离 },... ] }, "type": "存在" } } - */ - public Object antiFraudAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.antiFraudAmap(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址反欺诈 (地址验真+周边查询) - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": - * "德州路220弄小区", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": - * "上海市", "keyWords": "德州路220弄", "keyWordsUse": "德州路220弄", "lat": - * 31.167814, "lng": 121.495784, "name": "上海后来居上家庭公寓(德州路分店)", "poiMap": - * { "加油站": [ { "address": "杨思路648号", "distance": "642.0m", "lat": - * 31.162078, "lng": 121.496522, "name": "中国石化加油站(杨思路)", "type": "加油站" - * }, { "address": "杨思路2号", "distance": "1.6km", "lat": 31.15627, "lng": - * 121.485031, "name": "中国石油杨思加油站(杨思路)", "type": "加油站" }, ... ] } ... }, - * "type": "存在" } } - */ - public Object antiFraudBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.antiFraudAmapB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - public Object standardAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - String result = addressMatchProxyService.standard(convertModelToMap(model)); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - int code = json.getInt("code"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址标准化接口V2 - * - * @param model - * @return - */ - public Object standard2Action(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - params.put("showCode", model.getShowCode()); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 招商证券POC测试接口封装 - */ - public Object cmbTestAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 五级地址标准化接口 - * - * @param model - * @return - */ - public Object fiveDivisionStructureAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 五级行政区划V2地址标准化接口 - * - * @param model - * @return - */ - public Object fiveDivisionStructure2Action(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 详细地址标准化接口 - * - * @param model - * @return - */ - public Object divisionStructureAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址标准化专用测试接口 - * @param model - * @return - */ - public Object structureAndCompleteAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址信息分类接口 - * @param model - * @return - */ - public Object communitySummaryAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody ,headers, "UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 楼盘评级 - * @param model - * @return - */ - public Object buildingRatingAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 财力评级 - * @param model - * @return - */ - public Object financialRatingAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers,"UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object similarityAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { - mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); - return mav; - } - model.setAddress(model.getAddress_1()); - String result1 = addressMatchProxyService.standard(convertModelToMap(model)); - model.setAddress(model.getAddress_2()); - String result2 = addressMatchProxyService.standard(convertModelToMap(model)); - if (result1 != null && result2 != null) { - Map resultMap = addressService.addressSimilarity(result1, result2); - mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object parseCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getProvince())) { - mav.setModel(BasicModel.buildBadRequestModel("province不能为空")); - return mav; - } - if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); - return mav; - } - CityParseBo bo = addressService.cityParse(model.getProvince(), model.getDistrict()); - if (bo.getCity() != null) { - UniversalDto dto = UniversalDto.newDto(); - dto.append("city", bo.getCity()); - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - } else { - mav.setModel(BasicModel.buildModel(40001, bo.getMsg())); - } - return mav; - } - - public Object realStandardAction(AddressModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } + private AddressService addressService; + private DistrictService districtService; + private EvaluationService evaluationService; + private CommDataService commDataService; + private RegionBlockService regionBlockService; + private BaiduApiService baiduApiService; + private AddressParser addressParser; + private ServerAreaService serverAreaService; + private AddressParserService addressParserService; + private WaitCrawlKeywordsService waitCrawlKeywordsService; + private HouseLoudongService houseLoudongService; + private FjtEvaluationService fjtEvaluationService; + private AddressMatchProxyService addressMatchProxyService; + + private final static String AK = OpenConfig.getConfig().getBaiduAk(); + private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); + + private static Map> districts_cache = new HashMap>(); + + private static final String FJW_LEVEL = "5CAE1FAC646CB2D8"; + private static final String GRADE_AREA = "区域评分"; + private static final String GRADE_CITY = "城市评分"; + private static final String GRADE_NATION = "全国评分"; + private static final String GRADE_CONSUME = "消费评分"; + + public final static OpenConfig CONFIG = OpenConfig.getConfig(); + private static final String ES_USER = "developer"; + private static final String ES_PASSWORD = "5e8edd851d2fdfbd7415232c67367cc3"; + + /** + * @param model + * @return + * @deprecated see parse2Action + */ + @Authority(role = Role.USER) + public Object parseAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setModel(addressParser.parse(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); + return mav; + } + + @Authority(role = Role.USER) + public Object parse2Action(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (ServerAreaData.getServerAreaByCity(model.getCity()) == null) { + HashMap resMap = new HashMap(); + resMap.put("status", 0); + resMap.put("precise", -1); + resMap.put("searchKey", model.getAddress()); + mav.setModel(resMap); + return mav; + } + mav.setModel(addressParser.parse2(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); + return mav; + } + + /** + * 解析地址,能够返回多个结果 参数有:city 城市 address 地址 includeMaps + * 匹配的结果是否包含来自地图的数据,true表示结果包含来自地图的数据 max 返回的结果集中最多条数 + * + * @param model + * @return + */ + @Authority(role = Role.USER) + public Object parseAsListAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setModel( + addressParser.parseAsList(model.getCity(), model.getAddress(), model.isIncludeMaps(), model.getMax())); + return mav; + } + + @Authority(role = Role.USER) + public Object cacheFlushAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.cacheFlush(convertModelToMap(model)); + mav.setModel(result); + return mav; + } + + @Authority(role = Role.USER) + public Object analyzeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + HttpRequest request = new HttpRequest(); + Map params = new HashMap(); + params.put("address", model.getAddress()); + params.put("city", model.getCity()); + try { + JSONObject result = request.getJsonContent("http://192.168.0.19:38080/FangJiaHelper/address/analyze/api", params, "UTF-8"); + mav.setModel(BasicModel.buildOKModel().setResult(result)); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return mav; + } + + public Object rateAction(@Valid RateModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + JSONArray dataList; + try { + dataList = JSONArray.fromObject(model.getData()); + } catch (Exception e) { + mav.setModel(BasicModel.buildBadRequestModel("数据格式错误")); + return mav; + } + List metaDatas = new ArrayList(dataList.size()); + JSONObject item; + AddressMatchMetaData metaData; + Map idMap = new HashMap(dataList.size()); + for (int i = 0; i < dataList.size(); i++) { + item = dataList.getJSONObject(i); + metaData = new AddressMatchMetaData(); + if (item.containsKey("city")) { + metaData.setCity(item.getString("city")); + } else { + metaData.setCity(model.getCity()); + } + if (item.containsKey("district")) { + metaData.setDistrict(item.getString("district")); + } + metaData.setMainName(item.getString("name")); + metaData.addName(item.getString("name"), MatchText.MAIN_NAME_PRIORITY); + if (item.containsKey("address")) { + Map addrWeightMap = analyseAddress(model.getCity(), item.getString("address")); + for (String addr : addrWeightMap.keySet()) { + metaData.addAddress(addr, addrWeightMap.get(addr)); + } + } + if (item.containsKey("uid")) { + metaData.setId(item.getString("uid")); + idMap.put(metaData.getId(), item); + } + if (item.containsKey("lng")) { + metaData.setLng(item.getDouble("lng")); + } + if (item.containsKey("lat")) { + metaData.setLat(item.getDouble("lat")); + } + metaData.setBuildingType(BuildingType.DISTRICT); + metaDatas.add(metaData); + } + AddressRate addressRate = addressParserService.rate(model.getCity(), model.getAddress(), metaDatas); + List results = new ArrayList(metaDatas.size()); + for (AddressMatchMetaData meta : addressRate.getMetaData()) { + JSONObject result = idMap.get(meta.getId()); + results.add(result); + } + mav.setModel(BasicModel.buildOKModel().setResult(results)); + return mav; + } + + private Map analyseAddress(String city, String address) { + + if (StringUtils.isBlank(address)) { + return Collections.EMPTY_MAP; + } + try { + Address addr = addressParserService.standardize(city, address); + if (!addr.isAvailable()) { + return Collections.EMPTY_MAP; + } + Map addrWeightMap = new HashMap(); + + if (StringUtils.isNotBlank(addr.getStreet())) { + String street = addr.getStreet(); + List streets = new ArrayList(); + streets.add(street); + if (street.endsWith("弄")) { + addrWeightMap.put(street, MatchText.MAIN_ADDR_PRIORITY); + addrWeightMap.put(street.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); + streets.add(street.replaceAll("弄$", "号")); + } + if (StringUtils.isNotBlank(addr.getStreetNumber())) { + for (String s : streets) { + if (addr.getStreetNumber().endsWith("号")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("号$", "弄"), + MatchText.GEN_ADDR_PRIORITY); + } else if (street.endsWith("弄")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("弄$", "号"), + MatchText.GEN_ADDR_PRIORITY); + } + } + } + + if (CollectionUtils.isNotEmpty(addr.getStreetNumbers())) { + addrWeightMap.put(street + addr.getStreetNumber(), MatchText.MAIN_ADDR_PRIORITY); + for (String s : streets) { + for (String streetNumber : addr.getStreetNumbers()) { + if (streetNumber.endsWith("号")) { + addrWeightMap.put(s + streetNumber.replaceAll("号$", "弄"), MatchText.GEN_ADDR_PRIORITY); + } else if (street.endsWith("弄")) { + addrWeightMap.put(s + streetNumber.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); + } + } + } + } + + } else { + addrWeightMap.put(addr.getMiniAddress(), MatchText.MAIN_ADDR_PRIORITY); + } + return addrWeightMap; + } catch (Exception e) { + + } + return Collections.EMPTY_MAP; + + } + + public Object standardizeAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + Address address = addressParserService.standardize(model.getCity(), model.getAddress()); + mav.setModel(BasicModel.buildOKModel().setResult(address)); + return mav; + } + + public Object realCertificateAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Certificate); + matchParams.setPreciseLevel(PreciseLevel.STRICT); + Building building = addressParserService.certificate(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + if (address.getDistrict() != null) { + dto.append("district", address.getDistrict()); + } else { + dto.append("district", building.getDistrict()); + } + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + dto.append("name", building.getSuggestName()); + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + dto.append("certified", address.getCertified()); + dto.append("floor", address.getFloor()); + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } + + public Object certificateAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.certificate(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object authAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.auth(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object realAuthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Certificate); + matchParams.setUseMap(true); + Building building = addressParserService.certificate(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + dto.append("district", address.getDistrict()); + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + List certified = address.getCertified(); + if (certified.contains("roomNumber")) { + dto.append("authLevel", "A"); + } else if (certified.contains("buildingNumber")) { + dto.append("authLevel", "B"); + } else { + dto.append("authLevel", "C"); + } + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } + + public Map analyseAddress(String address) { + Map ret = new HashMap(); + ret.put("address", address); + if (districts_cache.isEmpty()) { + List serverAreas = serverAreaService.findAll(); + for (ServerArea serverArea : serverAreas) { + if (StringUtils.isBlank(serverArea.getProvince())) { + continue; + } + String city = serverArea.getDisplay(); + String province = serverArea.getProvince(); + List cities = districts_cache.get(province); + if (cities == null) { + cities = new ArrayList(); + districts_cache.put(province, cities); + } + if (!cities.contains(city)) { + cities.add(city); + } + } + } + + for (Entry> p : districts_cache.entrySet()) { + if (address.startsWith(p.getKey())) { + ret.put("province", p.getKey()); + List cities = p.getValue(); + if (cities.size() == 1 && cities.contains(p.getKey())) {// 直辖市 + ret.put("city", p.getKey()); + } else { + String temp = address.substring(p.getKey().length());// 移除省份 + if (temp.startsWith("省") || temp.startsWith("市") || temp.startsWith("县") || temp.startsWith("区")) { + temp = temp.substring(1); + } + for (String c : cities) { + if (temp.startsWith(c)) { + ret.put("city", c); + break; + } + } + } + break; + } + } + return ret; + } + + @Authority(role = Role.USER) + public Object matchAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.parser(convertModelToMap(model)); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); + resultModel.setResult(json.get("result")); + mav.setModel(resultModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址匹配第二个版本,基于第一个版本的逻辑,对匹配出的结果进行正确性的判断 + * + * @param model + * @return + * @author yinjihuan + */ + @Authority(role = Role.USER) + public Object matchV2Action(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.parser(convertModelToMap(model)); + JSONObject json = JSONObject.fromObject(result); + BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); + if (result != null) { + JSONObject jsonResult = (JSONObject) json.get("result"); + if (jsonResult != null && jsonResult.getDouble("credit") > 0) { + CheckMatchDistrictCorrectParam param = new CheckMatchDistrictCorrectParam(); + String city = jsonResult.getString("city"); + String region = jsonResult.getString("district"); + String name = jsonResult.getString("name"); + param.setCity(city); + param.setRegion(region); + param.setName(name); + param.setInputAddress(model.getAddress()); + if (jsonResult.containsKey("lng")) { + param.setBlng(jsonResult.getDouble("lng")); + } + if (jsonResult.containsKey("lat")) { + param.setBlat(jsonResult.getDouble("lat")); + } + param.setDebug(model.isDebug()); + District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); + if (district != null && district.getLng() != null && district.getLng() > 0) { + param.setGlng(district.getLng() / 10000000000.0); + param.setGlat(district.getLat() / 10000000000.0); + } + MatchDistrictResult matchResult = addressMatchProxyService.checkMatchDistrictCorrect(param); + jsonResult.put("matchResult", matchResult); + if (jsonResult.containsKey("category")) { + if ("office".equals(jsonResult.getString("category"))) { + jsonResult.put("propertyType", "写字楼"); + } else if ("shop".equals(jsonResult.getString("category"))) { + jsonResult.put("propertyType", "商铺"); + } + } + } else if (jsonResult != null) { + // 判断是否为自然村 + boolean matchedVillage = false; + try { + if (jsonResult.get("searchAddress") != null) { + JSONObject searchAddress = (JSONObject) jsonResult.get("searchAddress"); + String city = searchAddress.containsKey("city") ? searchAddress.getString("city") : null; + String region = searchAddress.containsKey("district") ? searchAddress.getString("district") : null; + String name = searchAddress.containsKey("keywords") ? searchAddress.getString("keywords") : null; + String township = searchAddress.containsKey("township") ? searchAddress.getString("township") : null; + if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { + List villages = findVillage(city, region, name); + if (CollectionUtils.isNotEmpty(villages)) { + if (villages.size() == 1 || StringUtils.isBlank(township)) { + JSONObject village = villages.get(0).getJSONObject("_source"); + jsonResult.put("id", villages.get(0).getString("_id")); + jsonResult.put("province", village.getString("province")); + jsonResult.put("city", village.getString("city")); + jsonResult.put("district", village.getString("region")); + jsonResult.put("township", village.getString("township")); + jsonResult.put("name", village.getString("name")); + jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); + jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); + jsonResult.put("propertyType", "自然村"); + matchedVillage = true; + } else { + for (JSONObject source : villages) { + JSONObject village = source.getJSONObject("_source"); + if (village.getString("township").contains(township) || township.contains(village.getString("township"))) { + jsonResult.put("id", source.getString("_id")); + jsonResult.put("province", village.getString("province")); + jsonResult.put("city", village.getString("city")); + jsonResult.put("district", village.getString("region")); + jsonResult.put("township", village.getString("township")); + jsonResult.put("name", village.getString("name")); + jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); + jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); + jsonResult.put("propertyType", "自然村"); + matchedVillage = true; + break; + } + } + } + } + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + if (matchedVillage == false) { + jsonResult.put("matchResult", new MatchDistrictResult()); + } + } + resultModel.setResult(json.get("result")); + mav.setModel(resultModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object realMatchAction(@Valid AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + String address = model.getAddress(); + address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + BuildingType buildingType = null; + if (StringUtils.isNotBlank(model.getCategory())) { + if ("property".equals(model.getCategory())) { + model.setCategory("district"); + } + try { + buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); + } catch (Exception e) { + + } + } + PreciseLevel preciseLevel = PreciseLevel.FUZZY; + if ("strict".equals(model.getPreciseLevel())) { + preciseLevel = PreciseLevel.STRICT; + } + MatchParams params = new MatchParams(); + params.setCity(model.getCity()); + params.setSuggestDistrict(model.getSuggestDistrict()); + params.setSuggestName(model.getSuggestName()); + params.setAddress(address); + params.setBuildingType(buildingType); + params.setPreciseLevel(preciseLevel); + params.setProvince(model.getProvince()); + params.setUseMap(model.isUseMap()); + params.setDebugName(model.getDebugName()); + long start = System.currentTimeMillis(); + Building building = addressParserService.parser(params); + long end = System.currentTimeMillis(); + if (end - start > 200) { + LOGGER.warn("匹配parser耗时:\t" + (end - start) + "ms"); + } + if ("true".equalsIgnoreCase(model.getVerify())) { + verify(building); + } + BasicModel baseModel = BasicModel.buildOKModel(); + Map result = convertBuildingToMap(building); + if (!APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) { + submitFetchTask(building); + result.remove("precise"); + result.remove("searchAddress"); + result.remove("map"); + } + baseModel.setResult(result); + mav.setModel(baseModel); + return mav; + } + + Map convertBuildingToMap(Building building) { + Map result = new LinkedHashMap(); + if (building != null) { + result.put("id", building.getId()); + result.put("credit", building.getCredit()); + result.put("precise", building.getPrecise()); + result.put("province", building.getProvince()); + result.put("city", building.getCity()); + result.put("district", building.getDistrict()); + result.put("name", building.getName()); + result.put("suggestName", building.getSuggestName()); + result.put("map", building.getMap()); + result.put("propertyType", building.getPropertyType()); + result.put("township", building.getTownship()); + result.put("suggestAddress", building.getSuggestAddress()); + if ("district".equals(building.getCategory())) { + result.put("category", "property"); + } else { + result.put("category", building.getCategory()); + } + result.put("address", building.getAddress()); + result.put("block", building.getBlock()); + result.put("lng", building.getLng()); + result.put("lat", building.getLat()); + result.put("alias", building.getAlias()); + result.put("searchAddress", building.getSearchAddress()); + } + return result; + } + + public Object cleanCacheAction(final AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + new Thread() { + @Override + public void run() { + addressParserService.clearCache(model.getCity()); + } + }.start(); + mav.setModel(BasicModel.buildOKModel().setMsg("开始刷新缓存")); + return mav; + } + + @Authority(role = Role.NONE) + public Object realMatchAllAction(@Valid AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + String address = model.getAddress(); + address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + BuildingType buildingType = null; + if (StringUtils.isNotBlank(model.getCategory())) { + if ("property".equals(model.getCategory())) { + model.setCategory("district"); + } + buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); + } + PreciseLevel preciseLevel = PreciseLevel.FUZZY; + if ("strict".equals(model.getPreciseLevel())) { + preciseLevel = PreciseLevel.STRICT; + } + MatchParams params = new MatchParams(); + params.setCity(model.getCity()); + params.setSuggestDistrict(model.getSuggestDistrict()); + params.setAddress(address); + params.setBuildingType(buildingType); + params.setPreciseLevel(preciseLevel); + params.setProvince(model.getProvince()); + params.setSuggestName(model.getSuggestName()); + AddressParseResult addressParseResult = addressParserService.parserAll(params); + List buildings = addressParseResult.getBuildings(); + List> buildingObjs = new ArrayList>(buildings.size()); + for (Building building : buildings) { + buildingObjs.add(convertBuildingToMap(building)); + } + BasicModel baseModel = BasicModel.buildOKModel(); + baseModel.setResult(buildingObjs); + mav.setModel(baseModel); + return mav; + } + + @Authority(role = Role.USER) + public Object matchAllAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + String result = addressMatchProxyService.parserAll(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Map convertModelToMap(AddesssMatchModel model) { + + Map params = new HashMap(); + Class clzz = model.getClass(); + for (Field field : clzz.getDeclaredFields()) { + field.setAccessible(true); + String paramName = field.getName(); + try { + Object val = field.get(model); + if (val != null) { + params.put(paramName, val.toString()); + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + return params; + } + + private void verify(Building building) { + String city = building.getCity(); + String region = building.getDistrict(); + String name = null; + if (building.getPrecise() > -1) { + name = building.getName(); + } else { + name = building.getSearchAddress().getOrgKeywords(); + } + if (StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { + String buildingNumber = AddressParserUtil + .standardizeBuildingNumber(building.getSearchAddress().getOrgBuildingNumber()); + if (buildingNumber != null) { + if (houseLoudongService.findHouseLoudong(city, region, name, buildingNumber, null, null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, buildingNumber, + null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } else if (evaluationService.findEvaluationByNum(city, region, name, buildingNumber, null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } + } + + String roomNumber = AddressParserUtil.standardizeRoomNumber(building.getSearchAddress().getOrgRoomNumber()); + if (roomNumber != null) { + if (houseLoudongService.findHouseLoudong(city, region, name, null, null, roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, null, + roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } else if (evaluationService.findEvaluationByNum(city, region, name, null, roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } + } + } + } + + @Authority(role = Role.NONE) + public Object sendFetchTaskAction(AddressModel model) { + + RestfulModelAndView json = new RestfulModelAndView(); + WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); + waitCrawlKeywords.setCity(model.getCity()); + waitCrawlKeywords.setDateCreated(new Date()); + waitCrawlKeywords.setRead(0); + waitCrawlKeywords.setKeywords(model.getAddress()); + waitCrawlKeywordsService.save(waitCrawlKeywords); + json.setModel(waitCrawlKeywords); + + return json; + } + + private void submitFetchTask(Building building) { + if (building.getPrecise() == -1) { + List keywords = new ArrayList(); + Address address = building.getSearchAddress(); + if (StringUtils.isNotBlank(address.getKeywords()) && address.getKeywords().length() > 2) { + keywords.add(address.getKeywords()); + } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 一般小区名不会超过10个字 + keywords.add(address.getOrgAddress()); + } + if (address.isStandardAddress()) { + if (address.getStreetNumbers() != null) { + for (String b : address.getStreetNumbers()) { + keywords.add(address.getStreet() + b); + } + } else { + keywords.add(address.getStreet()); + } + } + keywords = DataUtil.uniqueList(keywords); + for (String k : keywords) { + WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); + waitCrawlKeywords.setCity(address.getCity()); + waitCrawlKeywords.setDateCreated(new Date()); + waitCrawlKeywords.setRead(0); + waitCrawlKeywords.setKeywords(k); + waitCrawlKeywordsService.save(waitCrawlKeywords); + } + } + } + + /** + * 从Excel表中加载测试数据 + * + * @return + */ + private List> loadTestDataFromExcel(String excelFileName) { + List> ret = new ArrayList>(); + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(excelFileName); + HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); + HSSFSheet sheet = workbook.getSheetAt(0); + // 行号 + boolean isFirstRow = true; + for (Row row : sheet) { + if (isFirstRow) { + // 第一行,过掉 + isFirstRow = false; + continue; + } + + // 得到列数 + // row.getPhysicalNumberOfCells(); + String in_name = row.getCell(1).toString(); + if (in_name.equals("")) { + // 跳过空内容 + continue; + } + Map data = new HashMap(); + // 第0列:城市 + data.put("city", row.getCell(0).toString()); + // 第一列:输入地址 + data.put("in_name", in_name); + // 第二列:期望名称,用于验证 + Cell cell = row.getCell(2); + if (cell != null) { + data.put("out_name", cell.toString()); + } + ret.add(data); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (fileInputStream != null) { + try { + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return ret; + } + + /** + * 从Excel表中加载测试数据 + * + * @return + */ + private List> loadJingDongTestDataFromExcel(String excelFileName) { + + List> ret = new ArrayList>(); + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(excelFileName); + HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); + HSSFSheet sheet = workbook.getSheetAt(0); + // 行号 + boolean isFirstRow = true; + for (Row row : sheet) { + if (isFirstRow) {// 第一行,过掉 + isFirstRow = false; + continue; + } + String province = row.getCell(0).toString(); + String city = row.getCell(1).toString(); + String in_address = row.getCell(2).toString(); + if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 跳过空内容 + System.out.println("-->" + row.getRowNum()); + continue; + } + + Map formate = analyseAddress(in_address); + Map data = new HashMap(); + data.put("in_address", in_address); + data.put("city", city); + String formattedAddress = new String(in_address); + List huanxian = Arrays.asList("中环外环之间", "内环以内", "内环中环之间", "中环以内", "外环以外", "(内环高速以里)", "外环外其它地区", + "五环以外", "六环以内", "内环到三环里", "内环到二环里", "二环里", "三环到四环之间", "二环到三环", "四环到五环之间", "二环到三环", "五环至六环之间", + "五环到六环之间", "五环到六环之间", "三环以内", "四环到五环内", "六环以外(其他地区)", "六环以外(张家湾镇、台湖镇、漷县镇)", "六环以外(宋庄镇)", + "一环到二环", "六环以外", "四环至五环之间", "六环外(马驹桥镇)"); + for (String a : huanxian) { + formattedAddress = formattedAddress.replace(a, ""); + } + data.put("formatted_in_address", formattedAddress); + data.put("province", province); + if (formate.get("city") != null) { + data.put("formatedCity", formate.get("city")); + } else { + if (city.endsWith("市") || city.endsWith("县")) { + city = city.substring(0, city.length() - 1); + } else { + if (province.endsWith("市")) { + city = province.substring(0, province.length() - 1); + } else { + city = province; + } + } + data.put("formatedCity", city); + } + ret.add(data); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (fileInputStream != null) { + try { + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return ret; + } + + private JSONObject addTerm(String name, String value) { + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put(name, value); + term.put("term", match); + return term; + } + + private JSONObject addMatchPhrase(String name, String value) { + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put(name, value); + term.put("match_phrase", match); + return term; + } + + /*** + * 获取自然村 + * @param city + * @param region + * @param name + * @return + */ + private List findVillage(String city, String region, String name) { + JSONObject reqBody = new JSONObject(); + reqBody.put("from", 0); + reqBody.put("size", 5); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerm("city", city)); + must.add(addTerm("region", region)); + must.add(addTerm("name", name)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + HttpRequest request = new HttpRequest(); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + try { + String response = request.postWithBody("http://192.168.0.45:9200/village/_search", reqBody, headers, "UTF-8"); + JSONObject json = JSONObject.fromObject(response); + if (!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")) { + return Collections.emptyList(); + } + JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); + List results = new ArrayList(); + for (int i = 0; i < hits.size(); i++) { + JSONObject jsonObject = hits.getJSONObject(i); + results.add(jsonObject); + } + return results; + + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 加载测试数据 + * + * @return + */ + private List> loadTestData() { + BufferedReader reader = null; + List> ret = new ArrayList>(); + try { + reader = new BufferedReader( + new InputStreamReader(new FileInputStream("D:\\data\\addr\\test20140923.txt"), "utf-8")); + boolean isFirst = true; + while (true) { + String line = reader.readLine(); + if (line == null) { + break; + } + if (isFirst) { + isFirst = false; + int c = line.charAt(0); + if (c == 65279) { + // 去掉UTF-8中头标示 + line = line.substring(1); + } + } + ret.add(parseTestData(line)); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + + } + } + } + return ret; + } + + /** + * 解析测试数据,其中输入字符串为以TAB分隔的字符串,例如: in_name:经济技术开发区贵园北里丁区 out_name:贵园北里 + * + * @param s + * @return + */ + private Map parseTestData(String s) { + Map ret = new HashMap(); + String[] columns = s.split("\t"); + for (String column : columns) { + int index = column.indexOf(":"); + String key; + String value; + if (index > 0) { + key = column.substring(0, index); + value = column.substring(index + 1); + ret.put(key, value); + } + } + return ret; + } + + @Authority(role = Role.USER) + public Object parseAddressAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + District district = addressService.parseAddress(model.getCity(), model.getAddress()); + if (district != null) { + Map resMap = new HashMap(); + resMap.put("city", district.getCity()); + resMap.put("region", district.getRegion()); + resMap.put("districtName", district.getName()); + resMap.put("address", district.getAddress()); + mav.setModel(resMap); + } + return mav; + } + + @Authority(role = Role.USER) + public Object geocoderAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + + double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + Map resMap = new HashMap(); + resMap.put("lng", lngLat[0]); + resMap.put("lat", lngLat[1]); + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object geocoderBaiduToGoogleAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + + double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + Map resMap = new HashMap(); + resMap.put("lng", lngLat[0]); + resMap.put("lat", lngLat[1]); + mav.setModel(resMap); + return mav; + } + + @Deprecated + @Authority(role = Role.USER) + public Object addressEvaluationAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { + return mav; + } + + Map resMap = new HashMap(); + resMap.put("totalPrice", + addressService.evaluationByAddress(model.getCity(), model.getAddress(), model.getArea(), AK)); + mav.setModel(resMap); + return mav; + } + + @Deprecated + @Authority(role = Role.USER) + public Object addressEvaluation2Action(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { + return mav; + } + + Date weekend = DateUtil.getThisSunday(new Date()); + if (model.getWeekend() != null) { + weekend = DateUtil.getThisSunday(model.getWeekend()); + } + + Map resMap = new HashMap(); + resMap.put("totalPrice", 0); + + District district = addressService.parseAddress(model.getCity(), model.getAddress()); + if (district == null) { + double[] lngLatBaidu = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + if (lngLatBaidu == null) { + mav.setModel(resMap); + return mav; + } + double[] lngLatGoogle = addressService.geoconvBaiduToGoogle(lngLatBaidu[0], lngLatBaidu[1]); + double lng = lngLatGoogle[0]; + double lat = lngLatGoogle[1]; + List params = new ArrayList(); + SdQuery sdQuery = new SdQuery(); + if (lat < -90 && lat > 90 && lng < -180 && lng > 180) { + mav.setModel(resMap); + return mav; + } + params.add(new QueryParam("city", model.getCity())); + params.add(new QueryParam("visible", 0)); + sdQuery.setPoint(lat + "," + lng); + sdQuery.setField("lat_lng"); + sdQuery.setDistance("" + (500 / 1000d)); + params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); + List districts = districtService.findAllByParams(params, 0, 3); + + int totalPrice = 0; + int tc = 0; + for (District dis : districts) { + Evaluation evaluation = new Evaluation(); + evaluation.setCity(dis.getCity()); + evaluation.setRegion(dis.getRegion()); + evaluation.setDistrictName(dis.getName()); + evaluation.setArea(model.getArea()); + evaluation.setSource("api_diZhiGuJia"); + evaluation = evaluationService.saveEvaluation(evaluation, weekend); + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() > 0) { + totalPrice += evaluation.getTotalPrice(); + tc++; + } + } + if (tc > 0) { + resMap.put("totalPrice", totalPrice / tc); + } + // } + } else { + Evaluation evaluation = new Evaluation(); + evaluation.setCity(district.getCity()); + evaluation.setRegion(district.getRegion()); + evaluation.setDistrictName(district.getName()); + evaluation.setArea(model.getArea()); + evaluation.setSource("api_diZhiGuJia"); + evaluation = evaluationService.saveEvaluation(evaluation, weekend); + resMap.put("totalPrice", evaluation.getTotalPrice()); + + District dist = districtService.findDistrict( + new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); + if (null != dist) { + if (null != dist.getCarSiteCount() && dist.getCarSiteCount() > 0) { + resMap.put("carSiteCount", dist.getCarSiteCount()); + } + } + + CommData commData = commDataService.findCommDataByCity(district.getCity(), district.getRegion(), + district.getName(), "district"); + if (null != commData && commData.getLastCount() > 0) { + resMap.put("householdCount", commData.getLastCount()); + } + } + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object addressStandardParserAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object addressStandardAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + model.setAddress(AddressParserUtils.filteSpecialChar(model.getAddress())); + Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); + resMap.put("oldAddress", model.getAddress()); + + if (resMap.get("city") == null || model.getAddress() == null) { + return mav; + } + + District district = null; + // 根据地址查找小区 + if (resMap.get("address") != null) { + district = addressService.parseAddress(resMap.get("city").toString(), resMap.get("address").toString()); + } + // 根据地址中提取出的小区名称查小区 + String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 地址中疑似小区 + if (district == null && null != oldName) { + district = addressService.parseAddress(resMap.get("city").toString(), oldName); + // 百度查小区 + if (district == null && null != oldName) { + Map ret = baiduApiService.mapSearchSimple(resMap.get("city").toString(), oldName, AK); + List rets = (List) ret.get("content"); + if (null != rets) { + boolean flag = false; + for (Map vo : rets) { + List> vs = (List>) vo.get("cla"); + if (vs == null) { + continue; + } + for (List list : vs) { + String s = list.get(1); + if (s.indexOf("小区") != -1 || s.indexOf("楼盘") != -1) { + flag = true; + resMap.put("name", oldName); + String baiduAddress = (String) vo.get("addr"); + if (StringUtils.isNotBlank(baiduAddress)) { + + if (StringUtils.isBlank((String) resMap.get("address"))) { + resMap.put("address", baiduAddress); + } + + } + + break; + } + } + } + + if (!flag && resMap.get("address") == null) { + resMap.put("address", oldName); + } + } + } + } + + if (district != null) { + District dist = districtService.findDistrict( + new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); + if (dist != null) { + district = dist; + } + resMap.put("status", "0"); + } else { + resMap.put("status", "1"); + } + + // 当businessMatch=1,并且进行小区匹配没有成功的情况下,进行商铺写字楼匹配 通过keyword查找 + if (null != model.getBusinessMatch() && model.getBusinessMatch() == 1 && resMap.get("status").equals("1") + && StringUtils.isNotBlank((String) resMap.get("city"))) { + if (StringUtils.isNotBlank(oldName)) { + district = districtService.findFirstByKeyword((String) resMap.get("city"), oldName); + } + + if (null == district && StringUtils.isNotBlank((String) resMap.get("address"))) { + district = districtService.findFirstByKeyword((String) resMap.get("city"), + (String) resMap.get("address")); + } + } + + if (district != null) { + + resMap.put("name", district.getName()); + resMap.put("region", district.getRegion()); + resMap.put("block", district.getBlock()); + resMap.put("cat", district.getCategory()); + resMap.put("alias", district.getAlias()); + + String tempAddress = (String) resMap.get("address"); + if (StringUtils.isBlank(tempAddress)) { + resMap.put("address", district.getAddress()); + } else { + if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 + || tempAddress.indexOf("路") == -1) { + resMap.put("address", district.getAddress()); + } + } + } + + String lastAddress = (String) resMap.get("address"); + if (StringUtils.isNotBlank(lastAddress)) { + if (lastAddress.length() < 2) { + resMap.put("address", null); + } else { + resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); + } + + } + resMap.remove("louDong"); + mav.setModel(resMap); + return mav; + } + + public Object address2DistrictAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + String orgCity = model.getCity(); + String orgAddress = AddressParserUtils.filteSpecialChar(model.getAddress()); + if (StringUtils.isBlank(orgCity) || StringUtils.isBlank(orgAddress)) { + return mav; + } + + Map resMap = addressService.parseSelectAddressInfo(orgCity, orgAddress); + resMap.put("oldAddress", orgAddress); + resMap.remove("louDong"); + + if (null == resMap.get("city")) { + return mav; + } + + String city = (String) resMap.get("city"); + District district = null; + // 小区库匹配 + String address = (String) resMap.get("address"); + if (StringUtils.isNotBlank(address)) { + // 地址、小区名、别名匹配 + List params = new ArrayList(4); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("visible", 0)); + + TermQuery q1 = new TermQuery(new Term("name", address)); + TermQuery q2 = new TermQuery(new Term("alias", address)); + TermQuery q3 = new TermQuery(new Term("address", address)); + BooleanQuery bq = new BooleanQuery(); + bq.add(q1, Occur.SHOULD); + bq.add(q2, Occur.SHOULD); + bq.add(q3, Occur.SHOULD); + params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); + + List ds = districtService.findAllByParams(params, 0, 1); + if (CollectionUtils.isNotEmpty(ds)) { + district = ds.get(0); + } + } + + // 根据地址中提取出的小区名称查小区 + String oldName = StringUtils.trim((String) resMap.get("oldName")); + if (null == district && StringUtils.isNotBlank(oldName)) { + // 小区名、别名匹配 + List params = new ArrayList(4); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("visible", 0)); + + TermQuery q1 = new TermQuery(new Term("name", oldName)); + TermQuery q2 = new TermQuery(new Term("alias", oldName)); + BooleanQuery bq = new BooleanQuery(); + bq.add(q1, Occur.SHOULD); + bq.add(q2, Occur.SHOULD); + params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); + + List ds = districtService.findAllByParams(params, 0, 1); + if (CollectionUtils.isNotEmpty(ds)) { + district = ds.get(0); + } + } + + // 地址库匹配 + if (null == district) { + // todo + } + + if (null == district) { + resMap.put("status", 1); + } else { + resMap.put("status", 0); + resMap.put("name", district.getName()); + resMap.put("region", district.getRegion()); + resMap.put("block", district.getBlock()); + resMap.put("cat", district.getCategory()); + resMap.put("alias", district.getAlias()); + + String tempAddress = (String) resMap.get("address"); + if (StringUtils.isBlank(tempAddress)) { + resMap.put("address", district.getAddress()); + } else { + if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 + || tempAddress.indexOf("路") == -1) { + resMap.put("address", district.getAddress()); + } + } + } + + String lastAddress = (String) resMap.get("address"); + if (StringUtils.isNotBlank(lastAddress)) { + if (lastAddress.length() < 2) { + resMap.put("address", null); + } else { + resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); + } + } + + mav.setModel(resMap); + return mav; + } + + private String findStandardRegion(String city, String region) { + + List regionBloks = regionBlockService.getRegionBlockListByCity(city, null); + String s_region = ""; + if (regionBloks.size() > 0) { + for (RegionBlock regionBlock : regionBloks) { + List patterns = regionBlock.getPattern(); + if (null != patterns && patterns.contains(region)) { + s_region = regionBlock.getName(); + break; + } else { + if (regionBlock.getName().indexOf(region) != -1) { + s_region = region; + break; + } + } + } + } else { + s_region = region; + } + return s_region; + } + + /** + * 地址联想提示 (高德官方) /address/su 参数:address city + * 返回:[{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}] + * + * @return + */ + public Object suAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + try { + List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(list); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址真实性检查 (高德官方) /address/check 参数:chooseId address city + * 返回:{type:"存在|不存在|存疑",data:{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}} + * 存疑的时候才有data返回,返回高德搜索的第一条数据 (超过的时候,找到最大号码返回) + * + * @return + */ + public Object checkAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈 + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo2(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // if (StringUtils.isEmpty(check.getAddress()) || + // "[]".equals(check.getAddress())) { + // check.setAddress(check.getName()); + // } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setLevel(null); + check.setScoreIncity(null); + check.setScoreInnation(null); + check.setPriceScore(null); + check.setAreaScore(null); + check.setEstateScore(null); + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } + + /** + * 查询高德城市及城市编码 + * + * @return + */ + public Object cityAllAction() { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + List list = addressService.findAllCityAmap(); + BasicModel model = new BasicModel(HttpStatusCodeEnum.OK); + model.setResult(list); + mav.setModel(model); + return mav; + } + + /** + * 地址联想提示 (代理) + * + * @return + */ + public Object suAmapAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + try { + List list = addressService.su(model.getCity().trim(), model.getAddress().trim()); + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(list); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址真实性检查 (代理) + * + * @return + */ + public Object checkAmapAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.check(model.getChooseId(), city, model.getAddress().trim()); + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址评级 + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", + * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": + * 经纬度, "lng": 经纬度, "name": "匹配POIName", "score": 评分 }, "type": "可能存在" } + * } + */ + public Object gradeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址反欺诈 (地址验真+周边查询) + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", + * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": + * 纬度, "lng": 经度, "name": "匹配POIName", "poiList":[ { "name" : + * "文洋大厦停车场(协和路)", "type" : "类型", "address" : "协和路1033号", "lat": 纬度, + * "lng": 经度, "distance":距离 },... ] }, "type": "存在" } } + */ + public Object antiFraudAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.antiFraudAmap(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址反欺诈 (地址验真+周边查询) + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": + * "德州路220弄小区", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": + * "上海市", "keyWords": "德州路220弄", "keyWordsUse": "德州路220弄", "lat": + * 31.167814, "lng": 121.495784, "name": "上海后来居上家庭公寓(德州路分店)", "poiMap": + * { "加油站": [ { "address": "杨思路648号", "distance": "642.0m", "lat": + * 31.162078, "lng": 121.496522, "name": "中国石化加油站(杨思路)", "type": "加油站" + * }, { "address": "杨思路2号", "distance": "1.6km", "lat": 31.15627, "lng": + * 121.485031, "name": "中国石油杨思加油站(杨思路)", "type": "加油站" }, ... ] } ... }, + * "type": "存在" } } + */ + public Object antiFraudBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.antiFraudAmapB(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + public Object standardAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + String result = addressMatchProxyService.standard(convertModelToMap(model)); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + int code = json.getInt("code"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址标准化接口V2 + * + * @param model + * @return + */ + public Object standard2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + params.put("showCode", model.getShowCode()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 招商证券POC测试接口封装 + */ + public Object cmbTestAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级行政区划V2地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructure2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 详细地址标准化接口 + * + * @param model + * @return + */ + public Object divisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址标准化专用测试接口 + * + * @param model + * @return + */ + public Object structureAndCompleteAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址信息分类接口 + * + * @param model + * @return + */ + public Object communitySummaryAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 楼盘评级 + * + * @param model + * @return + */ + public Object buildingRatingAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 财力评级 + * + * @param model + * @return + */ + public Object financialRatingAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress()) || "null".equals(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object similarityAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { + mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); + return mav; + } + model.setAddress(model.getAddress_1()); + String result1 = addressMatchProxyService.standard(convertModelToMap(model)); + model.setAddress(model.getAddress_2()); + String result2 = addressMatchProxyService.standard(convertModelToMap(model)); + if (result1 != null && result2 != null) { + Map resultMap = addressService.addressSimilarity(result1, result2); + mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object parseCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getProvince())) { + mav.setModel(BasicModel.buildBadRequestModel("province不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getDistrict())) { + mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); + return mav; + } + CityParseBo bo = addressService.cityParse(model.getProvince(), model.getDistrict()); + if (bo.getCity() != null) { + UniversalDto dto = UniversalDto.newDto(); + dto.append("city", bo.getCity()); + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + } else { + mav.setModel(BasicModel.buildModel(40001, bo.getMsg())); + } + return mav; + } + + public Object realStandardAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } /*if (StringUtils.isBlank(model.getCity())) { mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); return mav; }*/ - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Match); - matchParams.setPreciseLevel(PreciseLevel.STRICT); - matchParams.setProvince(model.getProvince()); + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Match); + matchParams.setPreciseLevel(PreciseLevel.STRICT); + matchParams.setProvince(model.getProvince()); // matchParams.setUseMap(true); - matchParams.setUseAliyunApi(false); + matchParams.setUseAliyunApi(false); // matchParams.setUseCrf(true); - matchParams.setContainsLocation(model.isContainsLocation()); - Building building = addressParserService.standard(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - if (address.getDistrict() != null) { - dto.append("district", address.getDistrict()); - } else { - dto.append("district", building.getDistrict()); - } - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - if(StringUtils.isBlank(building.getSuggestName())){ - if(StringUtils.isNotBlank(address.getParsedPropertyName())){ - dto.append("name", address.getParsedPropertyName()); - }else if(StringUtils.isNotBlank(address.getOrgKeywords())){ - dto.append("name", address.getOrgKeywords()); - } - }else{ - dto.append("name", building.getSuggestName()); - } - if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ - String addr = building.getAddress(); - String street = AddressParserUtil.extractStreet(addr); - if(street != null){ - dto.append("street", street); - if(addr.length() != street.length()){ - dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr)); - } - }else if(StringUtils.isNotBlank(building.getStreet())){ - dto.append("street", building.getStreet()); - if(StringUtils.isNotBlank(building.getStreetno())){ - dto.append("streetNumber", building.getStreetno()); - } - } - } - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("floor", address.getFloor()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - if(matchParams.isContainsLocation()){ - dto.append("lat", building.getLat()); - dto.append("lng", building.getLng()); - } - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } + matchParams.setContainsLocation(model.isContainsLocation()); + Building building = addressParserService.standard(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + if (address.getDistrict() != null) { + dto.append("district", address.getDistrict()); + } else { + dto.append("district", building.getDistrict()); + } + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + if (StringUtils.isBlank(building.getSuggestName())) { + if (StringUtils.isNotBlank(address.getParsedPropertyName())) { + dto.append("name", address.getParsedPropertyName()); + } else if (StringUtils.isNotBlank(address.getOrgKeywords())) { + dto.append("name", address.getOrgKeywords()); + } + } else { + dto.append("name", building.getSuggestName()); + } + if (StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())) { + String addr = building.getAddress(); + String street = AddressParserUtil.extractStreet(addr); + if (street != null) { + dto.append("street", street); + if (addr.length() != street.length()) { + dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr)); + } + } else if (StringUtils.isNotBlank(building.getStreet())) { + dto.append("street", building.getStreet()); + if (StringUtils.isNotBlank(building.getStreetno())) { + dto.append("streetNumber", building.getStreetno()); + } + } + } + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("floor", address.getFloor()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + if (matchParams.isContainsLocation()) { + dto.append("lat", building.getLat()); + dto.append("lng", building.getLng()); + } + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } - /** - * 进行地址的取舍 - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - // 添加地址和address的取舍 - chooseAddressAndName(check); - formatAddressAndName(check); + /** + * 进行地址的取舍 + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + // 添加地址和address的取舍 + chooseAddressAndName(check); + formatAddressAndName(check); - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setLevel(null); - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setLevel(null); + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - private void chooseAddressAndName(AddressCheck check) { - boolean isNameOk = false; - boolean isAddressOk = false; - String keyWords = check.getKeyWords(); - // 再我方拆词接口 - String name = check.getName(); - String address = check.getAddress(); - if (!isNameOk && isCorrectName(name)) { - check.setName(name); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddress(address)) { - check.setAddress(address); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 优先级先高德POI - String namePoi = check.getNameUse(); - String addressPoi = check.getAddressUse(); - if (!isNameOk && isCorrectNamePoi(namePoi, keyWords)) { - check.setName(namePoi); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddressPoi(addressPoi, keyWords)) { - check.setAddress(addressPoi); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 再高德地址编码 - String namePoi2 = check.getName2(); - String addressPoi2 = check.getAddress2(); - if (!isNameOk && isCorrectNamePoi(namePoi2, keyWords)) { - check.setName(namePoi2); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddressPoi(addressPoi2, keyWords)) { - check.setAddress(addressPoi2); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 最后高德标准化地址拆分 - String formateAddress = check.getFormatAddress(); - if (StringUtils.isNotEmpty(formateAddress)) { - Map resultMap = addressService.splitAddress(check.getCity(), formateAddress); - String nameNew = resultMap.get("name"); - String addressNew = resultMap.get("address"); - if (!isNameOk && isCorrectName(nameNew) && isCorrectNamePoi(nameNew, keyWords)) { - check.setName(nameNew); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddress(addressNew) && isCorrectAddressPoi(addressNew, keyWords)) { - check.setAddress(addressNew); - isAddressOk = true; - } - } + private void chooseAddressAndName(AddressCheck check) { + boolean isNameOk = false; + boolean isAddressOk = false; + String keyWords = check.getKeyWords(); + // 再我方拆词接口 + String name = check.getName(); + String address = check.getAddress(); + if (!isNameOk && isCorrectName(name)) { + check.setName(name); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddress(address)) { + check.setAddress(address); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 优先级先高德POI + String namePoi = check.getNameUse(); + String addressPoi = check.getAddressUse(); + if (!isNameOk && isCorrectNamePoi(namePoi, keyWords)) { + check.setName(namePoi); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddressPoi(addressPoi, keyWords)) { + check.setAddress(addressPoi); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 再高德地址编码 + String namePoi2 = check.getName2(); + String addressPoi2 = check.getAddress2(); + if (!isNameOk && isCorrectNamePoi(namePoi2, keyWords)) { + check.setName(namePoi2); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddressPoi(addressPoi2, keyWords)) { + check.setAddress(addressPoi2); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 最后高德标准化地址拆分 + String formateAddress = check.getFormatAddress(); + if (StringUtils.isNotEmpty(formateAddress)) { + Map resultMap = addressService.splitAddress(check.getCity(), formateAddress); + String nameNew = resultMap.get("name"); + String addressNew = resultMap.get("address"); + if (!isNameOk && isCorrectName(nameNew) && isCorrectNamePoi(nameNew, keyWords)) { + check.setName(nameNew); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddress(addressNew) && isCorrectAddressPoi(addressNew, keyWords)) { + check.setAddress(addressNew); + isAddressOk = true; + } + } - if (!isNameOk) { - check.setName(null); - } + if (!isNameOk) { + check.setName(null); + } - if (!isAddressOk) { - check.setAddress(null); - } - } + if (!isAddressOk) { + check.setAddress(null); + } + } - private void formatAddressAndName(AddressCheck check) { - String nameEnd = check.getName(); - String addressEnd = check.getAddress(); - // name处理 - if (StringUtils.isNotEmpty(nameEnd)) { - if (isStartWithNum(nameEnd) || isEndWithNum(nameEnd)) { - nameEnd = null; - } else { - // 去掉楼结尾的 - nameEnd = check.getName(); - // 先去头部楼层 - String floorNum = isContainsFloorNum(nameEnd); - if (StringUtils.isNotEmpty(floorNum) && nameEnd.startsWith(floorNum)) { - nameEnd = nameEnd.substring(floorNum.length(), nameEnd.length()); - } - // 再去尾部楼层 - String floorNum2 = isContainsFloorNum(nameEnd); - if (StringUtils.isNotEmpty(floorNum2) && nameEnd.endsWith(floorNum2)) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(floorNum2)); - } - // 再判断是否带数字- - String numData = isContainsNumData(nameEnd); - if (StringUtils.isNotEmpty(numData) && nameEnd.endsWith(numData)) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(numData)); - } - // 处理后是否超过三个字符 - if (nameEnd.length() < 3) { - nameEnd = null; - } else if (nameEnd.endsWith("旁")) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("旁")); - } - } - check.setName(nameEnd); - } + private void formatAddressAndName(AddressCheck check) { + String nameEnd = check.getName(); + String addressEnd = check.getAddress(); + // name处理 + if (StringUtils.isNotEmpty(nameEnd)) { + if (isStartWithNum(nameEnd) || isEndWithNum(nameEnd)) { + nameEnd = null; + } else { + // 去掉楼结尾的 + nameEnd = check.getName(); + // 先去头部楼层 + String floorNum = isContainsFloorNum(nameEnd); + if (StringUtils.isNotEmpty(floorNum) && nameEnd.startsWith(floorNum)) { + nameEnd = nameEnd.substring(floorNum.length(), nameEnd.length()); + } + // 再去尾部楼层 + String floorNum2 = isContainsFloorNum(nameEnd); + if (StringUtils.isNotEmpty(floorNum2) && nameEnd.endsWith(floorNum2)) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(floorNum2)); + } + // 再判断是否带数字- + String numData = isContainsNumData(nameEnd); + if (StringUtils.isNotEmpty(numData) && nameEnd.endsWith(numData)) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(numData)); + } + // 处理后是否超过三个字符 + if (nameEnd.length() < 3) { + nameEnd = null; + } else if (nameEnd.endsWith("旁")) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("旁")); + } + } + check.setName(nameEnd); + } - // 地址处理 - if (StringUtils.isNotEmpty(addressEnd)) { - // 检查是否路结尾,以及关键字中是否带路号 - if (addressEnd.endsWith("路")) { - String streetNum = isContainsAddressNum(check.getKeyWords()); - if (StringUtils.isNotEmpty(streetNum)) { - check.setAddress(addressEnd + streetNum); - } - } - } - } + // 地址处理 + if (StringUtils.isNotEmpty(addressEnd)) { + // 检查是否路结尾,以及关键字中是否带路号 + if (addressEnd.endsWith("路")) { + String streetNum = isContainsAddressNum(check.getKeyWords()); + if (StringUtils.isNotEmpty(streetNum)) { + check.setAddress(addressEnd + streetNum); + } + } + } + } - private boolean isStartWithNum(String keyWords) { - Pattern p = Pattern.compile("^[0-9]+"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - return true; - } - return false; - } + private boolean isStartWithNum(String keyWords) { + Pattern p = Pattern.compile("^[0-9]+"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + return true; + } + return false; + } - private boolean isEndWithNum(String keyWords) { - Pattern p = Pattern.compile("[0-9]+$"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - return true; - } - return false; - } + private boolean isEndWithNum(String keyWords) { + Pattern p = Pattern.compile("[0-9]+$"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + return true; + } + return false; + } - private String isContainsAddressNum(String keyWords) { - String num = null; - Pattern p = Pattern.compile("路[0-9]+-{1}[0-9]+号"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - num = num.substring(1, num.length()); - } - return num; - } + private String isContainsAddressNum(String keyWords) { + String num = null; + Pattern p = Pattern.compile("路[0-9]+-{1}[0-9]+号"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + num = num.substring(1, num.length()); + } + return num; + } - private static final String ERROR_NAME = "工业区&商住楼&开发区&金融街&汽配城&商贸中心&发展中心&公寓楼&商贸城&国际大厦&开发区&综合楼&商贸中心&综合大楼&创业园"; + private static final String ERROR_NAME = "工业区&商住楼&开发区&金融街&汽配城&商贸中心&发展中心&公寓楼&商贸城&国际大厦&开发区&综合楼&商贸中心&综合大楼&创业园"; - private boolean isCorrectName(String name) { - if (StringUtils.isEmpty(name)) {// 为空 - return false; - } else if (name.length() < 3) {// 字符少于三个 - return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 - return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取之后一个字符 - // 判断是否为数字或字母 - if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { - return false; - } - } else if (name.endsWith("路")) { - return false; - } else if (ERROR_NAME.contains(name)) { - return false; - } - return true; - } + private boolean isCorrectName(String name) { + if (StringUtils.isEmpty(name)) {// 为空 + return false; + } else if (name.length() < 3) {// 字符少于三个 + return false; + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(name)) { // 不包含汉字 + return false; + } else if (name.startsWith("之")) {// 以之开头,带数字的 + String c = name.substring(1, 2);// 取之后一个字符 + // 判断是否为数字或字母 + if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { + return false; + } + } else if (name.endsWith("路")) { + return false; + } else if (ERROR_NAME.contains(name)) { + return false; + } + return true; + } - private String isContainsFloorNum(String keyWords) { - String num = null; - Pattern p = Pattern.compile( - "[0-9]+楼|[一|二|三|四|五|六|七|八|九|十]+楼|[a-zA-Z]+楼|[0-9]+幢|[一|二|三|四|五|六|七|八|九|十]+幢|[a-zA-Z]+幢|[0-9]+号|[一|二|三|四|五|六|七|八|九|十]+号|[a-zA-Z]+号"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - } - return num; - } + private String isContainsFloorNum(String keyWords) { + String num = null; + Pattern p = Pattern.compile( + "[0-9]+楼|[一|二|三|四|五|六|七|八|九|十]+楼|[a-zA-Z]+楼|[0-9]+幢|[一|二|三|四|五|六|七|八|九|十]+幢|[a-zA-Z]+幢|[0-9]+号|[一|二|三|四|五|六|七|八|九|十]+号|[a-zA-Z]+号"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + } + return num; + } - private String isContainsNumData(String keyWords) { - String num = null; - Pattern p = Pattern.compile("[0-9]+-|[一|二|三|四|五|六|七|八|九|十]+-|[a-zA-Z]+-"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - } - return num; - } + private String isContainsNumData(String keyWords) { + String num = null; + Pattern p = Pattern.compile("[0-9]+-|[一|二|三|四|五|六|七|八|九|十]+-|[a-zA-Z]+-"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + } + return num; + } - private boolean isCorrectNamePoi(String name, String keyWords) { - if (StringUtils.isEmpty(name)) {// 为空 - return false; - } else if (name.length() < 3) {// 字符少于三个 - return false; - } else if (!keyWords.contains(name)) { - return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 - return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取楼前一个字符 - // 判断是否为数字或字母 - if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { - return false; - } - } else if (name.endsWith("路")) { - return false; - } else if (ERROR_NAME.contains(name)) { - return false; - } - return true; - } + private boolean isCorrectNamePoi(String name, String keyWords) { + if (StringUtils.isEmpty(name)) {// 为空 + return false; + } else if (name.length() < 3) {// 字符少于三个 + return false; + } else if (!keyWords.contains(name)) { + return false; + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(name)) { // 不包含汉字 + return false; + } else if (name.startsWith("之")) {// 以之开头,带数字的 + String c = name.substring(1, 2);// 取楼前一个字符 + // 判断是否为数字或字母 + if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { + return false; + } + } else if (name.endsWith("路")) { + return false; + } else if (ERROR_NAME.contains(name)) { + return false; + } + return true; + } - private boolean isCorrectAddress(String address) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 - return false; - } else if (address.length() < 3) {// 字符少于三个 - return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 - return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 - return false; - } - return true; - } + private boolean isCorrectAddress(String address) { // 市区镇县省结尾 + if (StringUtils.isEmpty(address)) {// 为空 + return false; + } else if (address.length() < 3) {// 字符少于三个 + return false; + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(address)) { // 不包含汉字 + return false; + } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") + || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + return false; + } + return true; + } - private boolean isCorrectAddressPoi(String address, String keyWords) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 - return false; - } else if (address.length() < 3) {// 字符少于三个 - return false; - } else if (!keyWords.contains(address)) { - return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 - return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 - return false; - } - return true; - } + private boolean isCorrectAddressPoi(String address, String keyWords) { // 市区镇县省结尾 + if (StringUtils.isEmpty(address)) {// 为空 + return false; + } else if (address.length() < 3) {// 字符少于三个 + return false; + } else if (!keyWords.contains(address)) { + return false; + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(address)) { // 不包含汉字 + return false; + } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") + || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + return false; + } + return true; + } - private static boolean isDigit(String content) { - boolean flag = false; - Pattern p = Pattern.compile("^[一|二|三|四|五|六|七|八|九|十]+$"); - Matcher m = p.matcher(content); - if (m.matches()) { - flag = true; - } - return flag; - } + private static boolean isDigit(String content) { + boolean flag = false; + Pattern p = Pattern.compile("^[一|二|三|四|五|六|七|八|九|十]+$"); + Matcher m = p.matcher(content); + if (m.matches()) { + flag = true; + } + return flag; + } - private boolean isContainsChineseWord(String content) { - boolean flag = false; - Pattern p = Pattern.compile("^.*[\\u4E00-\\u9FA5]+.*$"); - Matcher m = p.matcher(content); - if (m.matches()) { - flag = true; - } - return flag; - } + private boolean isContainsChineseWord(String content) { + boolean flag = false; + Pattern p = Pattern.compile("^.*[\\u4E00-\\u9FA5]+.*$"); + Matcher m = p.matcher(content); + if (m.matches()) { + flag = true; + } + return flag; + } - /** - * 地址真实性检查 (高德官方)(非银联) - * - * @return - */ - public Object checkAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo3(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + /** + * 地址真实性检查 (高德官方)(非银联) + * + * @return + */ + public Object checkAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo3(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于地址验真(非银联版) - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo3(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - bo.setData(null); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于地址验真(非银联版) + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo3(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + bo.setData(null); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo4(AddressCheckBo bo, String city, AddressModel model, String type) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setAddress(null); - check.setAddressId(null); - check.setName(null); - check.setLevel(null); - if (GRADE_AREA.equals(type)) { - check.setScoreIncity(null); - check.setScoreInnation(null); - } else if (GRADE_CITY.equals(type)) { - double score = check.getScoreIncity(); - check.setScore(score); - check.setScoreIncity(null); - check.setScoreInnation(null); - } else if (GRADE_NATION.equals(type)) { - double score = check.getScoreInnation(); - check.setScore(score); - check.setScoreIncity(null); - check.setScoreInnation(null); - }else if(GRADE_CONSUME.equals(type)) { - check.setScoreIncity(null); - check.setScoreInnation(null); - check.setAreaScore(null); - check.setEstateScore(null); - check.setPriceScore(null); - } - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo4(AddressCheckBo bo, String city, AddressModel model, String type) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setAddress(null); + check.setAddressId(null); + check.setName(null); + check.setLevel(null); + if (GRADE_AREA.equals(type)) { + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_CITY.equals(type)) { + double score = check.getScoreIncity(); + check.setScore(score); + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_NATION.equals(type)) { + double score = check.getScoreInnation(); + check.setScore(score); + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_CONSUME.equals(type)) { + check.setScoreIncity(null); + check.setScoreInnation(null); + check.setAreaScore(null); + check.setEstateScore(null); + check.setPriceScore(null); + } + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - /** - * 地址评级(非银联) - */ - public Object gradeAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联) + */ + public Object gradeAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_AREA)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_AREA)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(非银联)(城市评分) - */ - public Object gradeCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联)(城市评分) + */ + public Object gradeCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CITY)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CITY)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(非银联)(国家评分) - */ - public Object gradeNationAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联)(国家评分) + */ + public Object gradeNationAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_NATION)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_NATION)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(非银联) - */ - public Object antiFraudAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(非银联) + */ + public Object antiFraudAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.antiFraudAmapAddress(model.getChooseId(), city, - model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber(), - model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, null)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.antiFraudAmapAddress(model.getChooseId(), city, + model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber(), + model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, null)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(非银联) - */ - public Object antiFraudAddressBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(非银联) + */ + public Object antiFraudAddressBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.antiFraudAmapAddressB(model.getChooseId(), city, - model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, null)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.antiFraudAmapAddressB(model.getChooseId(), city, + model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, null)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址真实性检查 (v10版) - * - * @return - */ - public Object checkTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + /** + * 地址真实性检查 (v10版) + * + * @return + */ + public Object checkTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - private AddressCheckTruth formatCheckTruth(AddressCheckTruth tr, String city, AddressModel model) { - if (null != tr) { - if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { - tr.setCity(city); - } - // 检查相关参数 - if (!FJW_LEVEL.equals(model.getDataLevel())) { - tr.setKeyWords(null); - tr.setKeyWordsUse(null); - tr.setDistrictName(null); - } - } - return tr; - } + private AddressCheckTruth formatCheckTruth(AddressCheckTruth tr, String city, AddressModel model) { + if (null != tr) { + if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { + tr.setCity(city); + } + // 检查相关参数 + if (!FJW_LEVEL.equals(model.getDataLevel())) { + tr.setKeyWords(null); + tr.setKeyWordsUse(null); + tr.setDistrictName(null); + } + } + return tr; + } - /** - * 地址评级(v10) - */ - public Object gradeTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10) + */ + public Object gradeTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_AREA)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_AREA)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(v10)(城市评分) - */ - public Object gradeTruthCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10)(城市评分) + */ + public Object gradeTruthCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_CITY)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_CITY)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(v10)(国家评分) - */ - public Object gradeTruthNationAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10)(国家评分) + */ + public Object gradeTruthNationAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_NATION)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_NATION)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) - * - * @param tr - * @param city - * @param model - * @param type - * @return - */ - private AddressCheckTruth formatGradeTruth(AddressCheckTruth tr, String city, AddressModel model, String type) { - if (null != tr) { - if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { - tr.setCity(city); - } - // 检查相关参数 - if (!FJW_LEVEL.equals(model.getDataLevel())) { - tr.setKeyWords(null); - tr.setKeyWordsUse(null); - tr.setDistrictName(null); - if (GRADE_AREA.equals(type)) { - tr.setScoreIncity(null); - tr.setScoreInnation(null); - } else if (GRADE_CITY.equals(type)) { - double score = tr.getScoreIncity(); - tr.setScore(score); - tr.setScoreIncity(null); - tr.setScoreInnation(null); - } else if (GRADE_NATION.equals(type)) { - double score = tr.getScoreInnation(); - tr.setScore(score); - tr.setScoreIncity(null); - tr.setScoreInnation(null); - }else if(GRADE_CONSUME.equals(type)) { - tr.setScoreIncity(null); - tr.setScoreInnation(null); - tr.setAreaScore(null); - tr.setEstateScore(null); - tr.setPriceScore(null); - } - } - } - return tr; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * + * @param tr + * @param city + * @param model + * @param type + * @return + */ + private AddressCheckTruth formatGradeTruth(AddressCheckTruth tr, String city, AddressModel model, String type) { + if (null != tr) { + if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { + tr.setCity(city); + } + // 检查相关参数 + if (!FJW_LEVEL.equals(model.getDataLevel())) { + tr.setKeyWords(null); + tr.setKeyWordsUse(null); + tr.setDistrictName(null); + if (GRADE_AREA.equals(type)) { + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_CITY.equals(type)) { + double score = tr.getScoreIncity(); + tr.setScore(score); + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_NATION.equals(type)) { + double score = tr.getScoreInnation(); + tr.setScore(score); + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_CONSUME.equals(type)) { + tr.setScoreIncity(null); + tr.setScoreInnation(null); + tr.setAreaScore(null); + tr.setEstateScore(null); + tr.setPriceScore(null); + } + } + } + return tr; + } - /** - * 地址反欺诈 (地址验真+周边查询)(v10) - */ - public Object antiFraudTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(v10) + */ + public Object antiFraudTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth tr = addressService.antiFraudTruth(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth tr = addressService.antiFraudTruth(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(v10) - */ - public Object antiFraudTruthBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(v10) + */ + public Object antiFraudTruthBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth tr = addressService.antiFraudTruthB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址线下消费评级 - * @param model - * @return - */ - @Deprecated - public Object gradeConsumeOfflineAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + try { + AddressCheckTruth tr = addressService.antiFraudTruthB(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - try { - AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CONSUME)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址消费评级(v10) - */ - @Deprecated - public Object gradeConsumeTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址线下消费评级 + * + * @param model + * @return + */ + @Deprecated + public Object gradeConsumeOfflineAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_CONSUME)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CONSUME)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址周边消费评级接口 - *

通过用户输入的地址,得到该地址的经纬度,找到该地址附近的三个非商住小区的小区消费评级评分,取一个平均分。

- * @author yinjihuyan - * @param model - * @return - */ - public Object aroundConsumeGradeAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址消费评级(v10) + */ + @Deprecated + public Object gradeConsumeTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth truth = addressService.aroundConsumeGrade(city, model.getAddress()); - if ("F".equals(truth.getLevel())) { - mav.setModel(BasicModel.buildBadRequestModel(truth.getCheckMsg())); - return mav; - } - AroundConsumeGradeBo bo = new AroundConsumeGradeBo(); - bo.setCity(truth.getCity()); - bo.setDistrict(truth.getDistrict()); - bo.setScore(truth.getScore()); - bo.setRegionScore(truth.getRegionScore()); - bo.setLng(truth.getLng()); - bo.setLat(truth.getLat()); - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setDistrictNames(truth.getDistrictName()); - } - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(bo); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_CONSUME)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - @Authority(role = Role.USER) - public Object riskAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); + /** + * 地址周边消费评级接口 + *

通过用户输入的地址,得到该地址的经纬度,找到该地址附近的三个非商住小区的小区消费评级评分,取一个平均分。

+ * + * @param model + * @return + * @author yinjihuyan + */ + public Object aroundConsumeGradeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckTruth truth = addressService.aroundConsumeGrade(city, model.getAddress()); + if ("F".equals(truth.getLevel())) { + mav.setModel(BasicModel.buildBadRequestModel(truth.getCheckMsg())); + return mav; + } + AroundConsumeGradeBo bo = new AroundConsumeGradeBo(); + bo.setCity(truth.getCity()); + bo.setDistrict(truth.getDistrict()); + bo.setScore(truth.getScore()); + bo.setRegionScore(truth.getRegionScore()); + bo.setLng(truth.getLng()); + bo.setLat(truth.getLat()); + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setDistrictNames(truth.getDistrictName()); + } + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(bo); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + @Authority(role = Role.USER) + public Object riskAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); // if (StringUtils.isEmpty(model.getCity())) { // mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市不能为空!")); // return mav; // } - if (StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,地址不能为空!")); - return mav; - } - BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); - Map resultMap = new HashMap(); - try { - Map params = new HashMap(); - if (StringUtils.isNotBlank(model.getCity())) { - params.put("city", model.getCity()); - } - params.put("address", model.getAddress()); - params.put("useMap", "false"); - String result = addressMatchProxyService.parser(params); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - if (json.getInt("code") == 200) { - JSONObject resultJson = json.getJSONObject("result"); - JSONObject searchAddress = resultJson.getJSONObject("searchAddress"); - if (resultJson.getDouble("credit") > 0) { - District district = districtService.findByNameAndAlias(resultJson.getString("city"), resultJson.getString("district"), resultJson.getString("name"), "district"); - if (district != null) { - resultMap.put("riskLevel", "A"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } - } - StringBuffer searchKey = new StringBuffer(); - if (searchAddress.containsKey("street")) { - searchKey.append(searchAddress.getString("street")); - } - if (searchAddress.containsKey("streetNumber")) { - searchKey.append(searchAddress.getString("streetNumber")); - } - if (StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))) { + if (StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,地址不能为空!")); + return mav; + } + BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); + Map resultMap = new HashMap(); + try { + Map params = new HashMap(); + if (StringUtils.isNotBlank(model.getCity())) { + params.put("city", model.getCity()); + } + params.put("address", model.getAddress()); + params.put("useMap", "false"); + String result = addressMatchProxyService.parser(params); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + if (json.getInt("code") == 200) { + JSONObject resultJson = json.getJSONObject("result"); + JSONObject searchAddress = resultJson.getJSONObject("searchAddress"); + if (resultJson.getDouble("credit") > 0) { + District district = districtService.findByNameAndAlias(resultJson.getString("city"), resultJson.getString("district"), resultJson.getString("name"), "district"); + if (district != null) { + resultMap.put("riskLevel", "A"); + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } + } + StringBuffer searchKey = new StringBuffer(); + if (searchAddress.containsKey("street")) { + searchKey.append(searchAddress.getString("street")); + } + if (searchAddress.containsKey("streetNumber")) { + searchKey.append(searchAddress.getString("streetNumber")); + } + if (StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))) { // JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress()); // JSONArray poisData = jsonObject.getJSONArray("pois"); // for (int i = 0; i < poisData.size(); i++) { @@ -3336,120 +3340,120 @@ public class AddressController { // continue; // } // } - String city = searchAddress.getString("city"); - List poiList = this.findPois(city, searchKey.toString()); - if (CollectionUtils.isNotEmpty(poiList)) { - resultMap.put("riskLevel", "A"); - } else { - resultMap.put("riskLevel", "B"); - } - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } - } - } - } catch (Exception ex) { - LOGGER.error("风险识别出错:" + ex.getMessage(), ex); - } + String city = searchAddress.getString("city"); + List poiList = this.findPois(city, searchKey.toString()); + if (CollectionUtils.isNotEmpty(poiList)) { + resultMap.put("riskLevel", "A"); + } else { + resultMap.put("riskLevel", "B"); + } + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } + } + } + } catch (Exception ex) { + LOGGER.error("风险识别出错:" + ex.getMessage(), ex); + } - resultMap.put("riskLevel","C"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } + resultMap.put("riskLevel", "C"); + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } - private List findPois(String city, String address) { - JSONObject reqBody = new JSONObject(); - reqBody.put("from", 0); - reqBody.put("size", 1); - JSONObject query = new JSONObject(); - JSONObject bool = new JSONObject(); - JSONArray must = new JSONArray(); - must.add(addTerm("city", city)); - must.add(addMatchPhrase("address", address)); - bool.put("must", must); - query.put("bool", bool); - reqBody.put("query", query); - Base64 token = new Base64(); - String authenticationEncoding = token.encodeAsString((""+ES_USER+":"+ES_PASSWORD+"").getBytes()); - HttpRequest request = new HttpRequest(); - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - headers.put("Authorization", "Basic "+authenticationEncoding+""); - try { - String response = request.postWithBody("http://192.168.0.45:9200/association/_search", reqBody, headers, "UTF-8"); - JSONObject json = JSONObject.fromObject(response); - if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ - return Collections.emptyList(); - } - JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); - List results = new ArrayList(); - for(int i=0 ;i < hits.size(); i++){ - JSONObject jsonObject = hits.getJSONObject(i); - results.add(jsonObject); - } - return results; + private List findPois(String city, String address) { + JSONObject reqBody = new JSONObject(); + reqBody.put("from", 0); + reqBody.put("size", 1); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerm("city", city)); + must.add(addMatchPhrase("address", address)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + HttpRequest request = new HttpRequest(); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + try { + String response = request.postWithBody("http://192.168.0.45:9200/association/_search", reqBody, headers, "UTF-8"); + JSONObject json = JSONObject.fromObject(response); + if (!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")) { + return Collections.emptyList(); + } + JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); + List results = new ArrayList(); + for (int i = 0; i < hits.size(); i++) { + JSONObject jsonObject = hits.getJSONObject(i); + results.add(jsonObject); + } + return results; - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return Collections.emptyList(); - } + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } - public void setAddressService(AddressService addressService) { - this.addressService = addressService; - } + public void setAddressService(AddressService addressService) { + this.addressService = addressService; + } - public void setEvaluationService(EvaluationService evaluationService) { - this.evaluationService = evaluationService; - } + public void setEvaluationService(EvaluationService evaluationService) { + this.evaluationService = evaluationService; + } - public void setDistrictService(DistrictService districtService) { - this.districtService = districtService; - } + public void setDistrictService(DistrictService districtService) { + this.districtService = districtService; + } - public void setCommDataService(CommDataService commDataService) { - this.commDataService = commDataService; - } + public void setCommDataService(CommDataService commDataService) { + this.commDataService = commDataService; + } - public void setRegionBlockService(RegionBlockService regionBlockService) { - this.regionBlockService = regionBlockService; - } + public void setRegionBlockService(RegionBlockService regionBlockService) { + this.regionBlockService = regionBlockService; + } - public void setBaiduApiService(BaiduApiService baiduApiService) { - this.baiduApiService = baiduApiService; - } + public void setBaiduApiService(BaiduApiService baiduApiService) { + this.baiduApiService = baiduApiService; + } - public void setAddressParser(AddressParser addressParser) { - this.addressParser = addressParser; - } + public void setAddressParser(AddressParser addressParser) { + this.addressParser = addressParser; + } - public void setServerAreaService(ServerAreaService serverAreaService) { - this.serverAreaService = serverAreaService; - } + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } - public AddressParserService getAddressParserService() { - return addressParserService; - } + public AddressParserService getAddressParserService() { + return addressParserService; + } - public void setAddressParserService(AddressParserService addressParserService) { - this.addressParserService = addressParserService; - } + public void setAddressParserService(AddressParserService addressParserService) { + this.addressParserService = addressParserService; + } - public void setWaitCrawlKeywordsService(WaitCrawlKeywordsService waitCrawlKeywordsService) { - this.waitCrawlKeywordsService = waitCrawlKeywordsService; - } + public void setWaitCrawlKeywordsService(WaitCrawlKeywordsService waitCrawlKeywordsService) { + this.waitCrawlKeywordsService = waitCrawlKeywordsService; + } - public void setFjtEvaluationService(FjtEvaluationService fjtEvaluationService) { - this.fjtEvaluationService = fjtEvaluationService; - } + public void setFjtEvaluationService(FjtEvaluationService fjtEvaluationService) { + this.fjtEvaluationService = fjtEvaluationService; + } - public void setHouseLoudongService(HouseLoudongService houseLoudongService) { - this.houseLoudongService = houseLoudongService; - } + public void setHouseLoudongService(HouseLoudongService houseLoudongService) { + this.houseLoudongService = houseLoudongService; + } - public void setAddressMatchProxyService(AddressMatchProxyService addressMatchProxyService) { - this.addressMatchProxyService = addressMatchProxyService; - } + public void setAddressMatchProxyService(AddressMatchProxyService addressMatchProxyService) { + this.addressMatchProxyService = addressMatchProxyService; + } } From 00fee9313f2130b7ad8fe20ee62dabdf892bc869 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 15 Jan 2024 15:40:47 +0800 Subject: [PATCH 09/26] =?UTF-8?q?Suggestion=E4=B9=A1=E9=95=87=E8=A1=97?= =?UTF-8?q?=E9=81=93=E4=BB=8Emap=5Fpoi=E4=B8=AD=E6=9F=A5=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealAndThirdPriceDataProcess.groovy | 4 +- .../com/fangjia/script/gj/OpenApiUtils.groovy | 113 ++++++++++++------ .../village/BaiduCoordinateConverter.groovy | 86 +++++++++++++ .../gj/village/communityLocation.groovy | 54 +++++++-- .../gj/xiamen/SuggestionDataSynch.groovy | 24 +++- 5 files changed, 229 insertions(+), 52 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index 60f1450a6..d408f306a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -28,8 +28,8 @@ class DealPriceDataProcess { def task = new DealPriceDataProcess() // task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据 // task.addLianJiaPrice(); -// task.deleteThirdPartyData()//删除第三方 - task.delDealByPe() + task.deleteThirdPartyData()//删除第三方 + task.delDealByPe()//删除成交 // task.delDealData() // task.exportThirdParty() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index c187c2214..5fd8cdf21 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -6,6 +6,7 @@ import com.fangjia.core.util.BaiDuApiUtils import com.fangjia.core.util.CNNMFilter import com.fangjia.core.util.GeocodeUtils import com.fangjia.core.util.HttpRequest +import com.fangjia.script.gj.village.BaiduCoordinateConverter import com.fangjia.script.util.CosineSimilarAlgorithm import net.sf.json.JSONObject import net.sf.json.groovy.JsonSlurper @@ -389,49 +390,32 @@ class OpenApiUtils { for (def loc : json.content) { String name = formatName(address) if(loc.uid) { - def bean = [:] JSONObject uidInfo = BaiDuApiUtils.getDetailByUid(loc.uid) if(uidInfo != null) { - def baiduRegion = uidInfo.get("result").area - def baiduCity = uidInfo.get("result").city + rets = createData(rets, uidInfo, loc, region, name, address) + }else{ + def baiduRegion = loc.area_name.replace(loc.city_name,"") + def baiduCity = loc.city_name baiduCity = RegionData.formatCity(baiduCity) - def newName = formatName(loc.name) - if(baiduRegion.contains(region) && (name== newName || address==newName)){ - JSONObject result = uidInfo.get("result") - JSONObject lo = result.get("location") - Double lng2 = lo.get("lng") - Double lat2 = lo.get("lat") - bean.lng2 = lng2 - bean.lat2 = lat2 + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(score1 || score2){ + def bean = [:] bean.name = loc.name bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion - def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) - def lng = gmap.get("lng") - def lat = gmap.get("lat") - bean.lng = lng - bean.lat = lat - if(result.get("detail_info")){ - bean.estateType = result.get("detail_info").get("tag") + def locArrs = BaiduCoordinateConverter.bdMercator2Latlng(loc.diPointX/100.0, loc.diPointY/100.0) + if(locArrs){ + def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0], locArrs[1]) + bean.lng = gmap.get("lng") + bean.lat = gmap.get("lat") } - - if(bean.estateType && (bean.estateType.contains('出入口') || bean.estateType.contains('公交车站'))){ - println "X百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】-${bean.estateType}" - }else{ - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】" - rets << bean; - } - + bean.estateType = loc.std_tag + rets << bean; + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" }else{ - def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); - def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); - if(score1 || score2){ - rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" - }else{ - println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" - } + println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" } } } @@ -444,6 +428,67 @@ class OpenApiUtils { return rets; } + def static createData(def rets, def uidInfo, def loc, region, name, address){ + def bean = [:] + def baiduRegion = uidInfo.get("result").area + def baiduCity = uidInfo.get("result").city + baiduCity = RegionData.formatCity(baiduCity) + def newName = formatName(loc.name) + if(baiduRegion.contains(region) && (name== newName || address==newName)){ + JSONObject result = uidInfo.get("result") + JSONObject lo = result.get("location") + Double lng2 = lo.get("lng") + Double lat2 = lo.get("lat") + bean.lng2 = lng2 + bean.lat2 = lat2 + bean.name = loc.name + bean.address = loc.addr.replace("[]","") + bean.city = baiduCity + bean.region = baiduRegion + def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) + def lng = gmap.get("lng") + def lat = gmap.get("lat") + bean.lng = lng + bean.lat = lat + if(result.get("detail_info")){ + bean.estateType = result.get("detail_info").get("tag") + } + + if(bean.estateType && (bean.estateType.contains('出入口') || bean.estateType.contains('公交车站'))){ + println "X百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】-${bean.estateType}" + }else{ + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+result.get("address")+"】" +" 搜索:【"+address+"】" + rets << bean; + } + + }else{ + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(score1 || score2){ + + JSONObject result = uidInfo.get("result") + JSONObject lo = result.get("location") + bean.lng2 = lo.get("lng") + bean.lat2 = lo.get("lat") + bean.name = loc.name + bean.address = loc.addr.replace("[]","") + bean.city = baiduCity + bean.region = baiduRegion + def gmap = GeocodeUtils.geoconvBaiduToGoogle(bean.lng2, bean.lat2) + bean.lng = gmap.get("lng") + bean.lat = gmap.get("lat") + if(result.get("detail_info")){ + bean.estateType = result.get("detail_info").get("tag") + } + rets << bean; + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + }else{ + println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" + } + } + return rets; + } + def static formatName(String name) { if(name.indexOf("·") != -1) { name = name.replaceAll("·", "") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy new file mode 100644 index 000000000..7dcc6a199 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/BaiduCoordinateConverter.groovy @@ -0,0 +1,86 @@ +package com.fangjia.script.gj.village +import java.util.Arrays; +class BaiduCoordinateConverter { + + static double[] array1 = [75, 60, 45, 30, 15, 0] + static double[][] array2 = [ + [-0.0015702102444, 111320.7020616939, 1704480524535203.0, -10338987376042340.0, 26112667856603880.0, -35149669176653700.0, 26595700718403920.0, -10725012454188240.0, 1800819912950474.0, 82.5], + [0.0008277824516172526, 111320.7020463578, 647795574.6671607, -4082003173.641316, 10774905663.51142, -15171875531.51559, 12053065338.62167, -5124939663.577472, 913311935.9512032, 67.5], + [0.00337398766765, 111320.7020202162, 4481351.045890365, -23393751.19931662, 79682215.47186455, -115964993.2797253, 97236711.15602145, -43661946.33752821, 8477230.501135234, 52.5], + [0.00220636496208, 111320.7020209128, 51751.86112841131, 3796837.749470245, 992013.7397791013, -1221952.21711287, 1340652.697009075, -620943.6990984312, 144416.9293806241, 37.5], + [-0.0003441963504368392, 111320.7020576856, 278.2353980772752, 2485758.690035394, 6070.750963243378, 54821.18345352118, 9540.606633304236, -2710.55326746645, 1405.483844121726, 22.5], + [-0.0003218135878613132, 111320.7020701615, 0.00369383431289, 823725.6402795718, 0.46104986909093, 2351.343141331292, 1.58060784298199, 8.77738589078284, 0.37238884252424, 7.45] + ] + static double[] array3 = [12890594.86, 8362377.87, 5591021, 3481989.83, 1678043.12, 0]; + static double[][] array4 = [ + [1.410526172116255e-8, 0.00000898305509648872, -1.9939833816331, 200.9824383106796, -187.2403703815547, 91.6087516669843, -23.38765649603339, 2.57121317296198, -0.03801003308653, 17337981.2], + [-7.435856389565537e-9, 0.000008983055097726239, -0.78625201886289, 96.32687599759846, -1.85204757529826, -59.36935905485877, 47.40033549296737, -16.50741931063887, 2.28786674699375, 10260144.86], + [-3.030883460898826e-8, 0.00000898305509983578, 0.30071316287616, 59.74293618442277, 7.357984074871, -25.38371002664745, 13.45380521110908, -3.29883767235584, 0.32710905363475, 6856817.37], + [-1.981981304930552e-8, 0.000008983055099779535, 0.03278182852591, 40.31678527705744, 0.65659298677277, -4.44255534477492, 0.85341911805263, 0.12923347998204, -0.04625736007561, 4482777.06], + [3.09191371068437e-9, 0.000008983055096812155, 0.00006995724062, 23.10934304144901, -0.00023663490511, -0.6321817810242, -0.00663494467273, 0.03430082397953, -0.00466043876332, 2555164.4], + [2.890871144776878e-9, 0.000008983055095805407, -3.068298e-8, 7.47137025468032, -0.00000353937994, -0.02145144861037, -0.00001234426596, 0.00010322952773, -0.00000323890364, 826088.5] + ]; + + public static double[] convertor(double x, double y, double[] param) { + double t = param[0] + param[1] * Math.abs(x); + double cc = Math.abs(y) / param[9]; + double cf = param[2] + param[3] * cc + param[4] * cc * cc + param[5] * cc * cc * cc + param[6] * cc * cc * cc * cc + param[7] * cc * cc * cc * cc * cc + param[8] * cc * cc * cc * cc * cc * cc; + t *= (x < 0) ? -1 : 1; + cf *= (y < 0) ? -1 : 1; + return [t, cf]; + } + + public static double[] bdLatlng2Mercator(double lat, double lng) { + double[] arr = null; + double nLat = (lat > 74) ? 74 : lat; + nLat = (nLat < -74) ? -74 : nLat; + for (int i = 0; i < array1.length; i++) { + if (lat >= array1[i]) { + arr = array2[i]; + break; + } + } + if (arr == null) { + for (int i = array1.length - 1; i >= 0; i--) { + if (lat <= -array1[i]) { + arr = array2[i]; + break; + } + } + } + if (arr == null) { + throw new IllegalArgumentException("Invalid latitude"); + } + double[] res = convertor(lng, lat, arr); + return [res[0], res[1]] + } + + public static double[] bdMercator2Latlng(double x, double y) { + double[] arr = null; + double npX = Math.abs(x); + double npY = Math.abs(y); + for (int i = 0; i < array3.length; i++) { + if (npY >= array3[i]) { + arr = array4[i]; + break; + } + } + if (arr == null) { + throw new IllegalArgumentException("Invalid y value"); + } + double[] res = convertor(npX, npY, arr); + return [res[0], res[1]] + } + + public static void main(String[] args) { + // Example usage + double latitude = 4832281.76 + double longitude = 12959065.3 + +// double[] mercatorPoint = bdLatlng2Mercator(latitude, longitude); +// System.out.println("Mercator Point: " + Arrays.toString(mercatorPoint)); + + double[] latlngPoint = bdMercator2Latlng(longitude, latitude); + System.out.println("Latlng Point: " + Arrays.toString(latlngPoint)); + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index bb7993201..614af517f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -1,25 +1,55 @@ package com.fangjia.script.gj.village +import com.fangjia.core.RegionData +import com.fangjia.core.util.DataUtil import com.fangjia.script.gj.OpenApiUtils import com.fangjia.script.util.ExcelUtils -filePath = "D:\\数据\\涉农\\2023居委相同包含.xlsx" +def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] +//def name = "台基厂社区居委会" +//def region = "东城区" +//def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); + +filePath = "D:\\数据\\涉农\\无经纬度居委_0.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> - def poiName = d['N'] - def locstr = d['O'] - try{ - def name = poiName.substring(poiName.indexOf(" ")+4, poiName.indexOf("\n")) - def location = locstr.substring(locstr.indexOf("{"), locstr.indexOf("}")+1) - }catch(e){ - println "错误:"poiName + + if(!d['N']){ + def city = d['D'] + def region = d['F'] + def name = d['J'] + def code = codeMap.get(city); + if(!code){ + code = codeMap.get(RegionData.formatCity(city)); + } + if(code){ + def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); + println name +" "+rets.size() + for(def r : rets){ + def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') + def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') + if(bdname == newName){ + d['N'] = DataUtil.getRound(6, r.lng) + d['O'] = DataUtil.getRound(6, r.lat) + d['P'] = r.estateType + if(r.region.contains(region)){ + d['Q'] = "区域相同" + }else{ + d['Q'] = r.region + } + d['R'] = r.name + break; + } + } + + }else{ + println "【${city}】 没有找到相关code" + } } - d["S"] = name - d['T'] = location }) -//def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] + // //def code = codeMap.get("北京"); -rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); +//rets = OpenApiUtils.searchBaiDuMap("人定湖社区居委会", "东城区", code.toInteger()); //println(rets) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 10a5f2cb9..9e3d8167c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -27,6 +27,8 @@ class SuggestionDataSynch extends BaseBatch{ DBCollection administrative_division_100_CONN = MongoUtils.getCollectionByName2("fangjia", "administrative_division", MONGO100_URL) DBCollection SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + DBCollection MAPPOI_CONN = MongoUtils.getCollectionByName2("fangjia", "map_poi", MONGO100_URL) + public static def provinceMap = CommonDatautils.findAllCityProvince() def lastMonthDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); @@ -64,7 +66,7 @@ class SuggestionDataSynch extends BaseBatch{ for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","天津","西安"].contains(c)){ + if(["上海","北京","广州","深圳","成都","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ continue; } index++ @@ -263,9 +265,14 @@ class SuggestionDataSynch extends BaseBatch{ map.township = InsidePolygon.isInArea2(map.location.lon, map.location.lat, townMap) if(!map.township){ - def gaodeMap = getTownshipInfo(map.location.lon+","+map.location.lat) - if(gaodeMap && gaodeMap.township){ - map.township = gaodeMap.township + def obj = findTownshipByBD(dist.id) + if(obj){ + map.township = obj.township + }else{ + def gaodeMap = getTownshipInfo(map.location.lon+","+map.location.lat) + if(gaodeMap && gaodeMap.township){ + map.township = gaodeMap.township + } } } println map.township @@ -288,6 +295,15 @@ class SuggestionDataSynch extends BaseBatch{ } + def findTownshipByBD(id){ + def q = new BasicDBObject() + q.put("id", id) + def obj = MAPPOI_CONN.findOne(q) + return obj + + } + + def queryFullNameCity(){ def q = new BasicDBObject() def dbcursor = administrative_division_100_CONN.find(q) From 1392b1efb04ec9057d980a3097578ae40688a87d Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 15 Jan 2024 15:53:24 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=8A=A0=E6=9D=AD=E5=B7=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 9e3d8167c..07c4ef7af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -66,7 +66,7 @@ class SuggestionDataSynch extends BaseBatch{ for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ + if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ continue; } index++ From 01c1f5a1c7a690e55d5a24f546f0bd40b1db99ca Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 15 Jan 2024 16:45:22 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E6=8C=89=E5=9F=8E=E5=B8=82=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj/xiamen/SuggestionDataSynch.groovy | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 07c4ef7af..57c7023b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -226,7 +226,7 @@ class SuggestionDataSynch extends BaseBatch{ def data = fullCityMap.get(city) if(data){ def results = CommonDatautils.findAmapDetailBySql(data.city) - def rets = createPoi(results, data, townMap) + def rets = createPoi(data.city, results, data, townMap) println city +" 完成!" return rets; } @@ -235,10 +235,11 @@ class SuggestionDataSynch extends BaseBatch{ } - def createPoi(results, data, townMap){ + def createPoi(fullCity, results, data, townMap){ def rets = new CopyOnWriteArrayList() def totalCount = new AtomicLong() + def townshipMap = findMapPoiTownshipMap(fullCity) final CountDownLatch latch = new CountDownLatch(results.size()) for(def i=0;i Date: Mon, 15 Jan 2024 18:38:15 +0800 Subject: [PATCH 12/26] update --- .../script/gj/xiamen/SuggestionDataSynch.groovy | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 57c7023b0..883b7371b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicLong class SuggestionDataSynch extends BaseBatch{ static def targetUrl = "http://192.168.0.12:9200/seaweed/" - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection SEAWEED_CONN = MongoUtils.getCollectionByName2("fangjia", "seaweed", MONGO100_URL) @@ -264,12 +264,15 @@ class SuggestionDataSynch extends BaseBatch{ map.location = dist.location map.source = "FJW" - map.township = InsidePolygon.isInArea2(map.location.lon, map.location.lat, townMap) - if(!map.township){ + if(townshipMap && townshipMap.containsKey(dist.id)){ def obj = townshipMap.get(dist.id) if(obj){ map.township = obj.township - }else{ + } + } + if(!map.township){ + map.township = InsidePolygon.isInArea2(map.location.lon, map.location.lat, townMap) + if(!map.township){ def gaodeMap = getTownshipInfo(map.location.lon+","+map.location.lat) if(gaodeMap && gaodeMap.township){ map.township = gaodeMap.township From 11cb97b03327686e4183a8b815f313fddbcbfa65 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 16 Jan 2024 21:53:40 +0800 Subject: [PATCH 13/26] update --- .../com/fangjia/script/gj/OpenApiUtils.groovy | 1 + .../gj/location/GaoDeMapSearchTest.groovy | 5 ++- .../gj/village/communityLocation.groovy | 34 ++++++++++++++++++- .../gj/xiamen/SuggestionDataSynch.groovy | 21 +++++++----- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index 5fd8cdf21..7343a106d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -674,6 +674,7 @@ class OpenApiUtils { static def financialRating(city, address){ def url = "http://open.fangjia.com/address/financialRating?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" String content = new HttpRequest().get(url, "utf-8"); + print(url) if(content){ def doc = new JsonSlurper().parseText(content) if(doc && doc.code ==0 && doc.result){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy index adc26463e..7bfaf972f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy @@ -28,7 +28,10 @@ class GaoDeMapSearchTest { // task.mapSearch(path) // task.baiduMapSearch(path) // task.checkTrue(path) - task.addFinancialLevel(path) +// task.addFinancialLevel(path) + + def results = com.fangjia.script.gj.OpenApiUtils.financialRating("重庆", "凤中路193号") + println results } def addFinancialLevel(path){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index 614af517f..2fe850969 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -10,24 +10,39 @@ def codeMap = [" //def region = "东城区" //def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); -filePath = "D:\\数据\\涉农\\无经纬度居委_0.xlsx" +filePath = "D:\\数据\\涉农\\无经纬度居委_5.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> if(!d['N']){ def city = d['D'] def region = d['F'] def name = d['J'] + def township = d['H'] def code = codeMap.get(city); if(!code){ code = codeMap.get(RegionData.formatCity(city)); } if(code){ def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); +// rets = sortResult(rets) + println name +" "+rets.size() for(def r : rets){ def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') + def stopFlag = false if(bdname == newName){ + stopFlag = true + }else if(bdname.endsWith("村")){ + if(bdname.equals(newName+"村")){ + stopFlag = true + }else{ + if(bdname.equals(township+newName+"村")){ + stopFlag = true + } + } + } + if(stopFlag){ d['N'] = DataUtil.getRound(6, r.lng) d['O'] = DataUtil.getRound(6, r.lat) d['P'] = r.estateType @@ -48,6 +63,23 @@ ExcelUtils.multiThreadingModify(filePath, {d-> }) +def sortResult(rets){ + rets.sort{a,b-> + def a1 = a.estateType + def b1 = b.estateType + def a1_score = a.score + if(a1.contains("政府机构")){ + a1_score = a1_score +1 + } + def b1_score = b.score + if(b1.contains("政府机构")){ + b1_score = b1_score +1 + } + return b1_score.compareTo(a1_score) + } + return rets +} + // //def code = codeMap.get("北京"); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 883b7371b..acb7dc107 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -59,14 +59,14 @@ class SuggestionDataSynch extends BaseBatch{ def run() { //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" - def citys = CommonDatautils.findAllCity() + def citys = ["岳阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"]//CommonDatautils.findAllCity() def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ + if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","衡阳"].contains(c)){ continue; } index++ @@ -85,8 +85,8 @@ class SuggestionDataSynch extends BaseBatch{ allRets.addAll(ret3) allRets.addAll(ret4) - println index + " " + c + " 完成 "+ allRets.size() saveToMG(c, allRets) + println index + " " + c + " 完成 "+ allRets.size() } } @@ -96,7 +96,13 @@ class SuggestionDataSynch extends BaseBatch{ def data = fullCityMap.get(city) def q = new BasicDBObject("city", data.city) - def count = SUGGESTION_CONN.count(q) + def count = 0 + try{ + count = SUGGESTION_CONN.count(q) + }catch(e){ + SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + count = SUGGESTION_CONN.count(q) + } if(count>0){ SUGGESTION_CONN.remove(q) } @@ -227,7 +233,6 @@ class SuggestionDataSynch extends BaseBatch{ if(data){ def results = CommonDatautils.findAmapDetailBySql(data.city) def rets = createPoi(data.city, results, data, townMap) - println city +" 完成!" return rets; } return [] @@ -265,9 +270,9 @@ class SuggestionDataSynch extends BaseBatch{ map.source = "FJW" if(townshipMap && townshipMap.containsKey(dist.id)){ - def obj = townshipMap.get(dist.id) - if(obj){ - map.township = obj.township + def township = townshipMap.get(dist.id) + if(township){ + map.township = township } } if(!map.township){ From 00af0af0bd5cbd2d53b7e5fd8a50a9c0829b2ace Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 16 Jan 2024 22:32:16 +0800 Subject: [PATCH 14/26] up --- .../com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index acb7dc107..036522286 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -59,14 +59,14 @@ class SuggestionDataSynch extends BaseBatch{ def run() { //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" - def citys = ["岳阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"]//CommonDatautils.findAllCity() + def citys = ["湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"]//CommonDatautils.findAllCity() def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","衡阳"].contains(c)){ + if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳"].contains(c)){ continue; } index++ From 646328016406f5d4808710ac5ce01a7c918fc15b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 19 Jan 2024 15:49:33 +0800 Subject: [PATCH 15/26] update --- .../com/fangjia/script/gj/OpenApiUtils.groovy | 12 +++++++++--- .../com/fangjia/script/gj/abc/SuzouPocTest.groovy | 8 ++++---- .../script/gj/district/FangjiaClientUtils.groovy | 4 ++-- .../script/gj/village/communityLocation.groovy | 15 +++++++++++---- .../fangjia/script/gj/village/govLocation.groovy | 14 +++++++------- .../script/gj/xiamen/SuggestionDataSynch.groovy | 4 ++-- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index 7343a106d..f6f47f7c6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -338,7 +338,7 @@ class OpenApiUtils { lat2 = null lng2 = null } - println "√百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+"-"+address+"】" +" DB:【"+city+"-"+region+"-"+name+"】" + println "√百度地图:【"+ret.get("city")+"-"+ret.get("area")+"-"+ret.get("name")+" "+map.estateType+"-"+address+"】" +" DB:【"+city+"-"+region+"-"+name+"】" } // }else{ @@ -405,6 +405,7 @@ class OpenApiUtils { bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion + bean.township = loc.admin_info.town_name def locArrs = BaiduCoordinateConverter.bdMercator2Latlng(loc.diPointX/100.0, loc.diPointY/100.0) if(locArrs){ def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0], locArrs[1]) @@ -412,8 +413,9 @@ class OpenApiUtils { bean.lat = gmap.get("lat") } bean.estateType = loc.std_tag + bean.score = score1 + score2 rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+loc.name+"-"+ loc.addr.replace("[]","")+" "+bean.estateType+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" }else{ println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" } @@ -445,6 +447,8 @@ class OpenApiUtils { bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion + bean.township = loc.admin_info.town_name + bean.score = 1 def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) def lng = gmap.get("lng") def lat = gmap.get("lat") @@ -474,14 +478,16 @@ class OpenApiUtils { bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion + bean.township = loc.admin_info.town_name def gmap = GeocodeUtils.geoconvBaiduToGoogle(bean.lng2, bean.lat2) bean.lng = gmap.get("lng") bean.lat = gmap.get("lat") if(result.get("detail_info")){ bean.estateType = result.get("detail_info").get("tag") } + bean.score = score1 + score2 rets << bean; - println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" + println "√百度搜索地图:【"+baiduCity+"-"+baiduRegion+"-"+newName+"-"+bean.estateType+"-"+ loc.addr.replace("[]","")+"】" +" 搜索:【"+address+"】(score:"+score1+"#"+score2+")" }else{ println "X 百度搜索地图:【"+loc.get("area_name")+"-"+loc.get("area_name")+"-"+loc.get("name")+"-"+loc.get("addr")+"】" +" 搜索:【"+address+"】" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy index bc770b173..b2c8548ad 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/abc/SuzouPocTest.groovy @@ -32,7 +32,7 @@ class SuzouPocTest { def newRun(){ println("start:"+new Date().toString()) - def filePath = "D:\\数据\\江苏农行\\江苏农1500条-test.xlsx" + def filePath = "D:\\数据\\江苏农行\\押品填报表_测试数据样例-给公司.xls" newMatch(filePath) addEvalutePrice(filePath) addLation(filePath) @@ -44,7 +44,7 @@ class SuzouPocTest { def newMatch(filePath){ ExcelUtils.multiThreadingModify(filePath, { d -> - if(d['G']){ + if(d['G'] && !d['J']){ def city = d['B'] def address = d['E'] def name = d['G'] @@ -81,7 +81,7 @@ class SuzouPocTest { } jsonObject = FangjiaClientUtils.newMatch(city, newAddr, "property", true) } - if(!jsonObject){ + if(!jsonObject.containsKey("result")){ //老匹配 jsonObject = OpenApiClient.addressMatch(city, address, null, false, region, name) if(jsonObject && jsonObject.credit>0){ @@ -195,7 +195,7 @@ class SuzouPocTest { for (def s : list) { def priceObj = CommonDatautils.findDistrictPrice(s.city, s.region, s.name) if (priceObj) { - prices << priceObj.avg_price + prices << priceObj.avg_price_2b } } if (prices) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index 0f6684bdc..837c41b27 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -228,8 +228,8 @@ class FangjiaClientUtils { def url = null; try { address = address.replace("{","").replace("\\","") -// def url = "http://192.168.0.100:32080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" - url = "http://192.168.0.19:31080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" + url = "http://192.168.0.100:32080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" +// url = "http://192.168.0.19:31080/FangJiaNlpService/match?address="+URLEncoder.encode(address,"UTF-8")+"&useMap=${useMap}" if(city){ url = url + "&city="+URLEncoder.encode(city,"UTF-8") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index 2fe850969..d8fdcf40c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -10,7 +10,7 @@ def codeMap = [" //def region = "东城区" //def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); -filePath = "D:\\数据\\涉农\\无经纬度居委_5.xlsx" +filePath = "D:\\数据\\涉农\\居委(包含不准-5万).xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> if(!d['N']){ @@ -24,7 +24,7 @@ ExcelUtils.multiThreadingModify(filePath, {d-> } if(code){ def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); -// rets = sortResult(rets) + rets = sortResult(rets) println name +" "+rets.size() for(def r : rets){ @@ -41,6 +41,13 @@ ExcelUtils.multiThreadingModify(filePath, {d-> stopFlag = true } } + }else if(bdname.contains(newName)){ + if(r.township && bdname.contains(r.township)){ + bdname = bdname.substring(bdname.indexOf(r.township)+r.township.length()) + if(bdname && bdname == newName){ + stopFlag = true + } + } } if(stopFlag){ d['N'] = DataUtil.getRound(6, r.lng) @@ -68,11 +75,11 @@ def sortResult(rets){ def a1 = a.estateType def b1 = b.estateType def a1_score = a.score - if(a1.contains("政府机构")){ + if(a1 && a1.contains("政府机构")){ a1_score = a1_score +1 } def b1_score = b.score - if(b1.contains("政府机构")){ + if(b1 && b1.contains("政府机构")){ b1_score = b1_score +1 } return b1_score.compareTo(a1_score) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy index d0877a9a0..99352aedd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy @@ -15,13 +15,13 @@ DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "commun def filePath = "D:\\数据\\涉农\\县.xlsx" ExcelUtils.multiThreadingModify(filePath, { row -> -// if(!row['D']){ +// if(!row['I']){ // def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") // if(rets){ // def obj = findOneByName(rets, row['C']+"人民政府") // if(obj){ -// row['D'] = obj.lng -// row['E'] = obj.lat +// row['I'] = obj.lng +// row['J'] = obj.lat // println row['C'] + " "+obj // } // } @@ -34,19 +34,19 @@ ExcelUtils.multiThreadingModify(filePath, { row -> // row['F'] = township // } - if(row['F'] && !row['K']){ + if(row['F'] && !row['G']){ def q = new BasicDBObject() q.put("city_name", row['B']) q.put("area_name", row['C']) - def streetName = row['I'] + def streetName = row['F'] q.put("street_name", streetName) def count = COMMUNITY_CONN.count(q); - row['K'] = count + row['G'] = count // row['H'] = streetName } // def gaodeMap = getTownshipInfo(row['D']+","+row['E']) // if(gaodeMap && gaodeMap.township){ -// row['I'] = gaodeMap.township +// row['H'] = gaodeMap.township // } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 036522286..25930543d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -59,14 +59,14 @@ class SuggestionDataSynch extends BaseBatch{ def run() { //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" - def citys = ["湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"]//CommonDatautils.findAllCity() + def citys = CommonDatautils.findAllCity() def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() for (def c : citys) { def allRets = [] - if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳"].contains(c)){ + if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ continue; } index++ From 3575230089488a10c10fba90d50c27530baee067 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Wed, 24 Jan 2024 13:28:29 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 2983 +++++++++-------- .../src/main/webapp/apiUser/auth.ftl | 29 +- .../src/main/webapp/apiUser/list.ftl | 287 +- .../src/main/webapp/openResource/list.ftl | 19 + 4 files changed, 1705 insertions(+), 1613 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 7df83ddd3..d9db99a40 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -46,68 +46,67 @@ import java.util.*; /** * api用户开通等管理controller - * + * * @author */ public class ApiUserController { - private ApiUserService apiUserService; - private UserService userService; - private ApiUserAuthorityService apiUserAuthorityService; - private OpenResourceService openResourceService; - private ServerAreaService serverAreaService; - private OpenResourceCountService openResourceCountService; - private OpenUriAnalyService openUriAnalyService; - private ApiUserCfgService apiUserCfgService; - private ApiInvokeStatisticalService apiInvokeStatisticalService; - private ApiVisitCountService apiVisitCountService; - private ApiCountCityService apiCountCityService; + private ApiUserService apiUserService; + private UserService userService; + private ApiUserAuthorityService apiUserAuthorityService; + private OpenResourceService openResourceService; + private ServerAreaService serverAreaService; + private OpenResourceCountService openResourceCountService; + private OpenUriAnalyService openUriAnalyService; + private ApiUserCfgService apiUserCfgService; + private ApiInvokeStatisticalService apiInvokeStatisticalService; + private ApiVisitCountService apiVisitCountService; + private ApiCountCityService apiCountCityService; + /** + * 所有api用户的信息展示 + * + * @param model + * @return + */ + public Object listAction(ApiUserModel model) { + /** + * open中公开出的接口资源 ApiUserAuthority 用户的权限信息 + * + * @param ApiUser + * :用户的资料信息 + * @param ApiUser + * :用户的appKey username、等资料 + */ + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(null); + List apiUserBoList = new ArrayList(); + for (ApiUser apiUser : apiUsers) { + User user = this.userService.findById(apiUser.getId()); + if (user == null) { + continue; + } + ApiUserBo bo = new ApiUserBo(); + bo.setAppKey(apiUser.getAppKey()); + if (null != user) { + bo.setUserId(user.getId()); + bo.setPassword(user.getPassword()); + bo.setUserName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + } - /** - * 所有api用户的信息展示 - * - * @param model - * @return - */ - public Object listAction(ApiUserModel model) { - /** - * open中公开出的接口资源 ApiUserAuthority 用户的权限信息 - * - * @param ApiUser - * :用户的资料信息 - * @param ApiUser - * :用户的appKey username、等资料 - */ - List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(null); - List apiUserBoList = new ArrayList(); - for (ApiUser apiUser : apiUsers) { - User user = this.userService.findById(apiUser.getId()); - if (user == null) { - continue; - } - ApiUserBo bo = new ApiUserBo(); - bo.setAppKey(apiUser.getAppKey()); - if(null != user){ - bo.setUserId(user.getId()); - bo.setPassword(user.getPassword()); - bo.setUserName(user.getUserName()); - bo.setDisplayName(user.getDisplayName()); - } - - bo.setSiteName(apiUser.getSiteName()); - bo.setStatus(apiUser.getStatus()); + bo.setSiteName(apiUser.getSiteName()); + bo.setStatus(apiUser.getStatus()); bo.setCompany(apiUser.getCompany()); - bo.setIsTest(apiUser.getIsTest()); - bo.setPurpose(apiUser.getPurpose()); - bo.setDeadTime(apiUser.getDeadTime()); - bo.setManager(apiUser.getManager()); - bo.setIsMonitor(apiUser.getIsMonitor()); + bo.setIsTest(apiUser.getIsTest()); + bo.setPurpose(apiUser.getPurpose()); + bo.setDeadTime(apiUser.getDeadTime()); + bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); - apiUserBoList.add(bo); - } + apiUserBoList.add(bo); + } - Collections.sort(apiUserBoList, new Comparator() { + Collections.sort(apiUserBoList, new Comparator() { @Override public int compare(ApiUserBo o1, ApiUserBo o2) { if (o1.getStatus() == 0) { @@ -118,482 +117,506 @@ public class ApiUserController { }); - model.setApiUserBoList(apiUserBoList); - return model; - } - - public Object openlistAction(ApiUserModel model) { - return model; - } - - public Object resetPwdAction(ApiUserModel model) { - JsonModel ret = new JsonModel(); - Map dataMap = new HashMap(); - dataMap.put("status", 0); - if (model.getUserId() != null) { - Map data = new HashMap(); - data.put("password", DigestUtils.md5Hex("123456")); - userService.updateById(data, model.getUserId()); - dataMap.put("status", 1); - } - ret.setJsonModel(dataMap); - return ret; - } + model.setApiUserBoList(apiUserBoList); + return model; + } - /** - * 新增api用户的信息 - * - * @param model - * @return - */ - public Object addAction(ApiUserModel model) { - return model; - } + public Object openlistAction(ApiUserModel model) { + return model; + } - public Object doAddAction(ApiUserModel model) throws Exception { - if (StringUtils.isBlank(model.getDisplayName()) || StringUtils.isBlank(model.getUserName()) - || StringUtils.isBlank(model.getPassword())) { - model.setMsg("昵称,用户名,密码不能为空"); - model.forward("/apiUser/add"); - return model; - } + public Object resetPwdAction(ApiUserModel model) { + JsonModel ret = new JsonModel(); + Map dataMap = new HashMap(); + dataMap.put("status", 0); + if (model.getUserId() != null) { + Map data = new HashMap(); + data.put("password", DigestUtils.md5Hex("123456")); + userService.updateById(data, model.getUserId()); + dataMap.put("status", 1); + } + ret.setJsonModel(dataMap); + return ret; + } - try { - List users = new ArrayList(); - User user = new User(); - user.setUserName(model.getUserName()); - user.setPassword(DigestUtils.md5Hex(model.getPassword())); - user.setDisplayName(model.getDisplayName()); - users.add(user); - Map userMap = this.userService.saveUser(users); - Long id = userMap.get(model.getUserName()); + /** + * 新增api用户的信息 + * + * @param model + * @return + */ + public Object addAction(ApiUserModel model) { + return model; + } - String appkey = DigestUtils.md5Hex(String.valueOf(id)) + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(id))); - Date date = new Date(); - ApiUser apiUser = new ApiUser(); - apiUser.setId(id); - apiUser.setAppKey(appkey.toUpperCase()); - apiUser.setCreationDate(date); - apiUser.setSiteName(model.getSiteName()); + public Object doAddAction(ApiUserModel model) throws Exception { + if (StringUtils.isBlank(model.getDisplayName()) || StringUtils.isBlank(model.getUserName()) + || StringUtils.isBlank(model.getPassword())) { + model.setMsg("昵称,用户名,密码不能为空"); + model.forward("/apiUser/add"); + return model; + } + + try { + List users = new ArrayList(); + User user = new User(); + user.setUserName(model.getUserName()); + user.setPassword(DigestUtils.md5Hex(model.getPassword())); + user.setDisplayName(model.getDisplayName()); + users.add(user); + Map userMap = this.userService.saveUser(users); + Long id = userMap.get(model.getUserName()); + + String appkey = DigestUtils.md5Hex(String.valueOf(id)) + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(id))); + Date date = new Date(); + ApiUser apiUser = new ApiUser(); + apiUser.setId(id); + apiUser.setAppKey(appkey.toUpperCase()); + apiUser.setCreationDate(date); + apiUser.setSiteName(model.getSiteName()); apiUser.setCompany(model.getCompany()); - apiUser.setStatus(0); - apiUser.setIsTest(model.getIsTest()); - apiUser.setPurpose(model.getPurpose()); - apiUser.setIp(model.getIp()); - apiUser.setEmail(model.getEmail()); - apiUser.setModificationDate(date); - apiUser.setDeadTime(model.getDeadTime()); - apiUser.setManager(model.getManager()); - apiUser.setIsMonitor(model.getIsMonitor()); - this.apiUserService.save(apiUser); - if(model.getEvaluateRate() != null && model.getEvaluateRate() != 0){ - ApiUserCfg apiUserCfg = new ApiUserCfg(); - apiUserCfg.setUserId(apiUser.getId()); - apiUserCfg.setCfgValue(model.getEvaluateRate()); - this.apiUserCfgService.save(apiUserCfg, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); - } - model.setMsg("新建成功!"); - } catch (Exception e) { - e.printStackTrace(); - model.setMsg("新建失败!"); - } - model.redirect("/apiUser/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); - return model; - } + apiUser.setStatus(0); + apiUser.setIsTest(model.getIsTest()); + apiUser.setPurpose(model.getPurpose()); + apiUser.setIp(model.getIp()); + apiUser.setEmail(model.getEmail()); + apiUser.setModificationDate(date); + apiUser.setDeadTime(model.getDeadTime()); + apiUser.setManager(model.getManager()); + apiUser.setIsMonitor(model.getIsMonitor()); + this.apiUserService.save(apiUser); + // 新增用户,默认挂牌价改为默认评估价 + model.setPriceType("evaluate"); + modifyUserCfg(id, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); + if (model.getEvaluateRate() != null && model.getEvaluateRate() != 0) { + ApiUserCfg apiUserCfg = new ApiUserCfg(); + apiUserCfg.setUserId(apiUser.getId()); + apiUserCfg.setCfgValue(model.getEvaluateRate()); + this.apiUserCfgService.save(apiUserCfg, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + } + model.setMsg("新建成功!"); + } catch (Exception e) { + e.printStackTrace(); + model.setMsg("新建失败!"); + } + model.redirect("/apiUser/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); + return model; + } - /** - * 编辑api用户信息 - * - * @param model - * @return - */ - public Object editAction(ApiUserModel model) { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - User user = this.userService.findById(model.getUserId()); - ApiUserBo bo = new ApiUserBo(); - bo.setUserName(user.getUserName()); - bo.setAppKey(apiUser.getAppKey()); - bo.setUserId(user.getId()); - bo.setSiteName(user.getUserName()); - bo.setDisplayName(user.getDisplayName()); - bo.setIsTest(apiUser.getIsTest()); - bo.setPurpose(apiUser.getPurpose()); - bo.setSiteName(apiUser.getSiteName()); - bo.setIp(apiUser.getIp()); + /** + * 编辑api用户信息 + * + * @param model + * @return + */ + public Object editAction(ApiUserModel model) { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + User user = this.userService.findById(model.getUserId()); + ApiUserBo bo = new ApiUserBo(); + bo.setUserName(user.getUserName()); + bo.setAppKey(apiUser.getAppKey()); + bo.setUserId(user.getId()); + bo.setSiteName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + bo.setIsTest(apiUser.getIsTest()); + bo.setPurpose(apiUser.getPurpose()); + bo.setSiteName(apiUser.getSiteName()); + bo.setIp(apiUser.getIp()); bo.setCompany(apiUser.getCompany()); - bo.setEmail(apiUser.getEmail()); - bo.setDeadTime(apiUser.getDeadTime()); - bo.setManager(apiUser.getManager()); - bo.setIsMonitor(apiUser.getIsMonitor()); - ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); - if(apiUserCfg_rate != null){ - bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); - } + bo.setEmail(apiUser.getEmail()); + bo.setDeadTime(apiUser.getDeadTime()); + bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); + ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if (apiUserCfg_rate != null) { + bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); + } - ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); - if(apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null){ - bo.setPriceType(apiUserCfg_pt.getCfgValue().toString()); - } + ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); + if (apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null) { + bo.setPriceType(apiUserCfg_pt.getCfgValue().toString()); + } - model.setApiUserBo(bo); - if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { - model.setMsg("更新成功!"); - } - return model; - } + model.setApiUserBo(bo); + if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { + model.setMsg("更新成功!"); + } + return model; + } - /** - * 修改用户登录状态 - * - * @param model - * @return - */ - public Object statusAction(ApiUserModel model) { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - apiUser.setStatus(model.getStatus()); - apiUserService.update(apiUser); - model.setViewType("redirect"); - apiUserAuthorityService.clearApiUserAuthorityCache(apiUser.getId()); - model.setViewParam("location", "/apiUser/list"); - return model; - } + /** + * 修改用户登录状态 + * + * @param model + * @return + */ + public Object statusAction(ApiUserModel model) { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + apiUser.setStatus(model.getStatus()); + apiUserService.update(apiUser); + model.setViewType("redirect"); + apiUserAuthorityService.clearApiUserAuthorityCache(apiUser.getId()); + model.setViewParam("location", "/apiUser/list"); + return model; + } - /** - * 手动修改api用户appkey值 - * - * @param model - * @return - */ - public Object updateAction(ApiUserModel model) { - Long userId = model.getUserId(); - Map dataApiUser = new HashMap(); - dataApiUser.put("email", model.getEmail()); - dataApiUser.put("siteName", model.getSiteName()); - dataApiUser.put("ip", model.getIp()); + /** + * 手动修改api用户appkey值 + * + * @param model + * @return + */ + public Object updateAction(ApiUserModel model) { + Long userId = model.getUserId(); + Map dataApiUser = new HashMap(); + dataApiUser.put("email", model.getEmail()); + dataApiUser.put("siteName", model.getSiteName()); + dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); - dataApiUser.put("isTest", model.getIsTest()); - dataApiUser.put("purpose", model.getPurpose()); - dataApiUser.put("deadTime", model.getDeadTime()); - dataApiUser.put("manager", model.getManager()); - dataApiUser.put("isMonitor", model.getIsMonitor()); - this.apiUserService.update(dataApiUser, userId); + dataApiUser.put("isTest", model.getIsTest()); + dataApiUser.put("purpose", model.getPurpose()); + dataApiUser.put("deadTime", model.getDeadTime()); + dataApiUser.put("manager", model.getManager()); + dataApiUser.put("isMonitor", model.getIsMonitor()); + this.apiUserService.update(dataApiUser, userId); - //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE - modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); - modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); + //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE + modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); + modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); - model.setViewType("redirect"); - //model.setViewParam("location", "/apiUser/edit?msg=sucess&userId=" + model.getUserId()); - model.setViewParam("location", "/apiUser/list"); - return model; - } + model.setViewType("redirect"); + //model.setViewParam("location", "/apiUser/edit?msg=sucess&userId=" + model.getUserId()); + model.setViewParam("location", "/apiUser/list"); + return model; + } - void modifyUserCfg(Long userId, ApiUserCfg.ApiUserCfgKey cfgKey, Object val) { - if(userId != null && cfgKey != null){ - ApiUserCfg apiUserCfg = this.apiUserCfgService.findByUserId(userId, cfgKey); - if(val == null || StringUtils.isEmpty(val.toString())) { - if(null != apiUserCfg){ - apiUserCfgService.delete(apiUserCfg, cfgKey); - } - return; - } + void modifyUserCfg(Long userId, ApiUserCfg.ApiUserCfgKey cfgKey, Object val) { + if (userId != null && cfgKey != null) { + ApiUserCfg apiUserCfg = this.apiUserCfgService.findByUserId(userId, cfgKey); + if (val == null || StringUtils.isEmpty(val.toString())) { + if (null != apiUserCfg) { + apiUserCfgService.delete(apiUserCfg, cfgKey); + } + return; + } - if(cfgKey == ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE) { - try{ - double rate = Double.parseDouble(val.toString()); - if(Double.compare(rate, 0) == 0){ - if(null != apiUserCfg){ - apiUserCfgService.delete(apiUserCfg, cfgKey); - return; - } - } - }catch(Exception e){ - e.printStackTrace(); - } - } + if (cfgKey == ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE) { + try { + double rate = Double.parseDouble(val.toString()); + if (Double.compare(rate, 0) == 0) { + if (null != apiUserCfg) { + apiUserCfgService.delete(apiUserCfg, cfgKey); + return; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } - if(null == apiUserCfg){ - apiUserCfg = new ApiUserCfg(); - } - apiUserCfg.setUserId(userId); - apiUserCfg.setCreatedDate(new Date()); - apiUserCfg.setCfgValue(val); - apiUserCfgService.save(apiUserCfg, cfgKey); - } - } + if (null == apiUserCfg) { + apiUserCfg = new ApiUserCfg(); + } + apiUserCfg.setUserId(userId); + apiUserCfg.setCreatedDate(new Date()); + apiUserCfg.setCfgValue(val); + apiUserCfgService.save(apiUserCfg, cfgKey); + } + } - /** - * 重置appkey值,默认为userid md5加上useridmd5再md5, 64位 - * - * @param model - * @return - */ - public Object resetAction(ApiUserModel model) { - String appkey = DigestUtils.md5Hex(String.valueOf(model.getUserId())) - + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(model.getUserId()))); + /** + * 重置appkey值,默认为userid md5加上useridmd5再md5, 64位 + * + * @param model + * @return + */ + public Object resetAction(ApiUserModel model) { + String appkey = DigestUtils.md5Hex(String.valueOf(model.getUserId())) + + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(model.getUserId()))); - Map data = new HashMap(); - data.put("appKey", appkey.toUpperCase()); - this.apiUserService.update(data, model.getUserId()); - model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/edit?userId=" + model.getUserId()); - return model; - } + Map data = new HashMap(); + data.put("appKey", appkey.toUpperCase()); + this.apiUserService.update(data, model.getUserId()); + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/edit?userId=" + model.getUserId()); + return model; + } - public Object checkUserNameAction(ApiUserModel model) { - model.setViewType("json"); - model.setViewParam("config", null); - User user = userService.findByUserName(model.getUserName()); - if (user != null) { - model.setMsg("此用户名已经存在!"); - return model; - } - return model; - } + public Object checkUserNameAction(ApiUserModel model) { + model.setViewType("json"); + model.setViewParam("config", null); + User user = userService.findByUserName(model.getUserName()); + if (user != null) { + model.setMsg("此用户名已经存在!"); + return model; + } + return model; + } - public Object loadConfigAction(@Param(name="uri") String uri, @Param(name="userId") long userId){ - JsonModel json = new JsonModel(); - ApiJsonViewConfig config = apiUserAuthorityService.findViewConfig(userId, uri); - json.setJsonModel(config); - return json; - } + public Object loadConfigAction(@Param(name = "uri") String uri, @Param(name = "userId") long userId) { + JsonModel json = new JsonModel(); + ApiJsonViewConfig config = apiUserAuthorityService.findViewConfig(userId, uri); + json.setJsonModel(config); + return json; + } - public Object saveConfigAction(ApiJsonViewConfig config,@Param(name="fields") String fields){ - if(StringUtils.isNotBlank(fields)){ - List availableFields = new ArrayList(); - for(String field : fields.split("\r\n")){ - field = DataUtil.trim(field); - if(StringUtils.isNotBlank(field)){ - availableFields.add(field); - } - } - config.setFields(availableFields); - } - apiUserAuthorityService.saveViewConfig(config); - return new JsonModel(); - } + public Object saveConfigAction(ApiJsonViewConfig config, @Param(name = "fields") String fields) { + if (StringUtils.isNotBlank(fields)) { + List availableFields = new ArrayList(); + for (String field : fields.split("\r\n")) { + field = DataUtil.trim(field); + if (StringUtils.isNotBlank(field)) { + availableFields.add(field); + } + } + config.setFields(availableFields); + } + apiUserAuthorityService.saveViewConfig(config); + return new JsonModel(); + } - public Object cityAction(ApiUserModel model) throws IllegalAccessException { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - User user = this.userService.findById(apiUser.getId()); - ApiUserAuthority apiUserAuthority=apiUserAuthorityService.findByUserId(model.getUserId()); - Map cityCreditMap=apiUserAuthority.getCityCreditMap(); - model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); - model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); - List serverAreaList = serverAreaService.findAll();// Load城市列表 - if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 - model.setServerAreaList(null); - } else { // 首字母查询 - List> serverAreaLetterList = new ArrayList>();// Load城市列表 - for (ServerArea serverArea : serverAreaList) { - if (serverArea.getSpell().substring(0, 1).toUpperCase().equals(model.getType())) { - Map map=new HashMap (); - if(null!=cityCreditMap && cityCreditMap.get(serverArea.getDisplay())!=null){ - map.put("key0",serverArea); - java.text.DecimalFormat df =new java.text.DecimalFormat("######0.00"); - String rate=df.format(cityCreditMap.get(serverArea.getDisplay())); - map.put("key1",rate); - }else { - map.put("key0",serverArea); - map.put("key1",null); - } - serverAreaLetterList.add(map); - } - } - model.setServerAreaList(serverAreaLetterList); - } + public Object cityAction(ApiUserModel model) throws IllegalAccessException { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + User user = this.userService.findById(apiUser.getId()); + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map cityCreditMap = apiUserAuthority.getCityCreditMap(); + model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); + model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); + List serverAreaList = serverAreaService.findAll();// Load城市列表 + if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 + model.setServerAreaList(null); + } else { // 首字母查询 + List> serverAreaLetterList = new ArrayList>();// Load城市列表 + for (ServerArea serverArea : serverAreaList) { + if (serverArea.getSpell().substring(0, 1).toUpperCase().equals(model.getType())) { + Map map = new HashMap(); + if (null != cityCreditMap && cityCreditMap.get(serverArea.getDisplay()) != null) { + map.put("key0", serverArea); + java.text.DecimalFormat df = new java.text.DecimalFormat("######0.00"); + String rate = df.format(cityCreditMap.get(serverArea.getDisplay())); + map.put("key1", rate); + } else { + map.put("key0", serverArea); + map.put("key1", null); + } + serverAreaLetterList.add(map); + } + } + model.setServerAreaList(serverAreaLetterList); + } - StringBuffer openCitys = new StringBuffer();// Load城市列表 - if (StringUtils.isBlank(apiUser.getCity())) { - } else if ("all".equals(apiUser.getCity())) { - openCitys.append("全部城市"); - } else { - int cnt = 0; - if(StringUtils.isNotBlank(apiUser.getCity()) && !apiUser.getCity().endsWith(",")){ - apiUser.setCity(apiUser.getCity() + ","); - } - for (ServerArea serverArea : serverAreaList) { - if (apiUser.getCity().indexOf(serverArea.getSpell() + ",") > -1) { - cnt++; - if (cnt == 1) { - openCitys.append(serverArea.getDisplay()); - } else { - openCitys.append(","); - openCitys.append(serverArea.getDisplay()); - } - } - } - openCitys.append(";
共" + cnt + "个城市"); - } - model.setOpenCitys(openCitys.toString()); - model.setCitys(apiUser.getCity()); - return model; - } + StringBuffer openCitys = new StringBuffer();// Load城市列表 + if (StringUtils.isBlank(apiUser.getCity())) { + } else if ("all".equals(apiUser.getCity())) { + openCitys.append("全部城市"); + } else { + int cnt = 0; + if (StringUtils.isNotBlank(apiUser.getCity()) && !apiUser.getCity().endsWith(",")) { + apiUser.setCity(apiUser.getCity() + ","); + } + for (ServerArea serverArea : serverAreaList) { + if (apiUser.getCity().indexOf(serverArea.getSpell() + ",") > -1) { + cnt++; + if (cnt == 1) { + openCitys.append(serverArea.getDisplay()); + } else { + openCitys.append(","); + openCitys.append(serverArea.getDisplay()); + } + } + } + openCitys.append(";
共" + cnt + "个城市"); + } + model.setOpenCitys(openCitys.toString()); + model.setCitys(apiUser.getCity()); + return model; + } - public Object citySaveAction(ApiUserModel model) throws IllegalAccessException { - model.setViewType("json"); - model.setViewParam("config", null); - List serverAreaList = serverAreaService.findAll(); - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - ApiUserAuthority apiUserAuthority=apiUserAuthorityService.findByUserId(model.getUserId()); - Map cityCreditMap=apiUserAuthority.getCityCreditMap(); - if(null==cityCreditMap){ - cityCreditMap=new HashMap(); - } - if (model.getCitys().equals("all")) { - apiUser.setCity("all"); - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - } else if (model.getCitys().equals("disAll")) { - apiUser.setCity(null); - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - } else { - String _check_citys = model.getCitys() == null ? "" : model.getCitys(); - String _un_check_citys = model.getUnCheckCitys() == null ? "" : model.getUnCheckCitys(); - String displayNames= model.getDisplayName() == null ? "" : model.getDisplayName(); - String credits=model.getCredits() == null ? "" : model.getCredits(); - String uncitys=model.getUncitys() == null ? "" : model.getUncitys(); - String[] uncity = StringUtils.split(uncitys,"|"); - for(int i=0;i serverAreaList = serverAreaService.findAll(); + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map cityCreditMap = apiUserAuthority.getCityCreditMap(); + if (null == cityCreditMap) { + cityCreditMap = new HashMap(); + } + if (model.getCitys().equals("all")) { + apiUser.setCity("all"); + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); + } else if (model.getCitys().equals("disAll")) { + apiUser.setCity(null); + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); + } else { + String _check_citys = model.getCitys() == null ? "" : model.getCitys(); + String _un_check_citys = model.getUnCheckCitys() == null ? "" : model.getUnCheckCitys(); + String displayNames = model.getDisplayName() == null ? "" : model.getDisplayName(); + String credits = model.getCredits() == null ? "" : model.getCredits(); + String uncitys = model.getUncitys() == null ? "" : model.getUncitys(); + String[] uncity = StringUtils.split(uncitys, "|"); + for (int i = 0; i < uncity.length; i++) { + if (cityCreditMap.containsKey(uncity[i])) { + cityCreditMap.remove(uncity[i]); + } + } + if (StringUtils.isNotBlank(displayNames)) { + String[] display = StringUtils.split(displayNames, "|"); + String[] cre = StringUtils.split(credits, "|"); + for (int k = 0; k < display.length; k++) { + if (cre[k].equals("null")) { + cityCreditMap.remove(display[k]); + } else { + cityCreditMap.put(display[k], Double.parseDouble(cre[k])); + } + } + } + apiUserAuthority.setCityCreditMap(cityCreditMap); - String[] newCitys = StringUtils.split(_check_citys, ","); - for (String city : newCitys) { - if (citys.indexOf("," + city + ",") == -1) { - citys = citys + city + ","; - } - } - String[] delCitys = StringUtils.split(_un_check_citys, ","); - for (String city : delCitys) { - if (citys.indexOf("," + city + ",") > -1) { - citys = citys.replace(city + ",", ""); - } - } - citys = citys.replaceAll("^,","").replaceAll(",$",""); - apiUser.setCity(citys); - } - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - - apiUserAuthorityService.update(apiUserAuthority); - } - return model; - } + if (StringUtils.isBlank(apiUser.getCity())) { + apiUser.setCity(model.getCitys()); + } else if (apiUser.getCity().equals("all")) { + StringBuffer citys = new StringBuffer(); + int _all = 0; + for (ServerArea serverArea : serverAreaList) { + if (_un_check_citys.indexOf(serverArea.getSpell()) == -1) { + _all++; + if (_all == 1) { + citys.append(serverArea.getSpell()); + } else { + citys.append(","); + citys.append(serverArea.getSpell()); + } + } + } + apiUser.setCity(citys.toString()); + } else { + String citys = apiUser.getCity(); + if (StringUtils.isBlank(citys)) { + citys = ","; + } else { + if (!citys.endsWith(",")) { + citys += ","; + } + if (!citys.startsWith(",")) { + citys = "," + citys; + } + } - /** - * 所有api用户的信息展示 - * - * @param model - * @return - */ - public Object authAction(ApiUserModel model) throws IllegalAccessException { - /** - * OpenResource open中公开出的接口资源 User 本地user ApiUserAuthority 用户的权限信息 - * - * @param ApiUser - * :用户的资料信息 - * @param AuthorityBo - * :用户的appKey username、等资料 - */ - List openResourceList = openResourceService.findAll(); - List authorityBoList = new ArrayList(); - ApiUserAuthority authority = apiUserAuthorityService.findByUserId(model.getUserId()); - if(authority == null){ - authority = new ApiUserAuthority(); - authority.setOpenResourseUris(new ArrayList()); - apiUserAuthorityService.save(authority); - } - User user = this.userService.findById(model.getUserId()); - model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); - Map urisMap = authority.getOpenResourseUrisMap(); - for (OpenResource openResource : openResourceList) { - AuthorityBo bo = new AuthorityBo(); - BeanUtils.copyProperties(openResource, bo); - if (authority != null) { - bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); - model.setSupportLatLng(authority.isSupportLatLng()); - bo.setLimitCountMap(authority.getLimitCountMap()); - bo.setTotalCountMap(authority.getTotalCountMap()); - bo.setIsCheckCount(urisMap==null?0:(urisMap.get(bo.getUri())==null?0:urisMap.get(bo.getUri()))); - } - //apiVisitCountService.findApiVisitAllCount(user.getUserId(), null); - if(bo.isHasAuth()){ - long curVistedCount = apiVisitCountService.findApiVisitCountByDay(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); - long total = apiVisitCountService.findApiVisitAllCount(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); - bo.setCurVisitedCount(curVistedCount); - bo.setTotalVisitedCount(total); - } - - authorityBoList.add(bo); - } - model.setAuthority(authority); - model.setAuthorityBoList(authorityBoList); - return model; - } + String[] newCitys = StringUtils.split(_check_citys, ","); + for (String city : newCitys) { + if (citys.indexOf("," + city + ",") == -1) { + citys = citys + city + ","; + } + } + String[] delCitys = StringUtils.split(_un_check_citys, ","); + for (String city : delCitys) { + if (citys.indexOf("," + city + ",") > -1) { + citys = citys.replace(city + ",", ""); + } + } + citys = citys.replaceAll("^,", "").replaceAll(",$", ""); + apiUser.setCity(citys); + } + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); - public Object openuriAction(ApiUserModel model){ - List authorityBoList = new ArrayList(); - List openResourceList = openResourceService.findAll(); - String userId=model.getUserId().toString(); - for(OpenResource openResource:openResourceList){ - String uri=openResource.getUri(); - AuthorityBo bo = new AuthorityBo(); - BeanUtils.copyProperties(openResource, bo); - OpenResourceCount open= openResourceCountService.findByUserId(userId, uri); - Long count=0L; - if(open!=null && open.getCount()!=null){ - count=open.getCount(); - } - bo.setCount(count); - authorityBoList.add(bo); - } - Collections.sort(authorityBoList, new Comparator() { + apiUserAuthorityService.update(apiUserAuthority); + } + return model; + } + + /** + * 所有api用户的信息展示 + * + * @param model + * @return + */ + public Object authAction(ApiUserModel model) throws IllegalAccessException { + /** + * OpenResource open中公开出的接口资源 User 本地user ApiUserAuthority 用户的权限信息 + * + * @param ApiUser + * :用户的资料信息 + * @param AuthorityBo + * :用户的appKey username、等资料 + */ + List openResourceList = openResourceService.findAll(); + List authorityBoList = new ArrayList(); + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(model.getUserId()); + if (authority == null) { + authority = new ApiUserAuthority(); + authority.setOpenResourseUris(new ArrayList()); + apiUserAuthorityService.save(authority); + } + User user = this.userService.findById(model.getUserId()); + model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); + Map urisMap = authority.getOpenResourseUrisMap(); + + // 用户有的uri + String flag = model.getMsg(); + List userResources = new ArrayList(); + + if ("0".equals(flag)) { + for (OpenResource openResource : openResourceList) { + if (!authority.getOpenResourseUris().contains(openResource.getUri())) { + userResources.add(openResource); + } + } + } else { + for (OpenResource openResource : openResourceList) { + if (authority.getOpenResourseUris().contains(openResource.getUri())) { + userResources.add(openResource); + } + } + } + + // 改成遍历用户有的uri + for (OpenResource openResource : userResources) { + AuthorityBo bo = new AuthorityBo(); + BeanUtils.copyProperties(openResource, bo); + if (authority != null) { + bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); + bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); + model.setSupportLatLng(authority.isSupportLatLng()); + bo.setLimitCountMap(authority.getLimitCountMap()); + bo.setTotalCountMap(authority.getTotalCountMap()); + bo.setIsCheckCount(urisMap == null ? 0 : (urisMap.get(bo.getUri()) == null ? 0 : urisMap.get(bo.getUri()))); + } + //apiVisitCountService.findApiVisitAllCount(user.getUserId(), null); + if (bo.isHasAuth()) { + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); + long total = apiVisitCountService.findApiVisitAllCount(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); + bo.setCurVisitedCount(curVistedCount); + bo.setTotalVisitedCount(total); + } + + authorityBoList.add(bo); + } + model.setAuthority(authority); + model.setAuthorityBoList(authorityBoList); + return model; + } + + public Object openuriAction(ApiUserModel model) { + List authorityBoList = new ArrayList(); + List openResourceList = openResourceService.findAll(); + String userId = model.getUserId().toString(); + for (OpenResource openResource : openResourceList) { + String uri = openResource.getUri(); + AuthorityBo bo = new AuthorityBo(); + BeanUtils.copyProperties(openResource, bo); + OpenResourceCount open = openResourceCountService.findByUserId(userId, uri); + Long count = 0L; + if (open != null && open.getCount() != null) { + count = open.getCount(); + } + bo.setCount(count); + authorityBoList.add(bo); + } + Collections.sort(authorityBoList, new Comparator() { @Override public int compare(AuthorityBo o1, AuthorityBo o2) { if (o1.getCount() > o2.getCount()) { @@ -605,9 +628,9 @@ public class ApiUserController { } }); - model.setAuthorityBoList(authorityBoList); - return model; - } + model.setAuthorityBoList(authorityBoList); + return model; + } public Object saveAuthAction(ApiUserModel model, HttpServletRequest request) throws IllegalAccessException { @@ -640,13 +663,13 @@ public class ApiUserController { totalCountMap.put(model.getUri(), model.getSum()); authority.setTotalCountMap(totalCountMap); } - if(model.getIsCheckCount() !=null) { - Map urisMap = authority.getOpenResourseUrisMap(); - if(urisMap==null) { - urisMap = new HashMap(); - } - urisMap.put(model.getUri(), model.getIsCheckCount()); - authority.setOpenResourseUrisMap(urisMap); + if (model.getIsCheckCount() != null) { + Map urisMap = authority.getOpenResourseUrisMap(); + if (urisMap == null) { + urisMap = new HashMap(); + } + urisMap.put(model.getUri(), model.getIsCheckCount()); + authority.setOpenResourseUrisMap(urisMap); } if (model.isHasAuth() && !authority.getOpenResourseUris().contains(model.getUri())) { authority.getOpenResourseUris().add(model.getUri()); @@ -675,17 +698,17 @@ public class ApiUserController { List openResourceList = openResourceService.findAll(); boolean save = false; - if (authority == null) { + if (authority == null) { save = true; authority = new ApiUserAuthority(); } authority.setUserId(userId); authority.setSupportLatLng(model.isSupportLatLng()); - Map limit = string2map(model.getLimitCountMap()); - Map total = string2map(model.getTotalCountMap()); - Map uriMap = string2map(model.getOpenResourseUrisMap()); - authority.setLimitCountMap(limit); - authority.setTotalCountMap(total); + Map limit = string2map(model.getLimitCountMap()); + Map total = string2map(model.getTotalCountMap()); + Map uriMap = string2map(model.getOpenResourseUrisMap()); + authority.setLimitCountMap(limit); + authority.setTotalCountMap(total); List uris = new ArrayList(); for (OpenResource openResource : openResourceList) { if (model.getUri().indexOf(openResource.getUri()) > -1) { @@ -693,13 +716,13 @@ public class ApiUserController { } } authority.setOpenResourseUris(uris); - Map openResourseUrisMap = authority.getOpenResourseUrisMap(); - if(null!=uriMap&&!uriMap.isEmpty()) { - for(String url : uriMap.keySet()) { - openResourseUrisMap.put(url, uriMap.get(url)); + Map openResourseUrisMap = authority.getOpenResourseUrisMap(); + if (null != uriMap && !uriMap.isEmpty()) { + for (String url : uriMap.keySet()) { + openResourseUrisMap.put(url, uriMap.get(url)); } } - + if (save) { apiUserAuthorityService.update(authority); } else { @@ -708,1002 +731,1002 @@ public class ApiUserController { return model; } - public Object clickStatAction(ApiUserModel model) { - return model; - } - - public Object pandectAction(ApiUserModel model) throws Throwable{ - Date startDate = null; - Date endDate = null; - - if(model.getWay()==null){ - model.setWay(0); - } - if(StringUtils.isNotBlank(model.getQuery())){ - - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), Integer.parseInt(model.getQuery())); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - } - - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - - if(startDate == null && endDate==null){ - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -8); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - model.setQuery("-8"); - } - - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); - - if(startDate!= null && endDate!=null && startDate!=endDate && !model.getQuery().equals("-1")){ - Map map = new HashMap(); - List list = new ArrayList(); - for(OpenUriAnaly bo : analys){ - Integer count = (Integer) map.get(DateUtil.formatToYYYYMMDD(bo.getStatDate())); - if(count == null){ - if(!list.contains(bo.getStatDate())){ - list.add(bo.getStatDate()); - } - map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), bo.getUrlClickCount()); - }else{ - map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), count + bo.getUrlClickCount()); - } - - } - - Collections.sort(list); - if(model.getQuery().equals("-14")){ - List> ret = new ArrayList>(); - String d1 = DateUtil.formatToYYYYMMDD(startDate); - List times = null; - String d2 = DateUtil.formatToYYYYMMDD(endDate); - while(!d1.equals(d2)){ - if(ret.size()==0 ||times.size()==7){ - times = new ArrayList(); - ret.add(times); - } - times.add(d1); - d1 = DateUtil.formatToYYYYMMDD(DateUtil.add(DateUtil.parseStringToDate(d1), 1)); - } - List dates = ret.get(0); - List weeks = new ArrayList(); - for(String date : dates){ - String day = DateUtil.getWeekOfDate(date, new SimpleDateFormat("yyyy-MM-dd")); - weeks.add(day); - } - model.setxAxis(toXAxis2(weeks)); - model.setChartSeries(toSeries2(map, ret)); - - }else{ - model.setxAxis(toXAxis(list)); - model.setChartSeries(toSeries(map, list)); - } + public Object clickStatAction(ApiUserModel model) { + return model; + } - }else{ - int totalCount = 0; - for(OpenUriAnaly bo : analys){ - totalCount = totalCount + bo.getUrlClickCount(); - } - model.setTotalCount(totalCount); - } - - return model; - } - - private String toSeries(Map map, List list){ - String s = ""; - for(int i=0;i map, List> dates){ - String s = ""; - for(int k=0; k dateList = dates.get(k); - String temp = ""; - for(int i=0;i bos, List list){ - JSONArray ja = new JSONArray(); - for(Date temp : list){ - String tempStr = DateUtil.formatToYYYYMMDD(temp); - for(StatAnalyBo bo : bos){ - String dateStr = bo.getKey(); - if(dateStr.equals(tempStr)){ - ja.put(bo.getCount()); - break; - } - } - - } - return ja.toString(); - } - - - private String toXAxis(List list){ - String categories = ""; - for(int i=0;i list){ - String categories = ""; - for(int i=0;i cities; - if(StringUtils.isNotBlank(citys)){ - cities = Arrays.asList(StringUtils.split(citys,"|")); - }else{ - cities = new ArrayList(); - } - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); - List bos = null; - List eachCityBos=null; - if(model.getWay() == null){ - model.setWay(1); - } + if (model.getWay() == null) { + model.setWay(0); + } + if (StringUtils.isNotBlank(model.getQuery())) { - if(model.getWay()==1){ - bos = createAnalyBosByUser(analys); - }else if(model.getWay() == 2){ - bos = createAnalyBosByLink(analys); - }else if(model.getWay() == 3){ - if(cities.size()!=0) { - List apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); - eachCityBos = getEachCityBos(apiCountCities); - } - bos = createAnalyBosByLink(analys); - } - if(model.getWay()==1){ - long date = DateUtil.parseStringToDate("2016-11-23").getTime(); - if(startDate.getTime()>=date && endDate.getTime()>date){ - List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); - if(bos!=null){ - for (StatAnalyBo boTemp : bos) { - Integer userId = boTemp.getUserId(); - Integer successEffectiveTime=0; - Integer successInvalidTime=0; - Integer defeatTime=0; - for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { - if(apiInvokeStatistical.getUserId().equals(userId.toString())){ - successEffectiveTime=successEffectiveTime+apiInvokeStatistical.getSuccessEffectiveTime(); - successInvalidTime=successInvalidTime+apiInvokeStatistical.getSuccessInvalidTime(); - defeatTime=defeatTime+apiInvokeStatistical.getDefeatTime(); - } - } - boTemp.setSuccessEffectiveTime(successEffectiveTime); - boTemp.setSuccessInvalidTime(successInvalidTime); - boTemp.setDefeatTime(defeatTime); - } - } - } - List userIds = new ArrayList(); - for (StatAnalyBo boTemp : bos) { - userIds.add(Long.valueOf(boTemp.getUserId())); - List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(Long.valueOf(boTemp.getUserId()), null, startDate, endDate); - int total = 0; - for(ApiVisitCount apiVisitCount : apiVisitCounts){ - total += apiVisitCount.getVisitCount(); - } - boTemp.setBillingCount(total); - } + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), Integer.parseInt(model.getQuery())); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } + + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } + + + if (startDate == null && endDate == null) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -8); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + model.setQuery("-8"); + } + + + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + + if (startDate != null && endDate != null && startDate != endDate && !model.getQuery().equals("-1")) { + Map map = new HashMap(); + List list = new ArrayList(); + for (OpenUriAnaly bo : analys) { + Integer count = (Integer) map.get(DateUtil.formatToYYYYMMDD(bo.getStatDate())); + if (count == null) { + if (!list.contains(bo.getStatDate())) { + list.add(bo.getStatDate()); + } + map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), bo.getUrlClickCount()); + } else { + map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), count + bo.getUrlClickCount()); + } + + } + + Collections.sort(list); + if (model.getQuery().equals("-14")) { + List> ret = new ArrayList>(); + String d1 = DateUtil.formatToYYYYMMDD(startDate); + List times = null; + String d2 = DateUtil.formatToYYYYMMDD(endDate); + while (!d1.equals(d2)) { + if (ret.size() == 0 || times.size() == 7) { + times = new ArrayList(); + ret.add(times); + } + times.add(d1); + d1 = DateUtil.formatToYYYYMMDD(DateUtil.add(DateUtil.parseStringToDate(d1), 1)); + } + List dates = ret.get(0); + List weeks = new ArrayList(); + for (String date : dates) { + String day = DateUtil.getWeekOfDate(date, new SimpleDateFormat("yyyy-MM-dd")); + weeks.add(day); + } + model.setxAxis(toXAxis2(weeks)); + model.setChartSeries(toSeries2(map, ret)); + + } else { + model.setxAxis(toXAxis(list)); + model.setChartSeries(toSeries(map, list)); + } + + } else { + int totalCount = 0; + for (OpenUriAnaly bo : analys) { + totalCount = totalCount + bo.getUrlClickCount(); + } + model.setTotalCount(totalCount); + } + + return model; + } + + private String toSeries(Map map, List list) { + String s = ""; + for (int i = 0; i < list.size(); i++) { + Date date = list.get(i); + int count = (Integer) map.get(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + s = s + String.valueOf(count); + } else { + s = s + String.valueOf(count) + ","; + } + } + + return "{name:'访问量',data:[" + s + "]}"; + } + + private String toSeries2(Map map, List> dates) { + String s = ""; + for (int k = 0; k < dates.size(); k++) { + List dateList = dates.get(k); + String temp = ""; + for (int i = 0; i < dateList.size(); i++) { + String date = dateList.get(i); + int count = (Integer) map.get(date); + + if (i + 1 == dateList.size()) { + String name = "上周"; + if (k == 1) { + name = "最近7天"; + } + temp = "{name:'" + name + "',data:[" + temp + String.valueOf(count) + "]}"; + } else { + temp = temp + String.valueOf(count) + ","; + } + } + if (k == 1) { + s = s + "," + temp; + } else { + s = temp; + } + + } + + return s; + } + + private String toSeries(List bos, List list) { + JSONArray ja = new JSONArray(); + for (Date temp : list) { + String tempStr = DateUtil.formatToYYYYMMDD(temp); + for (StatAnalyBo bo : bos) { + String dateStr = bo.getKey(); + if (dateStr.equals(tempStr)) { + ja.put(bo.getCount()); + break; + } + } + + } + return ja.toString(); + } + + + private String toXAxis(List list) { + String categories = ""; + for (int i = 0; i < list.size(); i++) { + Date date = list.get(i); + //ja.put(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + categories = categories + "'" + DateUtil.formatToYYYYMMDD(date) + "'"; + } else { + categories = categories + "'" + DateUtil.formatToYYYYMMDD(date) + "',"; + } + } + + return categories; + } + + private String toXAxis2(List list) { + String categories = ""; + for (int i = 0; i < list.size(); i++) { + String value = list.get(i); + //ja.put(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + categories = categories + "'" + value + "'"; + } else { + categories = categories + "'" + value + "',"; + } + } + + return categories; + } + + public Object apiVisitStatAction(ApiUserModel model) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isBlank(model.getBegDate()) && StringUtils.isBlank(model.getEndDate())) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } else { + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } + + } + if (startDate != null) { + model.setBegDate(DateUtil.formatToYYYYMMDD(startDate)); + } + + if (endDate != null) { + model.setEndDate(DateUtil.formatToYYYYMMDD(endDate)); + } + + String citys = model.getCitys(); + List cities; + if (StringUtils.isNotBlank(citys)) { + cities = Arrays.asList(StringUtils.split(citys, "|")); + } else { + cities = new ArrayList(); + } + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + List bos = null; + List eachCityBos = null; + if (model.getWay() == null) { + model.setWay(1); + } + + if (model.getWay() == 1) { + bos = createAnalyBosByUser(analys); + } else if (model.getWay() == 2) { + bos = createAnalyBosByLink(analys); + } else if (model.getWay() == 3) { + if (cities.size() != 0) { + List apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); + eachCityBos = getEachCityBos(apiCountCities); + } + bos = createAnalyBosByLink(analys); + } + if (model.getWay() == 1) { + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if (startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); + if (bos != null) { + for (StatAnalyBo boTemp : bos) { + Integer userId = boTemp.getUserId(); + Integer successEffectiveTime = 0; + Integer successInvalidTime = 0; + Integer defeatTime = 0; + for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { + if (apiInvokeStatistical.getUserId().equals(userId.toString())) { + successEffectiveTime = successEffectiveTime + apiInvokeStatistical.getSuccessEffectiveTime(); + successInvalidTime = successInvalidTime + apiInvokeStatistical.getSuccessInvalidTime(); + defeatTime = defeatTime + apiInvokeStatistical.getDefeatTime(); + } + } + boTemp.setSuccessEffectiveTime(successEffectiveTime); + boTemp.setSuccessInvalidTime(successInvalidTime); + boTemp.setDefeatTime(defeatTime); + } + } + } + List userIds = new ArrayList(); + for (StatAnalyBo boTemp : bos) { + userIds.add(Long.valueOf(boTemp.getUserId())); + List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(Long.valueOf(boTemp.getUserId()), null, startDate, endDate); + int total = 0; + for (ApiVisitCount apiVisitCount : apiVisitCounts) { + total += apiVisitCount.getVisitCount(); + } + boTemp.setBillingCount(total); + } + + List apiUsers = apiUserService.findApiUserByIds(userIds); + Map idUserMap = new HashMap(); + for (ApiUser apiUser : apiUsers) { + idUserMap.put(apiUser.getId(), apiUser); + } + for (StatAnalyBo boTemp : bos) { + ApiUser apiUser = idUserMap.get(Long.valueOf(boTemp.getUserId())); + if (apiUser != null) { + boTemp.setPurpose(apiUser.getPurpose()); + } + } + } + if (model.getWay() != 3) { + model.setStatAnalyBoList(sortStatAnaly(bos)); + model.setChartSeries(toChartString(bos)); + } else { + model.setChartSeries(toChartString(bos)); + model.setEachCityBoList(eachCityBos); + } + List resources = openResourceService.findOpenResource(null); + model.setResourceMap(converMapData(resources)); + return model; + } + + + public Object userVisitStatAction(ApiUserModel model) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } + + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); + List bos = null; + + if (StringUtils.isBlank(model.getQuery()) && model.getWay() == 2) { + model.setQuery("uri"); + } else if (StringUtils.isBlank(model.getQuery()) && model.getWay() == 1) { + model.setQuery("user"); + } - List apiUsers = apiUserService.findApiUserByIds(userIds); - Map idUserMap = new HashMap(); - for(ApiUser apiUser : apiUsers){ - idUserMap.put(apiUser.getId(), apiUser); - } - for (StatAnalyBo boTemp : bos) { - ApiUser apiUser = idUserMap.get(Long.valueOf(boTemp.getUserId())); - if(apiUser != null){ - boTemp.setPurpose(apiUser.getPurpose()); - } - } - } - if(model.getWay()!=3) { - model.setStatAnalyBoList(sortStatAnaly(bos)); - model.setChartSeries(toChartString(bos)); - } - else { - model.setChartSeries(toChartString(bos)); - model.setEachCityBoList(eachCityBos); - } - List resources = openResourceService.findOpenResource(null); - model.setResourceMap(converMapData(resources)); - return model; - } - - - public Object userVisitStatAction(ApiUserModel model){ - Date startDate = null; - Date endDate = null; - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); - List bos = null; - - if(StringUtils.isBlank(model.getQuery())&&model.getWay()==2){ - model.setQuery("uri"); - }else if(StringUtils.isBlank(model.getQuery())&&model.getWay()==1){ - model.setQuery("user"); - } - // if(model.getWay()==1){ // bos = createAnalyBosByUser(analys); // model.setChartSeries(toChartString(bos)); // }else if(model.getWay() == 2){ - if(model.getWay() == 2){ - User user = userService.findById(model.getUserId()); - if(user!=null){ - model.setUserName(user.getDisplayName()); - } - } - - if(model.getQuery().equals("uri")){ - bos = createAnalyBosByLink(analys); - model.setChartSeries(toChartString(bos)); - }if(model.getQuery().equals("day")){ - bos = createAnalyByCity(analys, "day"); - - List list = new ArrayList(); - - for(OpenUriAnaly bo : analys){ - if(!list.contains(bo.getStatDate())){ - list.add(bo.getStatDate()); - } - } - Collections.sort(list); - model.setxAxis(toXAxis(list)); - model.setChartSeries(toSeries(bos, list)); - - }else if(model.getQuery().equals("time")){ - bos = createAnalyByCity(analys, "time"); - model.setChartSeries(toChartString(bos)); - }else if(model.getQuery().equals("user")){ - bos = createAnalyBosByUser(analys); - model.setChartSeries(toChartString(bos)); - } - + if (model.getWay() == 2) { + User user = userService.findById(model.getUserId()); + if (user != null) { + model.setUserName(user.getDisplayName()); + } + } + + if (model.getQuery().equals("uri")) { + bos = createAnalyBosByLink(analys); + model.setChartSeries(toChartString(bos)); + } + if (model.getQuery().equals("day")) { + bos = createAnalyByCity(analys, "day"); + + List list = new ArrayList(); + + for (OpenUriAnaly bo : analys) { + if (!list.contains(bo.getStatDate())) { + list.add(bo.getStatDate()); + } + } + Collections.sort(list); + model.setxAxis(toXAxis(list)); + model.setChartSeries(toSeries(bos, list)); + + } else if (model.getQuery().equals("time")) { + bos = createAnalyByCity(analys, "time"); + model.setChartSeries(toChartString(bos)); + } else if (model.getQuery().equals("user")) { + bos = createAnalyBosByUser(analys); + model.setChartSeries(toChartString(bos)); + } + // } - - long date = DateUtil.parseStringToDate("2016-11-23").getTime(); - if("uri".equals(model.getQuery()) && startDate.getTime()>=date && endDate.getTime()>date){ - List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); - if(bos!=null && apiInvokeStatisticalList.size()>0){ - Map> resultMap = getCountByUri(apiInvokeStatisticalList); - for (StatAnalyBo boTemp : bos) { - String url = boTemp.getKey(); - boTemp.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); - boTemp.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); - boTemp.setDefeatTime(resultMap.get(url).get("defeatCount")); - } - } - } - for (StatAnalyBo boTemp : bos) { - List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(model.getUserId(), boTemp.getKey(), startDate, endDate); - int total = 0; - for(ApiVisitCount apiVisitCount : apiVisitCounts){ - total += apiVisitCount.getVisitCount(); - } - boTemp.setBillingCount(total); - } - - List resources = openResourceService.findOpenResource(null); - model.setResourceMap(converMapData(resources)); - model.setStatAnalyBoList(sortStatAnaly(bos)); - - return model; - } - - public Object detailVisitStatAction(ApiUserModel model){ - Date startDate = null; - Date endDate = null; - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); - if(StringUtils.isBlank(model.getQuery())){ - model.setQuery("city"); - } - - List bos = null; - if(model.getQuery().equals("city")){ - bos = createAnalyByCity(analys, "city"); - }else if(model.getQuery().equals("time")){ - bos = createAnalyByCity(analys, "time"); - } - - model.setStatAnalyBoList(sortStatAnaly(bos)); - model.setChartSeries(toChartString(bos)); - - User user = userService.findById(model.getUserId()); - if(user!=null){ - model.setUserName(user.getDisplayName()); - }else{ - model.setUserName(model.getUserId().toString()); - } - return model; - } - public Object importExcelAction(HttpServletRequest request,ApiUserModel model){ - String citys=request.getParameter("city"); - String begDate=request.getParameter("begDate"); - String enDate=request.getParameter("endDate"); - Date startDate = null; - Date endDate = null; - if(StringUtils.isBlank(begDate) && StringUtils.isBlank(enDate)){ - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - }else{ - if(StringUtils.isNotBlank(begDate)){ - startDate = DateUtil.parseStringToDate(begDate); - } - if(StringUtils.isNotBlank(enDate)){ - endDate = DateUtil.parseStringToDate(enDate); - } + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if ("uri".equals(model.getQuery()) && startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); + if (bos != null && apiInvokeStatisticalList.size() > 0) { + Map> resultMap = getCountByUri(apiInvokeStatisticalList); + for (StatAnalyBo boTemp : bos) { + String url = boTemp.getKey(); + boTemp.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); + boTemp.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); + boTemp.setDefeatTime(resultMap.get(url).get("defeatCount")); + } + } + } + for (StatAnalyBo boTemp : bos) { + List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(model.getUserId(), boTemp.getKey(), startDate, endDate); + int total = 0; + for (ApiVisitCount apiVisitCount : apiVisitCounts) { + total += apiVisitCount.getVisitCount(); + } + boTemp.setBillingCount(total); + } - } - String Array[]=StringUtils.split(citys,"|"); - List cities=new ArrayList(); - if(Array!=null) { - for (int i = 0; i < Array.length; i++) { - cities.add(Array[i]); - } - } - List apiCountCities =null; - List eachCityBos=null; - if(cities.size()!=0) { - apiCountCities=apiCountCityService.findApiCountCity(cities, startDate, endDate); - eachCityBos = getEachCityBos(apiCountCities); - } + List resources = openResourceService.findOpenResource(null); + model.setResourceMap(converMapData(resources)); + model.setStatAnalyBoList(sortStatAnaly(bos)); - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFCellStyle cellStyle = workbook.createCellStyle(); - cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); - HSSFSheet sheet = workbook.createSheet("数据导出"); - HSSFRow row = sheet.createRow(0); - HSSFCell cell0 = row.createCell(0); - HSSFCell cell1 = row.createCell(1); - HSSFCell cell2 = row.createCell(2); - HSSFCell cell3= row.createCell(3); - HSSFCell cell4= row.createCell(4); - HSSFCell cell5= row.createCell(5); - cell0.setCellValue("城市"); - cell1.setCellValue("调用总量"); - cell2.setCellValue("成功调用次数"); - cell3.setCellValue("占比"); - cell4.setCellValue("失败调用次数"); - cell5.setCellValue("占比"); - if(null!=eachCityBos) { - for (int i = 0; i < eachCityBos.size(); i++) { - HSSFRow rows = sheet.createRow(i + 1); - HSSFCell cel0 = rows.createCell(0); - HSSFCell cel1 = rows.createCell(1); - HSSFCell cel2 = rows.createCell(2); - HSSFCell cel3 = rows.createCell(3); - HSSFCell cel4 = rows.createCell(4); - HSSFCell cel5 = rows.createCell(5); - cel0.setCellValue(eachCityBos.get(i).getCity()); - cel1.setCellValue(eachCityBos.get(i).getSumTime()); - cel2.setCellValue(eachCityBos.get(i).getSuccessTime()); - cel3.setCellValue(getFour(eachCityBos.get(i).getSuccessRate()) * 100 + "%"); - cel4.setCellValue(eachCityBos.get(i).getFailTime()); - cel5.setCellValue(getFour(eachCityBos.get(i).getFailRate()) * 100 + "%"); - } - } - HttpServletResponse response = ActionContext.getContext().getResponse(); - response.setCharacterEncoding("UTF-8"); - response.setContentType("application/x-download;charset=UTF-8"); - response.setHeader( "Content-Disposition", "attachment;filename=daochu.xls"); - try { - OutputStream os=response.getOutputStream(); - workbook.write(os); - os.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - private List sortApiBo(List bos){ - Collections.sort(bos, new Comparator() { - @Override - public int compare(OpenUriAnalyBo o1, OpenUriAnalyBo o2) { - if(o1.getUrlClickCount() > o2.getUrlClickCount()) { - return -1; - }else if(o1.getUrlClickCount() < o2.getUrlClickCount()) { - return 1; - } - return 0; - } - }); - - return bos; - } - private List sortStatAnaly(List bos){ - Collections.sort(bos, new Comparator() { - @Override - public int compare(StatAnalyBo o1, StatAnalyBo o2) { - if(o1.getCount() > o2.getCount()) { - return -1; - }else if(o1.getCount() < o2.getCount()) { - return 1; - } - return 0; - } - }); - - return bos; - } - private Map converMapData(List resources){ - Map map = new HashMap(); - for(OpenResource resource : resources){ - map.put(resource.getUri(), resource.getName()); - } - return map; - } - - - private List createAnalyBosByLink(List analys){ + return model; + } + + public Object detailVisitStatAction(ApiUserModel model) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } - Map ret = new HashMap(); - Map> urlCodeMap = new HashMap>(); - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - Integer temp = ret.get(openUriAnaly.getUrl()); - if(temp == null){ - ret.put(openUriAnaly.getUrl(), openUriAnaly.getUrlClickCount()); - }else{ - ret.put(openUriAnaly.getUrl(), temp + openUriAnaly.getUrlClickCount()); - } - Map codeMap = urlCodeMap.get(openUriAnaly.getUrl()); - if(codeMap == null){ - codeMap = new HashMap(); - urlCodeMap.put(openUriAnaly.getUrl(), codeMap); - } - Map analyCodeMap = openUriAnaly.getCodeMap(); - for(String code : analyCodeMap.keySet()){ - Integer count = (Integer) analyCodeMap.get(code); - if("200".equals(code)){ - Integer successCount = codeMap.get("successCount"); - if(successCount == null){ - codeMap.put("successCount", count); - }else{ - codeMap.put("successCount", successCount + count); - } - }else{ - Integer defeatCount = codeMap.get("defeatCount"); - if(defeatCount == null){ - codeMap.put("defeatCount", count); - }else{ - codeMap.put("defeatCount", defeatCount + count); - } - } - } - total = total + openUriAnaly.getUrlClickCount(); - } + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); + if (StringUtils.isBlank(model.getQuery())) { + model.setQuery("city"); + } - List bos = new ArrayList(); - int index = 0; - double totalPercent = 0; - for(String url : ret.keySet()){ - Integer count = ret.get(url); - double percent = 0; - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = count; - double val = a1*10000/(double)total; - percent = DataUtil.roundDouble(val/100, 2); - totalPercent = totalPercent + percent; - } - StatAnalyBo bo = new StatAnalyBo(); - bo.setKey(url); - bo.setCount(count); - bo.setPercent(percent); - Map codeMap = urlCodeMap.get(url); - bo.setSuccessTime(codeMap.get("successCount")); - bo.setDefeatTime(codeMap.get("defeatCount")); - if(codeMap.get("successCount") != null){ - bo.setSuccessRate(DataUtil.roundDouble((codeMap.get("successCount") * 100)/(double)count, 2)); - } - bos.add(bo); + List bos = null; + if (model.getQuery().equals("city")) { + bos = createAnalyByCity(analys, "city"); + } else if (model.getQuery().equals("time")) { + bos = createAnalyByCity(analys, "time"); + } - } - return bos; - } + model.setStatAnalyBoList(sortStatAnaly(bos)); + model.setChartSeries(toChartString(bos)); - private List getEachCityBos(List list){ - List eachCityBos=new ArrayList(); - Map> map=new HashMap>(); - for(ApiCountCity apiCountCity:list){ - if(map.containsKey(apiCountCity.getCity())){ - List list1=new ArrayList(); - List list2=map.get(apiCountCity.getCity()); - list1.add(list2.get(0)+apiCountCity.getSuccess()); - list1.add(list2.get(1)+apiCountCity.getFail()); - map.put(apiCountCity.getCity(),list1); - } - else { - List list1=new ArrayList(); - list1.add(apiCountCity.getSuccess()); - list1.add(apiCountCity.getFail()); - map.put(apiCountCity.getCity(),list1); - } - } - for(Object o:map.keySet()){ - List listm=map.get(o); - String city=o.toString(); - int success=listm.get(0); - int fail=listm.get(1); - int sum=success+fail; - double successTimeRate=getFour((double)success/(double)sum); - double failTimeRate=getFour((double)fail/(double)sum); - EachCityBo eachCityBo=new EachCityBo(); - eachCityBo.setCity(city); - eachCityBo.setSumTime(sum); - eachCityBo.setSuccessTime(success); - eachCityBo.setFailTime(fail); - eachCityBo.setSuccessRate(successTimeRate); - eachCityBo.setFailRate(failTimeRate); - eachCityBos.add(eachCityBo); - } - return eachCityBos; - } + User user = userService.findById(model.getUserId()); + if (user != null) { + model.setUserName(user.getDisplayName()); + } else { + model.setUserName(model.getUserId().toString()); + } + return model; + } - private double getFour(double m){ - BigDecimal b = new BigDecimal(m); - double f1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); - return f1; - } - - private List createAnalyByCity(List analys, String field){ - Map> ret = new HashMap>(); - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - Map resultMap = null; - if(field.equals("day")){ - resultMap = (Map) ret.get(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate())); - if(resultMap == null){ - resultMap = new HashMap(); - ret.put(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate()), resultMap); - } - Integer count = (Integer) resultMap.get("count"); - if(count == null){ - resultMap.put("count", openUriAnaly.getUrlClickCount()); - }else{ - resultMap.put("count", count + openUriAnaly.getUrlClickCount()); - } - total = total + openUriAnaly.getUrlClickCount(); - }else{ - if(field.equals("city")){ - resultMap = openUriAnaly.getCityMap(); - }else if(field.equals("time")){ - resultMap = openUriAnaly.getTimeMap(); - } - Iterator it = resultMap.keySet().iterator(); - while(it.hasNext()){ - String key = it.next(); - int count = (Integer) resultMap.get(key); - Map dataMap = (Map) ret.get(key); - if(dataMap == null){ - dataMap = new HashMap(); - ret.put(key, dataMap); - dataMap.put("count", count); - }else{ - dataMap.put("count", (Integer) dataMap.get("count")+count); - } - total = total + count; - } - } - } - - - Iterator it = ret.keySet().iterator(); - - List bos = new ArrayList(); - int index = 0; - double totalPercent = 0; - while(it.hasNext()){ - String key = (String) it.next(); - Map detailMap = ret.get(key); - - int count = (Integer) detailMap.get("count"); - double percent = 0; - - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = count; - double val = a1*10000/(double)total; - int scale = 2; - percent = DataUtil.roundDouble(val/100, scale); - totalPercent = totalPercent + percent; - } - index++; - - StatAnalyBo bo = new StatAnalyBo(); - bo.setKey(key); - bo.setPercent(percent); - bo.setCount(count); - bos.add(bo); - } - - - return bos; - } - - private List createAnalyBosByUser(List analys){ - Map ret = new HashMap(); - - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - OpenUriAnaly temp = ret.get(openUriAnaly.getApiUserId()); - if(temp == null){ - ret.put(openUriAnaly.getApiUserId(), openUriAnaly); - }else{ - temp.setUrlClickCount(temp.getUrlClickCount()+openUriAnaly.getUrlClickCount()); - ret.put(openUriAnaly.getApiUserId(), temp); - } - - total = total + openUriAnaly.getUrlClickCount(); - } - List bos = new ArrayList(); - Iterator it = ret.keySet().iterator(); - - List users = this.userService.findAllUsers(); - - int index = 0; - double totalPercent = 0; - while(it.hasNext()){ - OpenUriAnaly openUriAnaly = ret.get(it.next()); - - double percent = 0; - - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = openUriAnaly.getUrlClickCount(); - double val = a1*10000/(double)total; - int scale = 2; - percent = DataUtil.roundDouble(val/100, scale); - //percent = getPercent(percent, scale, val); - totalPercent = totalPercent + percent; - } - index++; - - String name = null; - for(User user : users){ - if(openUriAnaly.getApiUserId()==user.getId()){ - name = user.getDisplayName(); - break; - } - } - - StatAnalyBo bo = new StatAnalyBo(); - if(StringUtils.isNotBlank(name)){ - bo.setKey(name); - }else{ - bo.setKey(openUriAnaly.getApiUserId().toString()); - } - - bo.setCount(openUriAnaly.getUrlClickCount()); - bo.setPercent(percent); - bo.setUserId(openUriAnaly.getApiUserId()); - bos.add(bo); - } - return bos; - } - - private double getPercent(double percent, int scale, double val){ - if(percent==0){ - while(scale<=8){ - if(percent==0){ - scale = scale+1; - percent = DataUtil.roundDouble(val/100, scale); - }else{ - break; - } - } - } - return percent; - } - - private String toChartString(List bos, int way) { - JSONArray ja = new JSONArray(); - for (OpenUriAnalyBo bo : bos) { + public Object importExcelAction(HttpServletRequest request, ApiUserModel model) { + String citys = request.getParameter("city"); + String begDate = request.getParameter("begDate"); + String enDate = request.getParameter("endDate"); + Date startDate = null; + Date endDate = null; + if (StringUtils.isBlank(begDate) && StringUtils.isBlank(enDate)) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } else { + if (StringUtils.isNotBlank(begDate)) { + startDate = DateUtil.parseStringToDate(begDate); + } + if (StringUtils.isNotBlank(enDate)) { + endDate = DateUtil.parseStringToDate(enDate); + } + + } + String Array[] = StringUtils.split(citys, "|"); + List cities = new ArrayList(); + if (Array != null) { + for (int i = 0; i < Array.length; i++) { + cities.add(Array[i]); + } + } + List apiCountCities = null; + List eachCityBos = null; + if (cities.size() != 0) { + apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); + eachCityBos = getEachCityBos(apiCountCities); + } + + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); + HSSFSheet sheet = workbook.createSheet("数据导出"); + HSSFRow row = sheet.createRow(0); + HSSFCell cell0 = row.createCell(0); + HSSFCell cell1 = row.createCell(1); + HSSFCell cell2 = row.createCell(2); + HSSFCell cell3 = row.createCell(3); + HSSFCell cell4 = row.createCell(4); + HSSFCell cell5 = row.createCell(5); + cell0.setCellValue("城市"); + cell1.setCellValue("调用总量"); + cell2.setCellValue("成功调用次数"); + cell3.setCellValue("占比"); + cell4.setCellValue("失败调用次数"); + cell5.setCellValue("占比"); + if (null != eachCityBos) { + for (int i = 0; i < eachCityBos.size(); i++) { + HSSFRow rows = sheet.createRow(i + 1); + HSSFCell cel0 = rows.createCell(0); + HSSFCell cel1 = rows.createCell(1); + HSSFCell cel2 = rows.createCell(2); + HSSFCell cel3 = rows.createCell(3); + HSSFCell cel4 = rows.createCell(4); + HSSFCell cel5 = rows.createCell(5); + cel0.setCellValue(eachCityBos.get(i).getCity()); + cel1.setCellValue(eachCityBos.get(i).getSumTime()); + cel2.setCellValue(eachCityBos.get(i).getSuccessTime()); + cel3.setCellValue(getFour(eachCityBos.get(i).getSuccessRate()) * 100 + "%"); + cel4.setCellValue(eachCityBos.get(i).getFailTime()); + cel5.setCellValue(getFour(eachCityBos.get(i).getFailRate()) * 100 + "%"); + } + } + HttpServletResponse response = ActionContext.getContext().getResponse(); + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/x-download;charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment;filename=daochu.xls"); + try { + OutputStream os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + private List sortApiBo(List bos) { + Collections.sort(bos, new Comparator() { + @Override + public int compare(OpenUriAnalyBo o1, OpenUriAnalyBo o2) { + if (o1.getUrlClickCount() > o2.getUrlClickCount()) { + return -1; + } else if (o1.getUrlClickCount() < o2.getUrlClickCount()) { + return 1; + } + return 0; + } + }); + + return bos; + } + + private List sortStatAnaly(List bos) { + Collections.sort(bos, new Comparator() { + @Override + public int compare(StatAnalyBo o1, StatAnalyBo o2) { + if (o1.getCount() > o2.getCount()) { + return -1; + } else if (o1.getCount() < o2.getCount()) { + return 1; + } + return 0; + } + }); + + return bos; + } + + private Map converMapData(List resources) { + Map map = new HashMap(); + for (OpenResource resource : resources) { + map.put(resource.getUri(), resource.getName()); + } + return map; + } + + + private List createAnalyBosByLink(List analys) { + + + Map ret = new HashMap(); + Map> urlCodeMap = new HashMap>(); + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + Integer temp = ret.get(openUriAnaly.getUrl()); + if (temp == null) { + ret.put(openUriAnaly.getUrl(), openUriAnaly.getUrlClickCount()); + } else { + ret.put(openUriAnaly.getUrl(), temp + openUriAnaly.getUrlClickCount()); + } + Map codeMap = urlCodeMap.get(openUriAnaly.getUrl()); + if (codeMap == null) { + codeMap = new HashMap(); + urlCodeMap.put(openUriAnaly.getUrl(), codeMap); + } + Map analyCodeMap = openUriAnaly.getCodeMap(); + for (String code : analyCodeMap.keySet()) { + Integer count = (Integer) analyCodeMap.get(code); + if ("200".equals(code)) { + Integer successCount = codeMap.get("successCount"); + if (successCount == null) { + codeMap.put("successCount", count); + } else { + codeMap.put("successCount", successCount + count); + } + } else { + Integer defeatCount = codeMap.get("defeatCount"); + if (defeatCount == null) { + codeMap.put("defeatCount", count); + } else { + codeMap.put("defeatCount", defeatCount + count); + } + } + } + total = total + openUriAnaly.getUrlClickCount(); + } + + List bos = new ArrayList(); + int index = 0; + double totalPercent = 0; + for (String url : ret.keySet()) { + Integer count = ret.get(url); + double percent = 0; + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = count; + double val = a1 * 10000 / (double) total; + percent = DataUtil.roundDouble(val / 100, 2); + totalPercent = totalPercent + percent; + } + StatAnalyBo bo = new StatAnalyBo(); + bo.setKey(url); + bo.setCount(count); + bo.setPercent(percent); + Map codeMap = urlCodeMap.get(url); + bo.setSuccessTime(codeMap.get("successCount")); + bo.setDefeatTime(codeMap.get("defeatCount")); + if (codeMap.get("successCount") != null) { + bo.setSuccessRate(DataUtil.roundDouble((codeMap.get("successCount") * 100) / (double) count, 2)); + } + bos.add(bo); + + } + return bos; + } + + private List getEachCityBos(List list) { + List eachCityBos = new ArrayList(); + Map> map = new HashMap>(); + for (ApiCountCity apiCountCity : list) { + if (map.containsKey(apiCountCity.getCity())) { + List list1 = new ArrayList(); + List list2 = map.get(apiCountCity.getCity()); + list1.add(list2.get(0) + apiCountCity.getSuccess()); + list1.add(list2.get(1) + apiCountCity.getFail()); + map.put(apiCountCity.getCity(), list1); + } else { + List list1 = new ArrayList(); + list1.add(apiCountCity.getSuccess()); + list1.add(apiCountCity.getFail()); + map.put(apiCountCity.getCity(), list1); + } + } + for (Object o : map.keySet()) { + List listm = map.get(o); + String city = o.toString(); + int success = listm.get(0); + int fail = listm.get(1); + int sum = success + fail; + double successTimeRate = getFour((double) success / (double) sum); + double failTimeRate = getFour((double) fail / (double) sum); + EachCityBo eachCityBo = new EachCityBo(); + eachCityBo.setCity(city); + eachCityBo.setSumTime(sum); + eachCityBo.setSuccessTime(success); + eachCityBo.setFailTime(fail); + eachCityBo.setSuccessRate(successTimeRate); + eachCityBo.setFailRate(failTimeRate); + eachCityBos.add(eachCityBo); + } + return eachCityBos; + } + + private double getFour(double m) { + BigDecimal b = new BigDecimal(m); + double f1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); + return f1; + } + + private List createAnalyByCity(List analys, String field) { + Map> ret = new HashMap>(); + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + Map resultMap = null; + if (field.equals("day")) { + resultMap = (Map) ret.get(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate())); + if (resultMap == null) { + resultMap = new HashMap(); + ret.put(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate()), resultMap); + } + Integer count = (Integer) resultMap.get("count"); + if (count == null) { + resultMap.put("count", openUriAnaly.getUrlClickCount()); + } else { + resultMap.put("count", count + openUriAnaly.getUrlClickCount()); + } + total = total + openUriAnaly.getUrlClickCount(); + } else { + if (field.equals("city")) { + resultMap = openUriAnaly.getCityMap(); + } else if (field.equals("time")) { + resultMap = openUriAnaly.getTimeMap(); + } + Iterator it = resultMap.keySet().iterator(); + while (it.hasNext()) { + String key = it.next(); + int count = (Integer) resultMap.get(key); + Map dataMap = (Map) ret.get(key); + if (dataMap == null) { + dataMap = new HashMap(); + ret.put(key, dataMap); + dataMap.put("count", count); + } else { + dataMap.put("count", (Integer) dataMap.get("count") + count); + } + total = total + count; + } + } + } + + + Iterator it = ret.keySet().iterator(); + + List bos = new ArrayList(); + int index = 0; + double totalPercent = 0; + while (it.hasNext()) { + String key = (String) it.next(); + Map detailMap = ret.get(key); + + int count = (Integer) detailMap.get("count"); + double percent = 0; + + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = count; + double val = a1 * 10000 / (double) total; + int scale = 2; + percent = DataUtil.roundDouble(val / 100, scale); + totalPercent = totalPercent + percent; + } + index++; + + StatAnalyBo bo = new StatAnalyBo(); + bo.setKey(key); + bo.setPercent(percent); + bo.setCount(count); + bos.add(bo); + } + + + return bos; + } + + private List createAnalyBosByUser(List analys) { + Map ret = new HashMap(); + + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + OpenUriAnaly temp = ret.get(openUriAnaly.getApiUserId()); + if (temp == null) { + ret.put(openUriAnaly.getApiUserId(), openUriAnaly); + } else { + temp.setUrlClickCount(temp.getUrlClickCount() + openUriAnaly.getUrlClickCount()); + ret.put(openUriAnaly.getApiUserId(), temp); + } + + total = total + openUriAnaly.getUrlClickCount(); + } + List bos = new ArrayList(); + Iterator it = ret.keySet().iterator(); + + List users = this.userService.findAllUsers(); + + int index = 0; + double totalPercent = 0; + while (it.hasNext()) { + OpenUriAnaly openUriAnaly = ret.get(it.next()); + + double percent = 0; + + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = openUriAnaly.getUrlClickCount(); + double val = a1 * 10000 / (double) total; + int scale = 2; + percent = DataUtil.roundDouble(val / 100, scale); + //percent = getPercent(percent, scale, val); + totalPercent = totalPercent + percent; + } + index++; + + String name = null; + for (User user : users) { + if (openUriAnaly.getApiUserId() == user.getId()) { + name = user.getDisplayName(); + break; + } + } + + StatAnalyBo bo = new StatAnalyBo(); + if (StringUtils.isNotBlank(name)) { + bo.setKey(name); + } else { + bo.setKey(openUriAnaly.getApiUserId().toString()); + } + + bo.setCount(openUriAnaly.getUrlClickCount()); + bo.setPercent(percent); + bo.setUserId(openUriAnaly.getApiUserId()); + bos.add(bo); + } + return bos; + } + + private double getPercent(double percent, int scale, double val) { + if (percent == 0) { + while (scale <= 8) { + if (percent == 0) { + scale = scale + 1; + percent = DataUtil.roundDouble(val / 100, scale); + } else { + break; + } + } + } + return percent; + } + + private String toChartString(List bos, int way) { + JSONArray ja = new JSONArray(); + for (OpenUriAnalyBo bo : bos) { JSONArray array = new JSONArray(); array.put(way == 1 ? bo.getName() : bo.getUrl()); array.put(bo.getPercent()); ja.put(array); - } - return ja.toString(); - } - - private String toChartString(List bos) { - JSONArray ja = new JSONArray(); - for (StatAnalyBo bo : bos) { - JSONArray array = new JSONArray(); - if(StringUtils.isNotBlank(bo.getKey())){ - if(bo.getKey().equals("level_0")){ - array.put("0s"); - }else if(bo.getKey().equals("level_1")){ - array.put("1s以下"); - }else if(bo.getKey().equals("level_2")){ - array.put("1-2s以下"); - }else if(bo.getKey().equals("level_3")){ - array.put("2-3s以下"); - }else if(bo.getKey().equals("level_4")){ - array.put("3s以上"); - }else if(bo.getKey().equals("level_100")){ - array.put("暂无数据"); - }else{ - array.put(bo.getKey()); - } - }else{ - array.put(bo.getUserId()); - } - - array.put(bo.getPercent()); - ja.put(array); - } - return ja.toString(); - } + } + return ja.toString(); + } - /** - * 页面查询条件 - * - * @return - */ - private String[] getCityFirstLetter() { - String[] cityFirstLetter = { "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", - "T", "W", "X", "Y", "Z" }; - return cityFirstLetter; - } + private String toChartString(List bos) { + JSONArray ja = new JSONArray(); + for (StatAnalyBo bo : bos) { + JSONArray array = new JSONArray(); + if (StringUtils.isNotBlank(bo.getKey())) { + if (bo.getKey().equals("level_0")) { + array.put("0s"); + } else if (bo.getKey().equals("level_1")) { + array.put("1s以下"); + } else if (bo.getKey().equals("level_2")) { + array.put("1-2s以下"); + } else if (bo.getKey().equals("level_3")) { + array.put("2-3s以下"); + } else if (bo.getKey().equals("level_4")) { + array.put("3s以上"); + } else if (bo.getKey().equals("level_100")) { + array.put("暂无数据"); + } else { + array.put(bo.getKey()); + } + } else { + array.put(bo.getUserId()); + } - - private Map> getCountByUri(List apiInvokeStatisticalList){ - Map> resultMap = new HashMap>(); - for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { - Map detailMap = resultMap.get(apiInvokeStatistical.getRequestURI()); - if(detailMap == null){ - detailMap = new HashMap(); - resultMap.put(apiInvokeStatistical.getRequestURI(), detailMap); - } - Integer successEffectiveCount = detailMap.get("successEffectiveCount"); - Integer successInvalidCount = detailMap.get("successInvalidCount"); - Integer defeatCount = detailMap.get("defeatCount"); - if(successEffectiveCount != null){ - successEffectiveCount = successEffectiveCount + apiInvokeStatistical.getSuccessEffectiveTime(); - }else{ - successEffectiveCount = apiInvokeStatistical.getSuccessEffectiveTime(); - } - if(successInvalidCount != null){ - successInvalidCount = successInvalidCount + apiInvokeStatistical.getSuccessInvalidTime(); - }else{ - successInvalidCount = apiInvokeStatistical.getSuccessInvalidTime();; - } - if(defeatCount != null){ - defeatCount = defeatCount + apiInvokeStatistical.getDefeatTime(); - }else{ - defeatCount = apiInvokeStatistical.getDefeatTime(); - } - - detailMap.put("successEffectiveCount", successEffectiveCount); - detailMap.put("successInvalidCount", successInvalidCount); - detailMap.put("defeatCount", defeatCount); - } - - return resultMap; - } - public void setApiUserService(ApiUserService apiUserService) { - this.apiUserService = apiUserService; - } + array.put(bo.getPercent()); + ja.put(array); + } + return ja.toString(); + } - public UserService getUserService() { - return userService; - } + /** + * 页面查询条件 + * + * @return + */ + private String[] getCityFirstLetter() { + String[] cityFirstLetter = {"A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", + "T", "W", "X", "Y", "Z"}; + return cityFirstLetter; + } - public void setUserService(UserService userService) { - this.userService = userService; - } - public void setApiUserAuthorityService(ApiUserAuthorityService apiUserAuthorityService) { - this.apiUserAuthorityService = apiUserAuthorityService; - } + private Map> getCountByUri(List apiInvokeStatisticalList) { + Map> resultMap = new HashMap>(); + for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { + Map detailMap = resultMap.get(apiInvokeStatistical.getRequestURI()); + if (detailMap == null) { + detailMap = new HashMap(); + resultMap.put(apiInvokeStatistical.getRequestURI(), detailMap); + } + Integer successEffectiveCount = detailMap.get("successEffectiveCount"); + Integer successInvalidCount = detailMap.get("successInvalidCount"); + Integer defeatCount = detailMap.get("defeatCount"); + if (successEffectiveCount != null) { + successEffectiveCount = successEffectiveCount + apiInvokeStatistical.getSuccessEffectiveTime(); + } else { + successEffectiveCount = apiInvokeStatistical.getSuccessEffectiveTime(); + } + if (successInvalidCount != null) { + successInvalidCount = successInvalidCount + apiInvokeStatistical.getSuccessInvalidTime(); + } else { + successInvalidCount = apiInvokeStatistical.getSuccessInvalidTime(); + ; + } + if (defeatCount != null) { + defeatCount = defeatCount + apiInvokeStatistical.getDefeatTime(); + } else { + defeatCount = apiInvokeStatistical.getDefeatTime(); + } - public void setOpenResourceService(OpenResourceService openResourceService) { - this.openResourceService = openResourceService; - } + detailMap.put("successEffectiveCount", successEffectiveCount); + detailMap.put("successInvalidCount", successInvalidCount); + detailMap.put("defeatCount", defeatCount); + } - public void setServerAreaService(ServerAreaService serverAreaService) { - this.serverAreaService = serverAreaService; - } + return resultMap; + } - public void setApiVisitCountService(ApiVisitCountService apiVisitCountService) { - this.apiVisitCountService = apiVisitCountService; - } + public void setApiUserService(ApiUserService apiUserService) { + this.apiUserService = apiUserService; + } - public void setOpenResourceCountService( - OpenResourceCountService openResourceCountService) { - this.openResourceCountService = openResourceCountService; - } - - - public void setOpenUriAnalyService(OpenUriAnalyService openUriAnalyService) { - this.openUriAnalyService = openUriAnalyService; - } + public UserService getUserService() { + return userService; + } - public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { - this.apiUserCfgService = apiUserCfgService; - } + public void setUserService(UserService userService) { + this.userService = userService; + } - public ApiInvokeStatisticalService getApiInvokeStatisticalService() { - return apiInvokeStatisticalService; - } + public void setApiUserAuthorityService(ApiUserAuthorityService apiUserAuthorityService) { + this.apiUserAuthorityService = apiUserAuthorityService; + } - public void setApiInvokeStatisticalService( - ApiInvokeStatisticalService apiInvokeStatisticalService) { - this.apiInvokeStatisticalService = apiInvokeStatisticalService; - } + public void setOpenResourceService(OpenResourceService openResourceService) { + this.openResourceService = openResourceService; + } - public void setApiCountCityService(ApiCountCityService apiCountCityService) { - this.apiCountCityService = apiCountCityService; - } + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } - public Map string2map(String str) - { - Map map = new HashMap(); - String [] a = str.split(","); + public void setApiVisitCountService(ApiVisitCountService apiVisitCountService) { + this.apiVisitCountService = apiVisitCountService; + } - for (String i : a) - { - String [] b = i.split(":"); - if (b.length > 1) - { - map.put(b[0],Integer.parseInt(b[1])); - } - } - return map; - } + public void setOpenResourceCountService( + OpenResourceCountService openResourceCountService) { + this.openResourceCountService = openResourceCountService; + } - public Object priceRatingAction(ApiUserModel model) throws IllegalAccessException { - ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); - if (apiUserAuthority != null && apiUserAuthority.getPriceRatingMap() != null){ - model.setPriceRatingMap(apiUserAuthority.getPriceRatingMap()); - }else{ - Map map = new HashMap(); - map.put("one",0.61); - map.put("newOne",0.61); - map.put("two",0.61); - map.put("three",0.61); - map.put("four",0.61); - map.put("five",0.61); - model.setPriceRatingMap(map); - } - if ( apiUserAuthority != null && apiUserAuthority.getCreditLevelStatus() != null) { - model.setCreditLevelStatus(apiUserAuthority.getCreditLevelStatus()); - } - ApiUser apiUser = apiUserService.findApiUserById(model.getUserId()); - if (apiUser != null) { - if (apiUser.getCompany() != null) { - model.setCompany(apiUser.getCompany()); - } - } - model.setUserId(model.getUserId()); - return model; - } + public void setOpenUriAnalyService(OpenUriAnalyService openUriAnalyService) { + this.openUriAnalyService = openUriAnalyService; + } - public Object savePriceRateingAction(ApiUserModel model) throws IllegalAccessException { - ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); - Map map = new HashMap(); - map.put("one",model.getOne()); - map.put("newOne",model.getNewOne()); - map.put("two",model.getTwo()); - map.put("three",model.getThree()); - map.put("four",model.getFour()); - map.put("five",model.getFive()); - apiUserAuthority.setPriceRatingMap(map); - apiUserAuthority.setCreditLevelStatus(model.getCreditLevelStatus()); - apiUserAuthorityService.update(apiUserAuthority); - model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/list"); - return model; - } + public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { + this.apiUserCfgService = apiUserCfgService; + } + + public ApiInvokeStatisticalService getApiInvokeStatisticalService() { + return apiInvokeStatisticalService; + } + + public void setApiInvokeStatisticalService( + ApiInvokeStatisticalService apiInvokeStatisticalService) { + this.apiInvokeStatisticalService = apiInvokeStatisticalService; + } + + public void setApiCountCityService(ApiCountCityService apiCountCityService) { + this.apiCountCityService = apiCountCityService; + } + + public Map string2map(String str) { + Map map = new HashMap(); + String[] a = str.split(","); + + for (String i : a) { + String[] b = i.split(":"); + if (b.length > 1) { + map.put(b[0], Integer.parseInt(b[1])); + } + } + return map; + } + + public Object priceRatingAction(ApiUserModel model) throws IllegalAccessException { + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + if (apiUserAuthority != null && apiUserAuthority.getPriceRatingMap() != null) { + model.setPriceRatingMap(apiUserAuthority.getPriceRatingMap()); + } else { + Map map = new HashMap(); + map.put("one", 0.61); + map.put("newOne", 0.61); + map.put("two", 0.61); + map.put("three", 0.61); + map.put("four", 0.61); + map.put("five", 0.61); + model.setPriceRatingMap(map); + } + if (apiUserAuthority != null && apiUserAuthority.getCreditLevelStatus() != null) { + model.setCreditLevelStatus(apiUserAuthority.getCreditLevelStatus()); + } + ApiUser apiUser = apiUserService.findApiUserById(model.getUserId()); + if (apiUser != null) { + if (apiUser.getCompany() != null) { + model.setCompany(apiUser.getCompany()); + } + } + model.setUserId(model.getUserId()); + + return model; + } + + public Object savePriceRateingAction(ApiUserModel model) throws IllegalAccessException { + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map map = new HashMap(); + map.put("one", model.getOne()); + map.put("newOne", model.getNewOne()); + map.put("two", model.getTwo()); + map.put("three", model.getThree()); + map.put("four", model.getFour()); + map.put("five", model.getFive()); + apiUserAuthority.setPriceRatingMap(map); + apiUserAuthority.setCreditLevelStatus(model.getCreditLevelStatus()); + apiUserAuthorityService.update(apiUserAuthority); + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/list"); + return model; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl index 387007283..9e0ea31e6 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl @@ -10,7 +10,27 @@ <#include "/common_js.ftl" /> - + +<#-- 灏嗚〃澶村浐瀹�--> + @@ -31,12 +51,13 @@

- Ap + + API鏁伴噺锛� ${authorityBoList?size}涓� + + + <#if (apiUserBoList??&&apiUserBoList?size>0)> + <#list apiUserBoList as bo> + style="background-color:#C3C3C3"> + + + + + + + + + + + + + + + + +
uri - 鎻忚堪 + API鍚嶇О 鏄惁鏈夋潈闄�鍏ㄩ�� @@ -63,7 +84,7 @@ ${bo.uri!} - ${bo.description!} + ${bo.name!} checked id="auth_${bo_index + 1}" > diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index 37afef638..e16556d06 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -1,150 +1,179 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - api鐢ㄦ埛鍒楄〃 - - <#include "/common_js.ftl" /> - - - <#include "/layout/header.ftl" /> -
- ${msg!''} - -
-
-
- 鍏辨湁鐢ㄦ埛${apiUserBoList?size}涓� -
- - - - - + + + + + api鐢ㄦ埛鍒楄〃 + + <#include "/common_js.ftl" /> + + <#-- 灏嗚〃澶村浐瀹�--> + + + + <#include "/layout/header.ftl" /> +
+ ${msg!''} + +
+
+
+ 鍏辨湁鐢ㄦ埛${apiUserBoList?size}涓� +
+
- ID - - 鏄电О -
+ + + + - - + + - + - + - - - - <#if (apiUserBoList??&&apiUserBoList?size>0)> - <#list apiUserBoList as bo> - style="background-color:#C3C3C3"> - - - - - - - - - - - - - - - - -
+ ID + + 鏄电О + 璐︽埛鐢ㄩ�� - username - - password - + username + + password + 閿�鍞礋璐d汉 鍏徃 - appKey - + appKey + 璐︽埛绫诲瀷 璐︽埛鐢ㄩ�� - 鏄惁鐩戞帶 - + 鏄惁鐩戞帶 + 鍒版湡鏃堕棿 - 鎿嶄綔 -
- ${bo.userId!} - - ${bo.displayName!} - - <#if bo.purpose?? && bo.purpose == 1> - API - <#elseif bo.purpose?? && bo.purpose == 2> - PDS - <#elseif bo.purpose?? && bo.purpose == 4> - 鎴跨敓娲� - - - ${bo.userName!} - - <#if bo.password?? && bo.password == t_util.md5Hex('123456')> - 鍒濆瀵嗙爜 - <#else> - ****** - - - ${bo.manager!} - - ${bo.company!} - - ${bo.appKey!} - - <#if bo.isTest==0> - 姝e紡璐︽埛 - <#else> - 娴嬭瘯璐︽埛 - - - <#if bo.purpose?? && bo.purpose == 1> - API - <#elseif bo.purpose?? && bo.purpose == 2> - PDS - <#elseif bo.purpose?? && bo.purpose == 4> - 鎴跨敓娲� - - - <#if bo.isMonitor==1> - 鏄� - <#else> - 鍚� - - - <#if bo.deadTime??> - ${bo.deadTime?string("yyyy骞碝M鏈坉d鏃�")} - - - 鏉冮檺鎺у埗 - 鍩庡競绠$悊 - 浠锋牸璇勭骇 - <#if bo.status==0> - 绂佺敤 - <#else> - 鍐嶅惎鐢� - -
-
-
- - +
+ 鎿嶄綔 +
+ ${bo.userId!} + + ${bo.displayName!} + + <#if bo.purpose?? && bo.purpose == 1> + API + <#elseif bo.purpose?? && bo.purpose == 2> + PDS + <#elseif bo.purpose?? && bo.purpose == 4> + 鎴跨敓娲� + + + ${bo.userName!} + + <#if bo.password?? && bo.password == t_util.md5Hex('123456')> + 鍒濆瀵嗙爜 + <#else> + ****** + + + ${bo.manager!} + + ${bo.company!} + + ${bo.appKey!} + + <#if bo.isTest==0> + 姝e紡璐︽埛 + <#else> + 娴嬭瘯璐︽埛 + + + <#if bo.purpose?? && bo.purpose == 1> + API + <#elseif bo.purpose?? && bo.purpose == 2> + PDS + <#elseif bo.purpose?? && bo.purpose == 4> + 鎴跨敓娲� + + + <#if bo.isMonitor==1> + 鏄� + <#else> + 鍚� + + + <#if bo.deadTime??> + ${bo.deadTime?string("yyyy骞碝M鏈坉d鏃�")} + + + API鏉冮檺鎺у埗 + 鏂板API + 鍩庡競绠$悊 + 浠锋牸璇勭骇 + <#if bo.status==0> + 绂佺敤 + <#else> + 鍐嶅惎鐢� + +
+
+ + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl index 9944cfa86..629c14ec4 100644 --- a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl @@ -8,6 +8,25 @@ .up {color: green;} #spinner{width:500px;height:100px;margin:30px 0 0 100px;text-align:center;padding-top:50px;border:2px solid #CCC;} #checkMsg{width:500px;margin:30px 0 0 100px;padding:10px 0 10px 50px;text-align:left;border:2px solid #CCC;} + + <#-- 灏嗚〃澶村浐瀹�--> + table { + width: 100%; + border-collapse: collapse; + table-layout: fixed; + } + + th, td { + border: 1px solid #dddddd; + text-align: left; + padding: 8px; + } + + th { + position: sticky; + top: 0; + background-color: #f2f2f2; + } From 9adddbb21d1177e6b67af6a6a50fb8f8cfc1817c Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Thu, 25 Jan 2024 18:42:53 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E4=BB=A3=E7=A0=81=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=87=BA?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 1 + .../src/main/webapp/apiUser/edit.ftl | 8 +- .../mongo/dao/AdministrativeDivisionDao.java | 8 + .../dao/AdministrativeDivisionDaoImpl.java | 23 +++ .../mongo/model/AdministrativeDivision.java | 148 ++++++++++++++++++ .../ComprehensiveQueryController.java | 37 +++-- .../src/main/java/com/fangjia/open/test.java | 10 ++ .../AdministrativeDivisionService.java | 17 ++ .../AdministrativeDivisionServiceImpl.java | 20 +++ 9 files changed, 255 insertions(+), 17 deletions(-) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/test.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index d9db99a40..5038125ae 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -270,6 +270,7 @@ public class ApiUserController { Long userId = model.getUserId(); Map dataApiUser = new HashMap(); dataApiUser.put("email", model.getEmail()); + dataApiUser.put("password", model.getPassword()); dataApiUser.put("siteName", model.getSiteName()); dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index 31fb2f51a..da2db31c2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -43,9 +43,13 @@ ${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!}) +<#-- --> +<#-- 瀵嗙爜--> +<#-- --> +<#-- --> - 瀵嗙爜 - + 瀵嗙爜 + 璐︽埛绫诲瀷 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java new file mode 100644 index 000000000..7b38443f2 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.mongo.model.AdministrativeDivision; +import com.fangjia.dal.MongoDao; + +public interface AdministrativeDivisionDao extends MongoDao { + AdministrativeDivision findcityByCode(String code); +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java new file mode 100644 index 000000000..aafebbc75 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -0,0 +1,23 @@ +package com.fangjia.dal.mongo.dao; + + +import com.fangjia.dal.mongo.model.AdministrativeDivision; +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.QueryParam; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class AdministrativeDivisionDaoImpl extends MongoDaoImpl implements AdministrativeDivisionDao { + @Override + public AdministrativeDivision findcityByCode(String code) { + if (StringUtils.isBlank(code)) { + return null; + } + List params = new ArrayList(); + params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); + params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "城市")); + return (AdministrativeDivision) findFirstByParams(params); + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java new file mode 100644 index 000000000..abe9b0816 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java @@ -0,0 +1,148 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.DatastoreCategory; +import com.fangjia.dal.MongoEntity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "fangjia.administrative_division") + +public class AdministrativeDivision implements MongoEntity { + + private static final long serialVersionUID = -8379446820760559477L; + + private String id; + private String province; + private String city; + private String district; + private String mcaProvinceCode; + private String mcaDistrictCode; + private String mcaCityCode; + private String level; + private String cityShort; + private String distShort; + private String provShort; + private String code; + private String administer; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "_id") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + @Column(name = "mca_province_code") + public String getMcaProvinceCode() { + return mcaProvinceCode; + } + + public void setMcaProvinceCode(String mcaProvinceCode) { + this.mcaProvinceCode = mcaProvinceCode; + } + + @Column(name = "mca_district_code") + public String getMcaDistrictCode() { + return mcaDistrictCode; + } + + public void setMcaDistrictCode(String mcaDistrictCode) { + this.mcaDistrictCode = mcaDistrictCode; + } + + @Column(name = "mca_city_code") + public String getMcaCityCode() { + return mcaCityCode; + } + + public void setMcaCityCode(String mcaCityCode) { + this.mcaCityCode = mcaCityCode; + } + + @Column(name = "level") + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + @Column(name = "city_short") + public String getCityShort() { + return cityShort; + } + + public void setCityShort(String cityShort) { + this.cityShort = cityShort; + } + + @Column(name = "dist_short") + public String getDistShort() { + return distShort; + } + + public void setDistShort(String distShort) { + this.distShort = distShort; + } + + @Column(name = "prov_short") + public String getProvShort() { + return provShort; + } + + public void setProvShort(String provShort) { + this.provShort = provShort; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getAdminister() { + return administer; + } + + public void setAdminister(String administer) { + this.administer = administer; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 3fbd49d50..5c40cf9d3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -1,24 +1,20 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; +import com.fangjia.dal.mongo.model.AdministrativeDivision; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.dal.mongo.model.DistrictFacilitys; import com.fangjia.dal.mongo.model.Evaluation; -import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.mongo.open.model.ApiUserAuthority; import com.fangjia.dal.mongo.open.model.EvaluateRatio; import com.fangjia.dal.seaweed.model.District; -import com.fangjia.open.HttpCode; -import com.fangjia.open.OpenHttpCodeEnum; import com.fangjia.open.dto.HouseValueInformationDto; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; import com.fangjia.open.interceptors.AuthenticationBean; -import com.fangjia.open.interceptors.Authority; -import com.fangjia.open.interceptors.Role; import com.fangjia.open.model.*; import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.open.util.CommonUtils; @@ -35,7 +31,6 @@ import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; -import com.fangjia.service.tool.OpenLogService; import com.fangjia.service.web.AddressService; import net.sf.json.JSONObject; import org.apache.commons.lang.ArrayUtils; @@ -54,7 +49,7 @@ import static com.poseidon.util.TypeConverter.convertToString; * @author 13607 * @since 2023/12/12 10:29 */ -@Authority(role = Role.USER) +//@Authority(role = Role.USER) public class ComprehensiveQueryController { private DistrictService districtService; @@ -84,6 +79,7 @@ public class ComprehensiveQueryController { static final int BAI_DU_GEO = 1;// 百度系坐标 static final int GAO_DE_GEO = 2;// 高德系坐标 + private AdministrativeDivisionService administrativeDivisionService; private EvaluateRatioService evaluateRatioService; @@ -218,10 +214,21 @@ public class ComprehensiveQueryController { return mav; } + String cityStr = model.getCity(); + if (cityStr.matches("\\d+")) { + AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); + String city = administrativeDivision.getCityShort(); + if (administrativeDivision == null || StringUtils.isBlank(city)) { + mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); + return mav; + } + model.setCity(city); + } + HttpRequest httpRequest = new HttpRequest(); JSONObject json = null; Map communityAvgPriceParams = new HashMap(); -// communityAvgPriceParams.put("city", model.getCity()); + communityAvgPriceParams.put("city", model.getCity()); communityAvgPriceParams.put("address", model.getAddress()); communityAvgPriceParams.put("category", model.getCategory()); communityAvgPriceParams.put("useMap", String.valueOf(model.isUseMap())); @@ -232,7 +239,7 @@ public class ComprehensiveQueryController { } catch (HttpRequestException e) { } - if(matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { + if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); return mav; } @@ -287,7 +294,7 @@ public class ComprehensiveQueryController { // RestfulModelAndView houseCaseMav = new RestfulModelAndView(); List querys = null; try { - querys = convertSampileQueryToBean(district,sampleQuery); + querys = convertSampileQueryToBean(district, sampleQuery); } catch (Exception e) { mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); return mav; @@ -299,7 +306,7 @@ public class ComprehensiveQueryController { long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); - System.out.println("用时:"+(end-start)); + System.out.println("用时:" + (end - start)); Collateral collateral = collaterals.get(0); List samples = collateral.getSample(); UniversalDto houseCaseDto = UniversalDto.newDto(); @@ -426,7 +433,7 @@ public class ComprehensiveQueryController { return propertyModel; } - private List convertSampileQueryToBean(District district,SampleQuery... queries) throws Exception { + private List convertSampileQueryToBean(District district, SampleQuery... queries) throws Exception { List queryBeans = new ArrayList(queries.length); for (SampleQuery q : queries) { @@ -1230,8 +1237,6 @@ public class ComprehensiveQueryController { } - - public void setEvaluationService(EvaluationService evaluationService) { this.evaluationService = evaluationService; } @@ -1254,7 +1259,6 @@ public class ComprehensiveQueryController { } - public BatchEvaluateService getBatchEvaluateService() { return batchEvaluateService; } @@ -1313,5 +1317,8 @@ public class ComprehensiveQueryController { this.districtFacilitysService = districtFacilitysService; } + public void setAdministrativeDivisionService(AdministrativeDivisionService administrativeDivisionService) { + this.administrativeDivisionService = administrativeDivisionService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/test.java b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java new file mode 100644 index 000000000..3adf910da --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java @@ -0,0 +1,10 @@ +package com.fangjia.open; + +public class test { + public static void main(String[] args) { + String a = "123545"; + String b ="i980"; + System.out.println(a.matches("\\d+")); + System.out.println(b.matches("\\d+")); + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java new file mode 100644 index 000000000..76b415172 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionService.java @@ -0,0 +1,17 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.model.AdministrativeDivision; + + +/** + * Created by ideoj on 2016/9/5. + */ +public interface AdministrativeDivisionService { + /** + * 根据code获取城市 + * @param code + * @return + */ + AdministrativeDivision findcityByCode(String code); + +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java new file mode 100644 index 000000000..3bc896f0f --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AdministrativeDivisionServiceImpl.java @@ -0,0 +1,20 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.dao.AdministrativeDivisionDao; +import com.fangjia.dal.mongo.model.AdministrativeDivision; + + +public class AdministrativeDivisionServiceImpl implements AdministrativeDivisionService{ + private AdministrativeDivisionDao administrativeDivisionDao; + + + + @Override + public AdministrativeDivision findcityByCode(String code) { + return administrativeDivisionDao.findcityByCode(code); + } + + public void setAdministrativeDivisionDao(AdministrativeDivisionDao administrativeDivisionDao) { + this.administrativeDivisionDao = administrativeDivisionDao; + } +} From 889d8e5bc6787772d9cc8affce7541c1dc62ff53 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 26 Jan 2024 11:07:11 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=8F=AF=E8=BE=93=E5=85=A5=E5=9F=8E=E5=B8=82=E6=88=96=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java | 2 +- .../open/controllers/ComprehensiveQueryController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java index aafebbc75..a737f3157 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -13,7 +13,7 @@ public class AdministrativeDivisionDaoImpl extends MongoDaoImpl params = new ArrayList(); params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 5c40cf9d3..1106483b6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -215,10 +215,10 @@ public class ComprehensiveQueryController { } String cityStr = model.getCity(); - if (cityStr.matches("\\d+")) { + if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); String city = administrativeDivision.getCityShort(); - if (administrativeDivision == null || StringUtils.isBlank(city)) { + if (StringUtils.isBlank(city)) { mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); return mav; } From f8aadf6b5c810ea0cad99f135815fabda0a14b21 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 26 Jan 2024 14:10:23 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E6=94=B9=E5=9B=9E=E5=B0=B1=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 4 +++- .../src/main/webapp/apiUser/edit.ftl | 18 +++++++++--------- .../ComprehensiveQueryController.java | 4 +++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 5038125ae..8d7e5e7fd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -269,8 +269,9 @@ public class ApiUserController { public Object updateAction(ApiUserModel model) { Long userId = model.getUserId(); Map dataApiUser = new HashMap(); + Map user = new HashMap(); dataApiUser.put("email", model.getEmail()); - dataApiUser.put("password", model.getPassword()); + user.put("password", DigestUtils.md5Hex(model.getPassword())); dataApiUser.put("siteName", model.getSiteName()); dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); @@ -280,6 +281,7 @@ public class ApiUserController { dataApiUser.put("manager", model.getManager()); dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); + this.userService.updateById(user,userId); //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index da2db31c2..88b47da75 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -155,15 +155,15 @@ return re.test(strIP) } - $("#resetPwd").click(function () { - if (confirm('纭閲嶇疆瀵嗙爜涓恒��123456銆戯紵')) { - $.get('resetPwd', - "userId=" + $("#userId").val(), - function (data) { - alert(status); - }) - } - }) + // $("#resetPwd").click(function () { + // if (confirm('纭閲嶇疆瀵嗙爜涓恒��123456銆戯紵')) { + // $.get('resetPwd', + // "userId=" + $("#userId").val(), + // function (data) { + // alert(status); + // }) + // } + // }) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 1106483b6..1ad4b2c38 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -15,6 +15,8 @@ import com.fangjia.open.dto.HouseValueInformationDto; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; import com.fangjia.open.interceptors.AuthenticationBean; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; import com.fangjia.open.model.*; import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.open.util.CommonUtils; @@ -49,7 +51,7 @@ import static com.poseidon.util.TypeConverter.convertToString; * @author 13607 * @since 2023/12/12 10:29 */ -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class ComprehensiveQueryController { private DistrictService districtService; From 74477156127e78292a262697520c5a20f4ac907e Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 26 Jan 2024 17:11:30 +0800 Subject: [PATCH 20/26] =?UTF-8?q?bkoff=20=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/bkoff/controllers/ApiUserController.java | 4 ++++ .../src/main/java/com/fangjia/service/sql/ApiUserService.java | 1 + 2 files changed, 5 insertions(+) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 8d7e5e7fd..1e58749d6 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -281,7 +281,11 @@ public class ApiUserController { dataApiUser.put("manager", model.getManager()); dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); + // 更改用户密码 this.userService.updateById(user,userId); + // 刷新缓存 + this.apiUserService.clearApiUserAuthorityCache(userId); + //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ApiUserService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ApiUserService.java index 1704fc239..bea9327bf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ApiUserService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ApiUserService.java @@ -61,5 +61,6 @@ public interface ApiUserService { * @return */ User findUserById(Long id); + void clearApiUserAuthorityCache(long userId); } From 6c769c15ff1fd7f34c301d00a5a131c25d7d6cc5 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Mon, 29 Jan 2024 15:34:21 +0800 Subject: [PATCH 21/26] =?UTF-8?q?suggestion=20=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=B7=B2=E7=BB=8F=E5=A4=84=E7=90=86=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E5=9F=8E=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj/xiamen/SuggestionDataSynch.groovy | 152 +++++++++++++++--- 1 file changed, 130 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 4362615db..86eac3172 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -4,6 +4,7 @@ import com.fangjia.core.RegionData import com.fangjia.script.BaseBatch import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.lixue.DB.City import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils @@ -20,13 +21,15 @@ import java.util.concurrent.atomic.AtomicLong class SuggestionDataSynch extends BaseBatch{ static def targetUrl = "http://192.168.0.12:9200/seaweed/" - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection SEAWEED_CONN = MongoUtils.getCollectionByName2("fangjia", "seaweed", MONGO100_URL) DBCollection administrative_division_100_CONN = MongoUtils.getCollectionByName2("fangjia", "administrative_division", MONGO100_URL) DBCollection SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + DBCollection MAPPOI_CONN = MongoUtils.getCollectionByName2("fangjia", "map_poi", MONGO100_URL) + public static def provinceMap = CommonDatautils.findAllCityProvince() def lastMonthDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); @@ -42,14 +45,31 @@ class SuggestionDataSynch extends BaseBatch{ static main(args) { runBatch(new SuggestionDataSynch(), args); + } @Override public void process(Object args) { run() // updateCode() +// getExitsCity() + } + def getExitsCity(){ + SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + def cities = SUGGESTION_CONN.distinct("city") + def simpleCities = [] + for (def c :cities) { + def city = RegionData.formatCity(c) + simpleCities.add(city) + } +// print(simpleCities) + return simpleCities + } + + + def run() { @@ -58,22 +78,74 @@ class SuggestionDataSynch extends BaseBatch{ def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() + def existCities = getExitsCity() for (def c : citys) { + + def allRets = [] + +// if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ + if(existCities.contains(c)){ + continue; + } index++ // if(!["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)){ - updating(c, "district") - updating(c, "office") - updating(c, "shop") - println index + " " + c + " 完成" -// } - if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) { - poiData(c) - } + def ret1 = updating(c, "district") + def ret2 = updating(c, "office") + def ret3 = updating(c, "shop") +// } +// if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) { + def ret4 = poiData(c) +// } + + allRets.addAll(ret1) + allRets.addAll(ret2) + allRets.addAll(ret3) + allRets.addAll(ret4) + + saveToMG(c, allRets) + println index + " " + c + " 完成 "+ allRets.size() } } + + + def saveToMG(city, rows){ + + def data = fullCityMap.get(city) + def q = new BasicDBObject("city", data.city) + def count = 0 + try{ + count = SUGGESTION_CONN.count(q) + }catch(e){ + SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + count = SUGGESTION_CONN.count(q) + } +// if(count>0){ +// SUGGESTION_CONN.remove(q) +// } + + def rets = [] + for(def i=0;i + obj.put(k,v) + } + rets << obj + if(i%50000==0){ + SUGGESTION_CONN.insert(rets) + rets.clear() + } + } + if(rets.size()>0){ + SUGGESTION_CONN.insert(rets) + rets.clear() + } + } + + def updating(city, cat){ def dists = CommonDatautils.findAllDistrictsFromMg(city, cat, ["city","region","name","address","mapping_alias","addr_alias","alias","cat","estate_type2","lng","lat","township"]) def rets = new CopyOnWriteArrayList() @@ -93,7 +165,8 @@ class SuggestionDataSynch extends BaseBatch{ def map = createData(dist) //往100 上同步 - updateData(map) +// updateData(map) + rets << map println city +" "+cat +" "+totalCount.get() +"/"+dists.size()+" "+dist.name+" "+map.id } } catch (Exception e) { @@ -135,7 +208,7 @@ class SuggestionDataSynch extends BaseBatch{ map.alias = dist.alias } if(dist.addr_alias && dist.addr_alias.size()>0){ - map.addr_alias = dist.addr_alias + map.addr_alias = dist.addr_alias } map.type = dist.cat if(dist.lng){ @@ -178,17 +251,19 @@ class SuggestionDataSynch extends BaseBatch{ def data = fullCityMap.get(city) if(data){ def results = CommonDatautils.findAmapDetailBySql(data.city) - createPoi(results, data, townMap) - println city +" 完成!" + def rets = createPoi(data.city, results, data, townMap) + return rets; } + return [] } - def createPoi(results, data, townMap){ + def createPoi(fullCity, results, data, townMap){ def rets = new CopyOnWriteArrayList() def totalCount = new AtomicLong() + def townshipMap = findMapPoiTownshipMap(fullCity) final CountDownLatch latch = new CountDownLatch(results.size()) for(def i=0;i Date: Mon, 29 Jan 2024 15:39:40 +0800 Subject: [PATCH 22/26] update --- .../DealAndThirdPriceDataProcess.groovy | 5 +- .../ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../fangjia/script/ccbevaluation/Test.groovy | 14 +- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 2 +- .../script/ccbevaluation/TradeStatLog.groovy | 10 +- .../pgsql/ExportPgsqlBaseEvaluation.groovy | 2 +- .../com/fangjia/script/gj/OpenApiUtils.groovy | 41 ++++- .../fangjia/script/gj/YouDaDataParser.groovy | 6 +- .../gj/village/communityLocation.groovy | 156 +++++++++++++----- .../script/gj/village/govLocation.groovy | 101 ++++++++---- .../script/gj/village/saveCommunity.groovy | 47 ++++++ .../gj/xiamen/SuggestionDataSynch.groovy | 27 ++- .../com/fangjia/script/util/ExcelUtils.groovy | 2 +- 13 files changed, 310 insertions(+), 105 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index d408f306a..8bc6aff7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -29,7 +29,7 @@ class DealPriceDataProcess { // task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据 // task.addLianJiaPrice(); task.deleteThirdPartyData()//删除第三方 - task.delDealByPe()//删除成交 +// task.delDealByPe()//删除成交 // task.delDealData() // task.exportThirdParty() @@ -37,8 +37,7 @@ class DealPriceDataProcess { } def delDealByPe(){ - def yearMonth = 202312 - def thirdMonth = 202112 + def yearMonth = 202401 def rets = findAllDealByPe(yearMonth, 18) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index bdbbf0757..3c2ebd153 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2023-12-27", "2024-01-10") + def prices = CcbCommonUtils.findPersonPrice(city, "2024-01-10", "2024-01-28") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index fee89528d..3979f56c4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -1288,7 +1288,7 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ -def fileName = "D:\\数据\\建行\\房产估值\\指导价\\20231222--修正人工指导价.xlsx" +def fileName = "D:\\数据\\建行\\房产估值\\指导价\\20240127.xlsx" ExcelUtils.multiThreadingModify(fileName, {d-> if(d['A']){ @@ -1303,13 +1303,13 @@ ExcelUtils.multiThreadingModify(fileName, {d-> if(!d['I']){ def dist = CommonDatautils.findDistrictById(d['C']) if(dist){ - d['I'] = dist.region + d['F'] = dist.region // d['H'] = dist.name - d['J'] = dist.status - if(d['A']=="天门" || d['A']=="迪庆"){ - def val = d['E'].toString().toDouble().toInteger() + RandomUtil.random(-200,200) - d['K'] = val.toInteger() - } + d['G'] = dist.status +// if(d['A']=="天门" || d['A']=="迪庆"){ +// def val = d['E'].toString().toDouble().toInteger() + RandomUtil.random(-200,200) +// d['K'] = val.toInteger() +// } } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index 492fb152d..8483a84a0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -54,7 +54,7 @@ class ThirdPartyPriceBatch extends BaseBatch { // ps.addBatch(id) // } // } - +// def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] def index = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy index 083c40764..7ab2fc7e4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy @@ -93,13 +93,13 @@ class TradeStatLog { def run(){ def citys = CcbCommonUtils.citys_all; def rets = [] - rets << ["城市","23年9月总量","23年10月总量","23年11月总量","占比","贝壳","链家", "我爱我家","幸福里APP","中原"] + rets << ["城市","23年10月总量","23年11月总量","23年12月总量","占比","贝壳","链家", "我爱我家","幸福里APP","中原"] def sources = ["贝壳找房","链家在线","我爱我家","房天下","中原地产"] //def startDate = "2021-05-01" - def startDate = "2023-09-01" - def date = "2023-10-01" - def endDate = "2023-11-01" - def newDate = "2023-12-01" + def startDate = "2023-10-01" + def date = "2023-11-01" + def endDate = "2023-12-01" + def newDate = "2024-01-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy index a7381d0bd..87dc977a5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -17,7 +17,7 @@ class ExportPgsqlBaseEvaluation { def database = "base" def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; - def linux_prefix = "/home/goojia/ccb_data/evaluation/" + def linux_prefix = "/home/goojia/ccb_data/evaluation/" def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\" static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index f6f47f7c6..cbd2845ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -374,15 +374,18 @@ class OpenApiUtils { } - static def searchBaiDuMap(String address, String region, int cityCode) { + static def searchBaiDuMap(String region, String township, String keyword,int cityCode) { def rets = [] + keyword = keyword.replace("居民委员会","").replace("居委会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村") + def address = keyword try { Thread.sleep(500) long t = System.currentTimeMillis() // String url = "http://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1" + // "&qt=con&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&sug=0&l=13" + // "&sug_forward=&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}" - String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; +// String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; + String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&auth=7dDde8w2f6QfKBaV88xOONTKIxBMTxbHuxHNLELRBNLt1qo6DF%3D%3DC1GgvPUDZYOYIZuVt1cv3uVtGccZcuVtPWv3GuztQZ3wWvUvhgMZSguxzBEHLNRTVtcEWe1GD8zv7u%40ZPuVteuztghxehwzJP4G46zzWvnrRR1aDcvY1SGpuxEtEjjg2e&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${t}"; def content = new HttpRequest().get(url, null, "utf-8") JSONObject json = JSONObject.fromObject(content) @@ -390,22 +393,46 @@ class OpenApiUtils { for (def loc : json.content) { String name = formatName(address) if(loc.uid) { - JSONObject uidInfo = BaiDuApiUtils.getDetailByUid(loc.uid) + JSONObject uidInfo = null;//BaiDuApiUtils.getDetailByUid(loc.uid) if(uidInfo != null) { rets = createData(rets, uidInfo, loc, region, name, address) }else{ - def baiduRegion = loc.area_name.replace(loc.city_name,"") def baiduCity = loc.city_name + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } baiduCity = RegionData.formatCity(baiduCity) - def score1 = CosineSimilarAlgorithm.getSimilarityRatio(loc.name, address); - def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, address); + if(!baiduCity){ + baiduCity = loc.history_address + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } + baiduCity = RegionData.formatCity(baiduCity) + } + if(!baiduCity){ + baiduCity = loc.area_name + if(baiduCity.contains("市")){ + baiduCity = baiduCity.substring(0, baiduCity.indexOf("市")) + } + baiduCity = RegionData.formatCity(baiduCity) + } + + def baiduRegion = loc.area_name.replace(baiduCity,"") + + keyword = keyword.replace("社区","") + def bdName = loc.name.replace("居民委员会","").replace("居委会","").replace("居委","").replace("村民委员会","").replace("村村委会","村").replace("村委会","村").replace("社区","") + + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(bdName, keyword); + def score2 = CosineSimilarAlgorithm.getSimilarityRatio(loc.addr, keyword); if(score1 || score2){ def bean = [:] bean.name = loc.name bean.address = loc.addr.replace("[]","") bean.city = baiduCity bean.region = baiduRegion - bean.township = loc.admin_info.town_name + if(loc.admin_info){ + bean.township = loc.admin_info.town_name + } def locArrs = BaiduCoordinateConverter.bdMercator2Latlng(loc.diPointX/100.0, loc.diPointY/100.0) if(locArrs){ def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0], locArrs[1]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index c4574b523..621b548e7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -48,13 +48,13 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2023-11-01" + static def statDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1),"yyyy-MM-dd") static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//友达一手房存入mongo -// task.esfParser("D:\\数据\\友达\\2023年12月\\查询1.DBF");//友达二手房存入mongo + task.esfParser("D:\\数据\\友达\\2024年1月\\查询1.DBF");//友达二手房存入mongo // task.newhouseToSaveEs();//新房保存到es - task.esfhouseToSaveEs();//二手房保存到es +// task.esfhouseToSaveEs();//二手房保存到es // task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间 } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy index d8fdcf40c..766dabccf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/communityLocation.groovy @@ -3,17 +3,23 @@ package com.fangjia.script.gj.village import com.fangjia.core.RegionData import com.fangjia.core.util.DataUtil import com.fangjia.script.gj.OpenApiUtils +import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils + +import java.sql.ResultSet + +def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁市": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东市": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911","胡杨河市":"3370","新星市":"3384","昆玉市":"659009","三沙市":"3336","白沙黎族自治县":"2359","乐东黎族自治县":"2032","陵水黎族自治县":"1643","琼中黎族苗族自治县":"2031","毕节市":"206","济源市":"1277","昌江黎族自治县":"1642","吐鲁番市":"89","林芝市":"98"] +def gaodeCityCodeMap = ["北京":"110000","天津":"120000","石家庄":"130100","辛集":"130181","晋州":"130183","新乐":"130184","唐山":"130200","滦州":"130284","遵化":"130281","迁安":"130283","秦皇岛":"130300","邯郸":"130400","武安":"130481","邢台":"130500","南宫":"130581","沙河":"130582","保定":"130600","涿州":"130681","定州":"130682","安国":"130683","高碑店":"130684","张家口":"130700","承德":"130800","平泉":"130881","沧州":"130900","泊头":"130981","任丘":"130982","黄骅":"130983","河间":"130984","廊坊":"131000","霸州":"131081","三河":"131082","衡水":"131100","深州":"131182","太原":"140100","古交":"140181","大同":"140200","阳泉":"140300","长治":"140400","晋城":"140500","高平":"140581","朔州":"140600","怀仁":"140681","晋中":"140700","介休":"140781","运城":"140800","永济":"140881","河津":"140882","忻州":"140900","原平":"140981","临汾":"141000","侯马":"141081","霍州":"141082","吕梁":"141100","孝义":"141181","汾阳":"141182","呼和浩特":"150100","包头":"150200","乌海":"150300","赤峰":"150400","通辽":"150500","霍林郭勒":"150581","鄂尔多斯":"150600","呼伦贝尔":"150700","满洲里":"150781","牙克石":"150782","扎兰屯":"150783","额尔古纳":"150784","根河":"150785","巴彦淖尔":"150800","乌兰察布":"150900","丰镇":"150981","乌兰浩特":"152201","阿尔山":"152202","二连浩特":"152501","锡林浩特":"152502","沈阳":"210100","新民":"210181","大连":"210200","瓦房店":"210281","庄河":"210283","鞍山":"210300","海城":"210381","抚顺":"210400","本溪":"210500","丹东":"210600","东港":"210681","凤城":"210682","锦州":"210700","凌海":"210781","北镇":"210782","营口":"210800","西市区":"210803","盖州":"210881","大石桥":"210882","阜新":"210900","辽阳":"211000","灯塔":"211081","盘锦":"211100","铁岭":"211200","调兵山":"211281","开原":"211282","朝阳":"211300","北票":"211381","凌源":"211382","葫芦岛":"211400","兴城":"211481","长春":"220100","榆树":"220182","德惠":"220183","吉林":"220200","蛟河":"220281","桦甸":"220282","舒兰":"220283","磐石":"220284","四平":"220300","公主岭":"220381","双辽":"220382","辽源":"220400","通化":"220500","梅河口":"220581","集安":"220582","白山":"220600","临江":"220681","松原":"220700","扶余":"220781","白城":"220800","洮南":"220881","大安":"220882","延吉":"222401","图们":"222402","敦化":"222403","珲春":"222404","龙井":"222405","和龙":"222406","哈尔滨":"230100","尚志":"230183","五常":"230184","齐齐哈尔":"230200","讷河":"230281","鸡西":"230300","虎林":"230381","密山":"230382","鹤岗":"230400","双鸭山":"230500","大庆":"230600","伊春":"230700","铁力":"230781","佳木斯":"230800","同江":"230881","富锦":"230882","抚远":"230883","七台河":"230900","牡丹江":"231000","绥芬河":"231081","海林":"231083","宁安":"231084","穆棱":"231085","东宁":"231086","黑河":"231100","北安":"231181","五大连池":"231182","绥化":"231200","安达":"231281","肇东":"231282","海伦":"231283","漠河":"232701","上海":"310000","南京":"320100","无锡":"320200","江阴":"320281","宜兴":"320282","徐州":"320300","新沂":"320381","邳州":"320382","常州":"320400","溧阳":"320481","苏州":"320500","常熟":"320581","张家港":"320582","昆山":"320583","太仓":"320585","南通":"320600","海安":"320685","启东":"320681","如皋":"320682","海门":"320684","连云港":"320700","淮安":"320800","盐城":"320900","东台":"320981","扬州":"321000","仪征":"321081","高邮":"321084","镇江":"321100","丹阳":"321181","扬中":"321182","句容":"321183","泰州":"321200","兴化":"321281","靖江":"321282","泰兴":"321283","宿迁":"321300","杭州":"330100","建德":"330182","宁波":"330200","余姚":"330281","慈溪":"330282","温州":"330300","瑞安":"330381","乐清":"330382","嘉兴":"330400","海宁":"330481","平湖":"330482","桐乡":"330483","湖州":"330500","绍兴":"330600","诸暨":"330681","嵊州":"330683","金华":"330700","兰溪":"330781","义乌":"330782","东阳":"330783","永康":"330784","衢州":"330800","江山":"330881","舟山":"330900","台州":"331000","温岭":"331081","临海":"331082","玉环":"331083","丽水":"331100","龙泉":"331181","合肥":"340100","巢湖":"340181","芜湖":"340200","蚌埠":"340300","淮南":"340400","马鞍山":"340500","淮北":"340600","铜陵":"340700","安庆":"340800","潜山":"340882","桐城":"340881","黄山":"341000","滁州":"341100","天长":"341181","明光":"341182","阜阳":"341200","界首":"341282","宿州":"341300","六安":"341500","亳州":"341600","池州":"341700","宣城":"341800","宁国":"341881","福州":"350100","福清":"350181","厦门":"350200","莆田":"350300","三明":"350400","永安":"350481","泉州":"350500","石狮":"350581","晋江":"350582","南安":"350583","漳州":"350600","龙海":"350681","南平":"350700","邵武":"350781","武夷山":"350782","建瓯":"350783","龙岩":"350800","漳平":"350881","宁德":"350900","福安":"350981","福鼎":"350982","南昌":"360100","景德镇":"360200","乐平":"360281","萍乡":"360300","九江":"360400","瑞昌":"360481","共青城":"360482","庐山":"360483","新余":"360500","鹰潭":"360600","贵溪":"360681","赣州":"360700","瑞金":"360781","吉安":"360800","井冈山":"360881","宜春":"360900","丰城":"360981","樟树":"360982","高安":"360983","抚州":"361000","上饶":"361100","德兴":"361181","济南":"370100","市中区":"370103","青岛":"370200","市南区":"370202","市北区":"370203","胶州":"370281","平度":"370283","莱西":"370285","淄博":"370300","枣庄":"370400","市中区":"370402","滕州":"370481","东营":"370500","烟台":"370600","龙口":"370681","莱阳":"370682","莱州":"370683","蓬莱":"370684","招远":"370685","栖霞":"370686","海阳":"370687","潍坊":"370700","青州":"370781","诸城":"370782","寿光":"370783","安丘":"370784","高密":"370785","昌邑":"370786","济宁":"370800","曲阜":"370881","邹城":"370883","泰安":"370900","新泰":"370982","肥城":"370983","威海":"371000","荣成":"371082","乳山":"371083","日照":"371100","临沂":"371300","德州":"371400","乐陵":"371481","禹城":"371482","聊城":"371500","临清":"371581","滨州":"371600","邹平":"371681","菏泽":"371700","郑州":"410100","巩义":"410181","荥阳":"410182","新密":"410183","新郑":"410184","登封":"410185","开封":"410200","洛阳":"410300","偃师":"410381","平顶山":"410400","舞钢":"410481","汝州":"410482","安阳":"410500","林州":"410581","鹤壁":"410600","新乡":"410700","卫辉":"410781","辉县":"410782","焦作":"410800","沁阳":"410882","孟州":"410883","濮阳":"410900","许昌":"411000","禹州":"411081","长葛":"411082","漯河":"411100","三门峡":"411200","义马":"411281","灵宝":"411282","南阳":"411300","邓州":"411381","商丘":"411400","永城":"411481","信阳":"411500","周口":"411600","项城":"411681","驻马店":"411700","济源":"419001","武汉":"420100","黄石":"420200","大冶":"420281","十堰":"420300","丹江口":"420381","宜昌":"420500","宜都":"420581","当阳":"420582","枝江":"420583","襄阳":"420600","老河口":"420682","枣阳":"420683","宜城":"420684","鄂州":"420700","荆门":"420800","京山":"420882","钟祥":"420881","孝感":"420900","应城":"420981","安陆":"420982","汉川":"420984","荆州":"421000","沙市区":"421002","石首":"421081","洪湖":"421083","松滋":"421087","黄冈":"421100","麻城":"421181","武穴":"421182","咸宁":"421200","赤壁":"421281","随州":"421300","广水":"421381","恩施":"422801","利川":"422802","仙桃":"429004","潜江":"429005","天门":"429006","长沙":"430100","浏阳":"430181","宁乡":"430182","株洲":"430200","醴陵":"430281","湘潭":"430300","湘乡":"430381","韶山":"430382","衡阳":"430400","耒阳":"430481","常宁":"430482","邵阳":"430500","武冈":"430581","岳阳":"430600","汨罗":"430681","临湘":"430682","常德":"430700","津市":"430781","张家界":"430800","益阳":"430900","沅江":"430981","郴州":"431000","资兴":"431081","永州":"431100","怀化":"431200","洪江":"431281","娄底":"431300","冷水江":"431381","涟源":"431382","吉首":"433101","广州":"440100","韶关":"440200","乐昌":"440281","南雄":"440282","深圳":"440300","珠海":"440400","汕头":"440500","佛山":"440600","江门":"440700","台山":"440781","开平":"440783","鹤山":"440784","恩平":"440785","湛江":"440800","廉江":"440881","雷州":"440882","吴川":"440883","茂名":"440900","高州":"440981","化州":"440982","信宜":"440983","肇庆":"441200","四会":"441284","惠州":"441300","梅州":"441400","兴宁":"441481","汕尾":"441500","陆丰":"441581","河源":"441600","阳江":"441700","阳春":"441781","清远":"441800","英德":"441881","连州":"441882","东莞":"441900","中山":"442000","潮州":"445100","揭阳":"445200","普宁":"445281","云浮":"445300","罗定":"445381","南宁":"450100","柳州":"450200","桂林":"450300","荔浦":"450381","梧州":"450400","岑溪":"450481","北海":"450500","防城港":"450600","东兴":"450681","钦州":"450700","贵港":"450800","桂平":"450881","玉林":"450900","北流":"450981","百色":"451000","靖西":"451081","贺州":"451100","河池":"451200","来宾":"451300","合山":"451381","崇左":"451400","凭祥":"451481","海口":"460100","三亚":"460200","三沙":"460300","儋州":"460400","五指山":"469001","琼海":"469002","文昌":"469005","万宁":"469006","东方":"469007","重庆":"500000","重庆市郊县":"500200","成都":"510100","都江堰":"510181","彭州":"510182","邛崃":"510183","崇州":"510184","简阳":"510185","自贡":"510300","攀枝花":"510400","泸州":"510500","德阳":"510600","广汉":"510681","什邡":"510682","绵竹":"510683","绵阳":"510700","江油":"510781","广元":"510800","遂宁":"510900","内江":"511000","市中区":"511002","隆昌":"511083","乐山":"511100","市中区":"511102","峨眉山":"511181","南充":"511300","阆中":"511381","眉山":"511400","宜宾":"511500","广安":"511600","华蓥":"511681","达州":"511700","万源":"511781","雅安":"511800","巴中":"511900","资阳":"512000","马尔康":"513201","康定":"513301","西昌":"513401","贵阳":"520100","清镇":"520181","六盘水":"520200","盘州":"520281","遵义":"520300","赤水":"520381","仁怀":"520382","安顺":"520400","毕节":"520500","铜仁":"520600","兴义":"522301","兴仁":"522302","凯里":"522601","都匀":"522701","福泉":"522702","昆明":"530100","安宁":"530181","曲靖":"530300","宣威":"530381","玉溪":"530400","保山":"530500","腾冲":"530581","昭通":"530600","水富":"530681","丽江":"530700","普洱":"530800","临沧":"530900","楚雄":"532301","个旧":"532501","开远":"532502","蒙自":"532503","弥勒":"532504","文山":"532601","景洪":"532801","大理":"532901","瑞丽":"533102","芒":"533103","泸水":"533301","香格里拉":"533401","拉萨":"540100","日喀则":"540200","昌都":"540300","林芝":"540400","山南":"540500","那曲":"540600","西安":"610100","铜川":"610200","宝鸡":"610300","咸阳":"610400","彬州":"610482","兴平":"610481","渭南":"610500","韩城":"610581","华阴":"610582","延安":"610600","汉中":"610700","榆林":"610800","神木":"610881","安康":"610900","商洛":"611000","兰州":"620100","嘉峪关":"620200","金昌":"620300","白银":"620400","天水":"620500","武威":"620600","张掖":"620700","平凉":"620800","华亭":"620881","酒泉":"620900","玉门":"620981","敦煌":"620982","庆阳":"621000","定西":"621100","陇南":"621200","临夏":"622901","合作":"623001","西宁":"630100","海东":"630200","玉树":"632701","格尔木":"632801","德令哈":"632802","茫崖":"632803","银川":"640100","灵武":"640181","石嘴山":"640200","吴忠":"640300","青铜峡":"640381","固原":"640400","中卫":"640500","乌鲁木齐":"650100","新市区":"650104","克拉玛依":"650200","吐鲁番":"650400","哈密":"650500","昌吉":"652301","阜康":"652302","博乐":"652701","阿拉山口":"652702","库尔勒":"652801","阿克苏":"652901","阿图什":"653001","喀什":"653101","和田":"653201","伊宁":"654002","奎屯":"654003","霍尔果斯":"654004","塔城":"654201","乌苏":"654202","阿勒泰":"654301","石河子":"659001","阿拉尔":"659002","图木舒克":"659003","五家渠":"659004","北屯":"659005","铁门关":"659006","双河":"659007","可克达拉":"659008","昆玉市":"659009","伊犁":"654000"] -def codeMap = ["北京": "131", "天津": "332", "石家庄": "150", "唐山": "265", "秦皇岛": "148", "邯郸": "151", "邢台": "266", "保定": "307", "张家口": "264", "承德": "207", "沧州": "149", "廊坊": "191", "衡水": "208", "太原": "176", "大同": "355", "阳泉": "357", "长治": "356", "晋城": "290", "朔州": "237", "晋中": "238", "运城": "328", "忻州": "367", "临汾": "368", "吕梁": "327", "呼和浩特": "321", "包头": "229", "乌海": "123", "赤峰": "297", "通辽": "64", "鄂尔多斯": "283", "呼伦贝尔": "61", "巴彦淖尔": "169", "乌兰察布": "168", "兴安盟": "62", "锡林郭勒盟": "63", "阿拉善盟": "230", "沈阳": "58", "大连": "167", "鞍山": "320", "抚顺": "184", "本溪": "227", "丹东": "282", "锦州": "166", "营口": "281", "阜新": "59", "辽阳": "351", "盘锦": "228", "铁岭": "60", "朝阳": "280", "葫芦岛": "319", "长春": "53", "吉林市": "55", "四平": "56", "辽源": "183", "通化": "165", "白山": "57", "松原": "52", "白城": "51", "延边朝鲜族自治州": "54", "哈尔滨": "48", "齐齐哈尔": "41", "鸡西": "46", "鹤岗": "43", "双鸭山": "45", "大庆": "50", "伊春": "40", "佳木斯": "42", "七台河": "47", "牡丹江": "49", "黑河": "39", "绥化": "44", "大兴安岭地区": "38", "上海": "289", "南京": "315", "无锡": "317", "徐州": "316", "常州": "348", "苏州": "224", "南通": "161", "连云港": "347", "淮安": "162", "盐城": "223", "扬州": "346", "镇江": "160", "泰州": "276", "宿迁": "277", "杭州": "179", "宁波": "180", "温州": "178", "嘉兴": "334", "湖州": "294", "绍兴": "293", "金华": "333", "衢州": "243", "舟山": "245", "台州": "244", "丽水": "292", "合肥": "127", "芜湖": "129", "蚌埠": "126", "淮南": "250", "马鞍山": "358", "淮北": "253", "铜陵": "337", "安庆": "130", "黄山": "252", "滁州": "189", "阜阳": "128", "宿州": "370", "巢湖": "251", "六安": "298", "亳州": "188", "池州": "299", "宣城": "190", "福州": "300", "厦门": "194", "莆田": "195", "三明": "254", "泉州": "134", "漳州": "255", "南平": "133", "龙岩": "193", "宁德": "192", "南昌": "163", "景德镇": "225", "萍乡": "350", "九江": "349", "新余": "164", "鹰潭": "279", "赣州": "365", "吉安": "318", "宜春": "278", "抚州": "226", "上饶": "364", "济南": "288", "青岛": "236", "淄博": "354", "枣庄": "172", "东营": "174", "烟台": "326", "潍坊": "287", "济宁": "286", "泰安": "325", "威海": "175", "日照": "173", "莱芜": "124", "临沂": "234", "德州": "372", "聊城": "366", "滨州": "235", "菏泽": "353", "郑州": "268", "开封": "210", "洛阳": "153", "平顶山": "213", "安阳": "267", "鹤壁": "215", "新乡": "152", "焦作": "211", "濮阳": "209", "许昌": "155", "漯河": "344", "三门峡": "212", "南阳": "309", "商丘": "154", "信阳": "214", "周口": "308", "驻马店": "269", "武汉": "218", "黄石": "311", "十堰": "216", "宜昌": "270", "襄阳": "156", "鄂州": "122", "荆门": "217", "孝感": "310", "荆州": "157", "黄冈": "271", "咸宁": "362", "随州": "371", "恩施土家族苗族自治州": "373", "仙桃": "1713", "潜江": "1293", "天门": "2654", "神农架林区": "2734", "长沙": "158", "株洲": "222", "湘潭": "313", "衡阳": "159", "邵阳": "273", "岳阳": "220", "常德": "219", "张家界": "312", "益阳": "272", "郴州": "275", "永州": "314", "怀化": "363", "娄底": "221", "湘西土家族苗族自治州": "274", "广州": "257", "韶关": "137", "深圳": "340", "珠海": "140", "汕头": "303", "佛山": "138", "江门": "302", "湛江": "198", "茂名": "139", "肇庆": "338", "惠州": "301", "梅州": "141", "汕尾": "339", "河源": "200", "阳江": "199", "清远": "197", "东莞": "119", "中山": "187", "潮州": "201", "揭阳": "259", "云浮": "258", "南宁": "261", "柳州": "305", "桂林": "142", "梧州": "304", "北海": "295", "防城港": "204", "钦州": "145", "贵港": "341", "玉林": "361", "百色": "203", "贺州": "260", "河池": "143", "来宾": "202", "崇左": "144", "海口": "125", "三亚": "121", "五指山": "1644", "琼海": "2358", "儋州": "1215", "文昌": "2758", "万宁": "1216", "东方": "2634", "定安": "1214", "屯昌": "1641", "澄迈": "2757", "临高": "2033", "白沙黎族自治": "2359", "昌江黎族自治": "1642", "乐东黎族自治": "2032", "陵水黎族自治": "1643", "保亭黎族苗族自治": "1217", "琼中黎族苗族自治": "2031", "重庆": "132", "成都": "75", "自贡": "78", "攀枝花": "81", "泸州": "331", "德阳": "74", "绵阳": "240", "广元": "329", "遂宁": "330", "内江": "248", "乐山": "79", "南充": "291", "眉山": "77", "宜宾": "186", "广安": "241", "达州": "369", "雅安": "76", "巴中": "239", "资阳": "242", "阿坝藏族羌族自治州": "185", "甘孜藏族自治州": "73", "凉山彝族自治州": "80", "贵阳": "146", "六盘水": "147", "遵义": "262", "安顺": "263", "铜仁地区": "205", "黔西南布依族苗族自治州": "343", "毕节地区": "206", "黔东南苗族侗族自治州": "342", "黔南布依族苗族自治州": "306", "昆明": "104", "曲靖": "249", "玉溪": "106", "保山": "112", "昭通": "336", "丽江": "114", "临沧": "110", "楚雄彝族自治州": "105", "红河哈尼族彝族自治州": "107", "文山壮族苗族自治州": "177", "普洱": "108", "西双版纳傣族自治州": "109", "大理白族自治州": "111", "德宏傣族景颇族自治州": "116", "怒江傈僳族自治州": "113", "迪庆藏族自治州": "115", "拉萨": "100", "昌都地区": "99", "山南地区": "97", "日喀则地区": "102", "那曲地区": "101", "阿里地区": "103", "林芝地区": "98", "西安": "233", "铜川": "232", "宝鸡": "171", "咸阳": "323", "渭南": "170", "延安": "284", "汉中": "352", "榆林": "231", "安康": "324", "商洛": "285", "兰州": "36", "嘉峪关": "33", "金昌": "34", "白银": "35", "天水": "196", "武威": "118", "张掖": "117", "平凉": "359", "酒泉": "37", "庆阳": "135", "定西": "136", "陇南": "256", "临夏回族自治州": "182", "甘南藏族自治州": "247", "西宁": "66", "海东地区": "69", "海北藏族自治州": "67", "黄南藏族自治州": "70", "海南藏族自治州": "68", "果洛藏族自治州": "72", "玉树藏族自治州": "71", "海西蒙古族藏族自治州": "65", "银川": "360", "石嘴山": "335", "吴忠": "322", "固原": "246", "中卫": "181", "乌鲁木齐": "92", "克拉玛依": "95", "吐鲁番地区": "89", "哈密地区": "91", "昌吉回族自治州": "93", "博尔塔拉蒙古自治州": "88", "巴音郭楞蒙古自治州": "86", "阿克苏地区": "85", "克孜勒苏柯尔克孜自治州": "84", "喀什地区": "83", "和田地区": "82", "伊犁哈萨克自治州": "90", "塔城地区": "94", "阿勒泰地区": "96", "石河子": "770", "阿拉尔": "731", "图木舒克": "792", "五家渠": "789", "香港特别行政区": "2912", "澳门特别行政区": "2911"] //def name = "台基厂社区居委会" //def region = "东城区" //def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); -filePath = "D:\\数据\\涉农\\居委(包含不准-5万).xlsx" +filePath = "D:\\数据\\涉农\\18万最终-入库.xlsx" ExcelUtils.multiThreadingModify(filePath, {d-> - if(!d['N']){ + if(!d['N'] && d['J']){ def city = d['D'] def region = d['F'] def name = d['J'] @@ -23,45 +29,56 @@ ExcelUtils.multiThreadingModify(filePath, {d-> code = codeMap.get(RegionData.formatCity(city)); } if(code){ - def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); + def rets = OpenApiUtils.searchBaiDuMap(region,township,city+name, code.toInteger()); rets = sortResult(rets) println name +" "+rets.size() - for(def r : rets){ - def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') - def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') - def stopFlag = false - if(bdname == newName){ - stopFlag = true - }else if(bdname.endsWith("村")){ - if(bdname.equals(newName+"村")){ - stopFlag = true - }else{ - if(bdname.equals(township+newName+"村")){ - stopFlag = true - } - } - }else if(bdname.contains(newName)){ - if(r.township && bdname.contains(r.township)){ - bdname = bdname.substring(bdname.indexOf(r.township)+r.township.length()) - if(bdname && bdname == newName){ - stopFlag = true - } - } - } - if(stopFlag){ + if(rets){ + def r = rets[0] + if(r.city && city.contains(r.city)){ d['N'] = DataUtil.getRound(6, r.lng) d['O'] = DataUtil.getRound(6, r.lat) d['P'] = r.estateType - if(r.region.contains(region)){ - d['Q'] = "区域相同" - }else{ - d['Q'] = r.region - } + d['Q'] = r.region d['R'] = r.name - break; + d['S'] = r.score } } +// for(def r : rets){ +// def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') +// def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') +// def stopFlag = false +// if(bdname == newName){ +// stopFlag = true +// }else if(bdname.endsWith("村")){ +// if(bdname.equals(newName+"村")){ +// stopFlag = true +// }else{ +// if(bdname.equals(township+newName+"村")){ +// stopFlag = true +// } +// } +// }else if(bdname.contains(newName)){ +// if(r.township && bdname.contains(r.township)){ +// bdname = bdname.substring(bdname.indexOf(r.township)+r.township.length()) +// if(bdname && bdname == newName){ +// stopFlag = true +// } +// } +// } +// if(stopFlag){ +// d['N'] = DataUtil.getRound(6, r.lng) +// d['O'] = DataUtil.getRound(6, r.lat) +// d['P'] = r.estateType +// if(r.region.contains(region)){ +// d['Q'] = "区域相同" +// }else{ +// d['Q'] = r.region +// } +// d['R'] = r.name +// break; +// } +// } }else{ println "【${city}】 没有找到相关code" @@ -69,19 +86,80 @@ ExcelUtils.multiThreadingModify(filePath, {d-> } }) +ExcelUtils.multiThreadingModify(filePath, {d-> + if(d['J'] && d['R']){ + def newName1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") + def newName2 = d['R'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","").replace("小区","社区").replace("社区村","村") + if(newName1.contains(newName2) || newName2.contains(newName1)){ + d['U'] = "包含" + }else{ + def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName1, " ") + def py2 = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName2, " ") + if(py1.contains(py2) || py2.contains(py1)){ + d['U'] = "拼音相似" + } + } + } +}) + +//ExcelUtils.multiThreadingModify(filePath, {d-> +// if(d['J'] ) { +// def pois = findPois(d['D'], d['F'], d['J']) +// if(pois){ +// def name1 = d['J'].replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// for(def poi : pois){ +// def name2 = poi.name.replace("居民委员会","").replace("社区居委会","").replace("社区居委","").replace("居委会","").replace("村民委员会","").replace("村委会","") +// if(name1.contains(name2) || name2.contains(name1)){ +// //经度 纬度 类型 百度区域 百度名称 +// d['N'] = poi.lng +// d['O'] = poi.lat +// d['P'] = poi.type +// d['Q'] = poi.region +// d['R'] = poi.name +// break; +// } +// } +// } +// } +// +//}) + +static def findPois(def city, def region, def name){ + final StringBuffer sqlBuffer = new StringBuffer() + def sql = "select * from amap_poi where cityname='${city}' and adname='${region}' and MATCH(name, '${name}') and typecode in ('130000','130100','130101','130102','130103','130104','130105','130106')" + def rets = [] + ElasticUtils.executeSqlQuery(sql,{ data-> + def m = [:] + m.city = data.cityname + m.region = data.adname + m.name = data.name + m.address = data.address + m.type = data.type + m.code = data.typecode + + def location = data.location + m.lng = location.lon + m.lat = location.lat + rets << m + }) + + return rets; +} + + def sortResult(rets){ rets.sort{a,b-> def a1 = a.estateType def b1 = b.estateType def a1_score = a.score - if(a1 && a1.contains("政府机构")){ - a1_score = a1_score +1 - } +// if(a1 && a1.contains("政府机构")){ +// a1_score = a1_score +1 +// } def b1_score = b.score - if(b1 && b1.contains("政府机构")){ - b1_score = b1_score +1 - } +// if(b1 && b1.contains("政府机构")){ +// b1_score = b1_score +1 +// } return b1_score.compareTo(a1_score) } return rets diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy index 99352aedd..13dc8a040 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/govLocation.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.gj.village +import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.EsSearchUtils import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.ExcelUtils @@ -13,43 +14,77 @@ DBCollection TOWN_POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) -def filePath = "D:\\数据\\涉农\\县.xlsx" -ExcelUtils.multiThreadingModify(filePath, { row -> -// if(!row['I']){ -// def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") -// if(rets){ -// def obj = findOneByName(rets, row['C']+"人民政府") -// if(obj){ -// row['I'] = obj.lng -// row['J'] = obj.lat -// println row['C'] + " "+obj -// } -// } -// } -// if(row['D'] && !row['F']){ -// def townMap = findTownRange(row['B'], TOWN_POLYLINECOLL) -// def map = ["lon":row['D'], "lat":row['E']] -// def township = InsidePolygon.isInArea2(map.lon, map.lat, townMap) -// row['F'] = township -// } +//def s = getTownshipInfo("118.702988,39.740979") +def filePath = "D:\\数据\\涉农\\县政府(最终).xlsx" +//ExcelUtils.multiThreadingModify(filePath, { row -> +//// if(!row['I']){ +//// def rets = EsSearchUtils.findPois(row['B'], row['C'], row['C']+"人民政府") +//// if(rets){ +//// def obj = findOneByName(rets, row['C']+"人民政府") +//// if(obj){ +//// row['I'] = obj.lng +//// row['J'] = obj.lat +//// println row['C'] + " "+obj +//// } +//// } +//// } +// +//// if(row['D'] && !row['F']){ +//// def townMap = findTownRange(row['B'], TOWN_POLYLINECOLL) +//// def map = ["lon":row['D'], "lat":row['E']] +//// def township = InsidePolygon.isInArea2(map.lon, map.lat, townMap) +//// row['F'] = township +//// } +// +//// if(row['F'] && !row['J']){ +//// def q = new BasicDBObject() +//// q.put("city_name", row['B']) +//// q.put("area_name", row['C']) +//// def streetName = row['F'] +//// q.put("street_name", streetName) +//// def count = COMMUNITY_CONN.count(q); +//// row['J'] = count +////// row['H'] = streetName +//// } +//// if(!row['H']){ +//// def gaodeMap = getTownshipInfo(row['D']+","+row['E']) +//// if(gaodeMap && gaodeMap.township){ +//// row['H'] = gaodeMap.township +//// } +//// } +// +//// if(row['J'] && row['J'].toString().toDouble()>0){ +//// def up_query = new BasicDBObject() +//// up_query.put("city_name", row['B']) +//// up_query.put("area_name", row['C']) +//// up_query.put("street_name", row['F']) +//// def udata = new BasicDBObject() +//// udata.put("has_gov", "是") +//// COMMUNITY_CONN.update(up_query, new BasicDBObject('$set', udata), false, true) +//// } +// +// +//}) + + +def objs = COMMUNITY_CONN.find(new BasicDBObject()) +for(def d : objs){ + if(d.name){ + def py1 = com.fangjia.core.util.DataUtil.hanyuQuanpin(d.name, " ") + def udata = new BasicDBObject() + udata.put("name_pinyin", py1) + if(d.location){ + def lon = DataHandleUtils.getDoubleRound(6, d.location.lon) + def lat = DataHandleUtils.getDoubleRound(6, d.location.lat) + udata.put("location", ["lat":lat, "lon":lon]) + } - if(row['F'] && !row['G']){ def q = new BasicDBObject() - q.put("city_name", row['B']) - q.put("area_name", row['C']) - def streetName = row['F'] - q.put("street_name", streetName) - def count = COMMUNITY_CONN.count(q); - row['G'] = count -// row['H'] = streetName + q.put("_id", d._id) + COMMUNITY_CONN.update(q, new BasicDBObject('$set', udata), false, true) } -// def gaodeMap = getTownshipInfo(row['D']+","+row['E']) -// if(gaodeMap && gaodeMap.township){ -// row['H'] = gaodeMap.township -// } - -}) +} def getTownshipInfo(def glocation){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy new file mode 100644 index 000000000..8918f18f3 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/saveCommunity.groovy @@ -0,0 +1,47 @@ +package com.fangjia.script.gj.village + +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.rabbitmq.client.impl.AMQImpl +import org.bson.types.ObjectId + +def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; +DBCollection COMMUNITY_CONN = MongoUtils.getCollectionByName2("fangjia", "community_new_2023", MONGO100_URL) + +filePath = "D:\\数据\\涉农\\18万最终-id.xlsx" +def index = 0 +ExcelUtils.multiThreadingModify(filePath, { d-> + + if(d['A']){ + def q = new BasicDBObject("_id", d['A']) + def dbo = COMMUNITY_CONN.findOne(q) + if(dbo){ + index++ + println index + COMMUNITY_CONN.remove(q) + }else{ +// def udata = new BasicDBObject() +// udata.put("_id" , d['A']) +// udata.put("province" , d['A']) +// udata.put("province_code" , d['A']) +// udata.put("city_code" , d['A']) +// udata.put("area_name" , d['A']) +// udata.put("area_code" , d['A']) +// udata.put("street_name" , d['A']) +// udata.put("street_code" , d['A']) +// udata.put("name" , d['A']) +// udata.put("code" , d['A']) +// udata.put("type_code" , d['A']) +// udata.put("type_name" , d['A']) +// udata.put("location_type" , d['A']) +// udata.put("geohash" , d['A']) +// udata.put("location" , d['A']) +// udata.put("new_poi_name" , d['A']) +// udata.put("new_area_name" , d['A']) +// udata.put("city_name" , d['A']) +// COMMUNITY_CONN.save(udata); + } + } +}) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 25930543d..86eac3172 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -4,6 +4,7 @@ import com.fangjia.core.RegionData import com.fangjia.script.BaseBatch import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.lixue.DB.City import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils @@ -44,15 +45,29 @@ class SuggestionDataSynch extends BaseBatch{ static main(args) { runBatch(new SuggestionDataSynch(), args); + } @Override public void process(Object args) { run() // updateCode() +// getExitsCity() } + def getExitsCity(){ + SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) + def cities = SUGGESTION_CONN.distinct("city") + def simpleCities = [] + for (def c :cities) { + def city = RegionData.formatCity(c) + simpleCities.add(city) + } +// print(simpleCities) + return simpleCities + } + @@ -63,10 +78,14 @@ class SuggestionDataSynch extends BaseBatch{ def index = 0 fullCityMap = queryFullNameCity() mcaDistMap = queryDistNameCity() + def existCities = getExitsCity() for (def c : citys) { + def allRets = [] - if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ + +// if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","岳阳","衡阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"].contains(c)){ + if(existCities.contains(c)){ continue; } index++ @@ -103,9 +122,9 @@ class SuggestionDataSynch extends BaseBatch{ SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL) count = SUGGESTION_CONN.count(q) } - if(count>0){ - SUGGESTION_CONN.remove(q) - } +// if(count>0){ +// SUGGESTION_CONN.remove(q) +// } def rets = [] for(def i=0;i Date: Tue, 30 Jan 2024 18:17:17 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E6=89=80BUG=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/ComprehensiveQueryController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 1ad4b2c38..4d264b835 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -276,6 +276,8 @@ public class ComprehensiveQueryController { district = bieShuDistrict; } } + //添加城市 + propertyEvaluationModel.setCity(district.getCity()); propertyEvaluationModel.setDistrict(district.getRegion()); propertyEvaluationModel.setName(district.getName()); try { @@ -507,10 +509,10 @@ public class ComprehensiveQueryController { throws NumberFormatException, IllegalAccessException { // RestfulModelAndView mav = new RestfulModelAndView(); // mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) + if (StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); - return mav; + mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域,小区名,面积(size)为必填项")); +// return mav; } if (model.getCity().endsWith("市")) { model.setCity(model.getCity().replaceAll("市$", "")); From 348edc8e119b35f96a4838f5b00191e34854a983 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Wed, 31 Jan 2024 11:24:56 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=86=8D=E8=BF=BD=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=AB=98=E5=BE=B7=E7=9A=84=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 9 ++++++-- .../com/fangjia/open/dto/DistrictInfoDto.java | 23 ++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 67989a7e9..81a281610 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -880,8 +880,13 @@ public class PropertyController { districtInfoDto.setAddressAlias(district.getAddrAlias()); if (district.getLat2() != null && district.getLat2() != 0 && district.getLng2() != null && district.getLng2() != 0) { - districtInfoDto.setLat(district.getLat2() / 10000000000D); - districtInfoDto.setLng(district.getLng2() / 10000000000D); + districtInfoDto.setLat2(district.getLat2() / 10000000000D); + districtInfoDto.setLng2(district.getLng2() / 10000000000D); + } + if (district.getLat() != null && district.getLat() != 0 && district.getLng() != null + && district.getLng() != 0) { + districtInfoDto.setLat(district.getLat() / 10000000000D); + districtInfoDto.setLng(district.getLng() / 10000000000D); } districtInfoDto.setPropertyType(district.getEstateType2()); if (HouseValidator.validateBuildingType(district.getBuildType())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java index 6fbca5e08..8d24c760f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java @@ -26,8 +26,14 @@ public class DistrictInfoDto { private List alias; private List addressAlias; private String videoUrl; + //高德坐标 + //维度 private Double lat; + //经度 private Double lng; + // 百度坐标 + private Double lat2; + private Double lng2; private String developer; private String buildType; private String estateCompany; @@ -102,7 +108,22 @@ public class DistrictInfoDto { private String township; private String landProperty; - + public Double getLat2() { + return lat2; + } + + public void setLat2(Double lat2) { + this.lat2 = lat2; + } + + public Double getLng2() { + return lng2; + } + + public void setLng2(Double lng2) { + this.lng2 = lng2; + } + public String getDistrict() { return district; } From 9ccfabea359c089c8e1fedbb592b936d91bcc950 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Fri, 2 Feb 2024 10:21:00 +0800 Subject: [PATCH 25/26] =?UTF-8?q?bkoff=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=95=8C=E9=9D=A2=E6=94=B9=E4=B8=BA=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 32 +++++++++-- .../src/main/webapp/apiUser/edit.ftl | 10 +++- .../src/main/webapp/apiUser/editPwd.ftl | 54 +++++++++++++++++++ .../src/main/java/com/fangjia/test.java | 18 +++++++ 4 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/test.java diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 1e58749d6..691eb9427 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -269,9 +269,9 @@ public class ApiUserController { public Object updateAction(ApiUserModel model) { Long userId = model.getUserId(); Map dataApiUser = new HashMap(); - Map user = new HashMap(); +// Map user = new HashMap(); dataApiUser.put("email", model.getEmail()); - user.put("password", DigestUtils.md5Hex(model.getPassword())); +// user.put("password", DigestUtils.md5Hex(model.getPassword())); dataApiUser.put("siteName", model.getSiteName()); dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); @@ -282,9 +282,9 @@ public class ApiUserController { dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); // 更改用户密码 - this.userService.updateById(user,userId); +// this.userService.updateById(user,userId); // 刷新缓存 - this.apiUserService.clearApiUserAuthorityCache(userId); +// this.apiUserService.clearApiUserAuthorityCache(userId); //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE @@ -297,6 +297,30 @@ public class ApiUserController { return model; } + public Object doEditPwdAction(ApiUserModel model) { + Long userId = model.getUserId(); + Map user = new HashMap(); + user.put("password", DigestUtils.md5Hex(model.getPassword())); +// +// // 更改用户密码 + this.userService.updateById(user,userId); + // 刷新缓存 + this.apiUserService.clearApiUserAuthorityCache(userId); + + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/edit?userId="+userId); + return model; + } + public Object editPwdAction(ApiUserModel model) { + Long userId = model.getUserId(); + User user = this.userService.findById(userId); + ApiUserBo bo = new ApiUserBo(); + bo.setUserName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + model.setApiUserBo(bo); + return model; + } + void modifyUserCfg(Long userId, ApiUserCfg.ApiUserCfgKey cfgKey, Object val) { if (userId != null && cfgKey != null) { ApiUserCfg apiUserCfg = this.apiUserCfgService.findByUserId(userId, cfgKey); diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index 88b47da75..3f8d5a463 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -46,11 +46,17 @@ <#-- --> <#-- 瀵嗙爜--> <#-- --> +<#-- --> +<#-- --> +<#-- 瀵嗙爜--> +<#-- --> <#-- --> - 瀵嗙爜 - + +     淇敼瀵嗙爜 + + 璐︽埛绫诲瀷 diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl new file mode 100644 index 000000000..3ccfe2210 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl @@ -0,0 +1,54 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + api鐢ㄦ埛瀵嗙爜淇敼 + + + <#include "/common_js.ftl" /> + + + + + + <#include "/layout/header.ftl" /> +
+
+ + + + + + + + + + + + + + + + +
鐢ㄦ埛鍚�${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!})
鏂板瘑鐮�
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/java/com/fangjia/test.java b/projects/fangjia-open/src/main/java/com/fangjia/test.java new file mode 100644 index 000000000..055094273 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/test.java @@ -0,0 +1,18 @@ +package com.fangjia; + +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.codec.binary.Hex; +import java.util.Scanner; + +public class test { + public static void main(String[] args) { + while (true){ + Scanner scanner = new Scanner(System.in); + String password = scanner.nextLine(); + String p =DigestUtils.md5Hex(password); + System.out.println(p); + + } + + } +} From a14b3b01661aa13c43d5dab2d963885ccb31a42c Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Mon, 5 Feb 2024 14:23:09 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=BB=BA=E6=88=90?= =?UTF-8?q?=E5=B9=B4=E4=BB=A3=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datastore/DistrictServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index c5f8d917c..40fda15df 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2727,11 +2727,14 @@ public class DistrictServiceImpl implements DistrictService { public Integer getCreateYear(District district) { Integer buildYear = getYearFormDate(district.getCreateYear()); - int minYear = Integer.MAX_VALUE; - if (buildYear != null && buildYear < minYear) { - minYear = buildYear; +// int minYear = Integer.MAX_VALUE; + if (buildYear != null && buildYear < Integer.MAX_VALUE) { +// minYear = buildYear; + return buildYear; + }else { + return null; } - return minYear; +// return minYear; } public Integer getBuildYear(District district) {