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 1/4] =?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 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 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 2/4] =?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 3/4] =?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 4/4] =?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()));