diff --git a/projects/fangjia-coresite/pom.xml b/projects/fangjia-coresite/pom.xml index 72cefc4b9..05fa7f275 100644 --- a/projects/fangjia-coresite/pom.xml +++ b/projects/fangjia-coresite/pom.xml @@ -242,13 +242,5 @@ 1.0.0 jdk18 - - - - - - - - diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl index b1a1c4956..323aeb051 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -38,9 +38,7 @@ 行业动æ€� æ•°æ�®åˆ†æž� æˆ�功案例 - å�„路客 - 房价通 - 地数 + å…¬å�¸åЍæ€� diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy index 1000b157c..066318e29 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy @@ -28,7 +28,7 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ @Override public void process(Object args) { - def citys = CcbCommonUtils.citys; + def citys = CcbCommonUtils.getRunningCitys(args) citys = citys.unique() def rets = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index 3ef4cee91..24ee5952f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -17,8 +17,8 @@ class CcbCommonUtils { // public static def citys_all = [ "³¤´º","ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢À­ÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","Å­½­ÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"] - public static def citys = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"] -// public static def citys = ["Î人"] + public static def citys_92 = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"] + public static def citys_252 = ["Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢À­ÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","Å­½­ÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"] public static def provCityMap = ["ºÓ±±":"ʯ¼Òׯ" ,"ɽÎ÷":"̫ԭ" ,"ÉÂÎ÷":"Î÷°²" ,"ɽ¶«":"¼ÃÄÏ","ºÓÄÏ":"Ö£ÖÝ" ,"ÁÉÄþ":"ÉòÑô" ,"¼ªÁÖ":"³¤´º" ,"ºÚÁú½­":"¹þ¶û±õ" ,"½­ËÕ":"ÄϾ©" ,"Õã½­":"º¼ÖÝ" ,"°²»Õ":"ºÏ·Ê","½­Î÷":"Äϲý" ,"¸£½¨":"¸£ÖÝ" ,"ºþ±±":"Î人","ºþÄÏ":"³¤É³" ,"ËÄ´¨":"³É¶¼" ,"¹óÖÝ":"¹óÑô" ,"ÔÆÄÏ":"À¥Ã÷" ,"¹ã¶«":"¹ãÖÝ" ,"º£ÄÏ":"º£¿Ú" ,"¸ÊËà":"À¼ÖÝ" ,"Çຣ":"Î÷Äþ" ,"̨Íå":"̨±±","ÄÚÃɹÅ":"ºôºÍºÆÌØ" ,"н®":"ÎÚ³ľÆë" ,"Î÷²Ø":"À­Èø","¹ãÎ÷":"ÄÏÄþ","ÄþÏÄ":"Òø´¨","Ïã¸Û":"Ïã¸Û","°ÄÃÅ":"°ÄÃÅ"] @@ -46,6 +46,24 @@ class CcbCommonUtils { "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + public static def getRunningCitys(def args){ + def citys = [] + println "args ²ÎÊý£º"+args.toString() + if(args){ + def countStr = args[0] + if(countStr=="344"){ + citys = CcbCommonUtils.citys_all + }else if(countStr=="92"){ + citys = CcbCommonUtils.citys_92 + }else if(countStr=="252"){ + citys = CcbCommonUtils.citys_252 + } + }else{ + citys = CcbCommonUtils.citys_92 + } + println "ÔËÐгÇÊÐÊýÁ¿£º"+citys.size() + return citys; + } public static def findCityCodeValue(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy index 3ac7f9a28..ed95e4cc6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy @@ -24,7 +24,7 @@ class StagingDistrictBatch extends BaseBatch{ @Override public void process(Object args) { - def citys = CcbCommonUtils.citys; + def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] for(def city : citys){ def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2","name_cat","lng","master_district_name", "c_date", "m_date"]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index 3907b73d5..229ed763f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -22,15 +22,16 @@ class ExportDistrictRongHe extends BaseBatch{ runBatch(new ExportDistrictRongHe(), args); } - def citys = CcbCommonUtils.citys + def citys = [] def cityCodeMap = CcbCommonUtils.findCityCodeValue() @Override void process(Object args) { + citys = CcbCommonUtils.getRunningCitys(args) def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] //按天导(æ¯�天一个文件夹) - exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) +// exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) if(curDate.toString().endsWith("10")){ exportBigdataCommunityGJRH()// diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy index 9ca07aac4..ea6d2717b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy @@ -167,6 +167,7 @@ class DistrictInfoExportBatch extends BaseBatch{ udate.put(k,v) } udate.removeField("_id") + udate.put("m_date", new Date()) FZ_DIST_COLL.update(new BasicDBObject('_id',d.get('_id')), new BasicDBObject('$set', udate)); }else{ FZ_DIST_COLL.save(d) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy index 14a8a6fac..45f3cbe35 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy @@ -154,7 +154,11 @@ class DistrictPriceExportBatch extends BaseBatch{ m << rMap.city m << rMap.region m << rMap.name - m << curPrice + if(curPrice){ + m << curPrice + }else{ + m << 0 + } m << curDate.toInteger(); result << m } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy index a624061d9..78537bc39 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy @@ -98,9 +98,11 @@ class FzDataResultStat { def dist = CommonDatautils.findDistrictById(list[1]) def flag = "ÓÐЧ" - if(dist.status!=0){ + + if(dist && dist.status!=0){ flag = "ʧЧ" } + rows << [keys[0], keys[1], keys[2], list[5].toString(), lastPrice.toString(), markup, flag] } ExcelUtils.write("D:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô_${curMonth}.xlsx", rows, "Êý¾Ý") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index 7cdcc589a..43203f42f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection //¸£ÖݵÚÈý·½¾ù¼Ûͳ¼Æ,·¢ËͶ¤¶¤ÏûÏ¢ //def datas = ExcelUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\¸£ÖÝ4ÔÂ2.xlsx",0,1) //def datas = CsvUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv"); -def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202208.csv") +def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202209.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy index 42489aafe..bb4f74fdf 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy @@ -390,13 +390,13 @@ public class BeiKeCrawlByChrome { if(cityEles){ for(def e : cityEles){ def href = e.attr("href") -// if(e.text().contains("¸£ÖÝ")){ + if(e.text().contains("¸£ÖÝ")){ def cityMap = [:] cityMap.city = e.text() cityMap.url = "https:"+href list << cityMap // cityMap.put(e.text(), "https:"+href) -// } + } } } return list diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy index c42cfa5ba..5b8abfc9a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy @@ -31,6 +31,7 @@ public class LianjiaCrawlByChrome { def DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) + def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -2, "yyyy-MM") static main(args) { def task = new LianjiaCrawlByChrome(); @@ -250,7 +251,7 @@ public class LianjiaCrawlByChrome { def durl = e.select(".title a").attr("href") def dealDate = e.select(".dealDate").text() dealDate = DateUtils.parseFromTightByPattern(dealDate, "yyyy.MM.dd") - def endDate = DateUtils.parseFromTightByPattern("2022-07-20", "yyyy-MM-dd") + def endDate = DateUtils.parseFromTightByPattern(startMonth + "-20", "yyyy-MM-dd") if(dealDate.getTime()>=endDate.getTime()){ detailUrls << durl parse(city, e, regionText) @@ -469,7 +470,7 @@ public class LianjiaCrawlByChrome { def cityDoc = Jsoup.parse(driver.getPageSource()); def cityEles = JQueryUtils.select(".city_province a", cityDoc) def cityMap = [:] - def citys= ["ËÕÖÝ"] + def citys= ["¸£ÖÝ"] if(cityEles){ for(def e : cityEles) { def href = e.attr("href") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy index e61f3588a..d202cdd74 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy @@ -335,8 +335,9 @@ class PaimaiDataSend { def q = new BasicDBObject() // q.put("city",new BasicDBObject('$in', ["ÄϾ©","ËÞǨ","ËÕÖÝ"])) q.put("province","½­ËÕ") + q.put("sub_type","ÍÁµØ") // q.put("parser_status", new BasicDBObject('$ne',2)) - q.put("url","https://sf-item.taobao.com/sf_item/665795393092.htm") +// q.put("url","https://sf-item.taobao.com/sf_item/668496148492.htm") //https://sf-item.taobao.com/sf_item/657131607486.htm // q.put("parser_status", new BasicDBObject('$exists',false)) // q.put("finishDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-09-01"))) @@ -420,10 +421,11 @@ class PaimaiDataSend { // q.put("city",new BasicDBObject('$in', ["ËÕÖÝ","ËÞǨ","ÄϾ©"])) // q.put("city", "ÉϺ£") q.put("province","½­ËÕ") + q.put("sub_type","ÍÁµØ") // q.put("parser_status", new BasicDBObject('$ne',1)) // q.put("region","¹ÃËÕ") - q.put("url","https://susong-item.taobao.com/auction/674736290116.htm") - def dbcursor = ali_zc_coll.find(q).batchSize(5000).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) +// q.put("url","https://susong-item.taobao.com/auction/674736290116.htm") + def dbcursor = ali_zc_coll.find(q).batchSize(1000).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) def rets = [] for(def d : dbcursor){ index++ @@ -438,6 +440,7 @@ class PaimaiDataSend { JSON result = new JSONObject() result.put("content", d.content) + result.put("sub_type", d.sub_type) def bid_content = net.sf.json.JSONObject.fromObject(d.bid_content) result.put("trades", bid_content) result.put("sub_count", d.sub_count) @@ -453,7 +456,7 @@ class PaimaiDataSend { json.put("result", result) rets << json - if(rets.size()==10000){ + if(rets.size()==1000){ println "¹²£º"+rets.size() send(rets) rets.clear() @@ -522,8 +525,8 @@ class PaimaiDataSend { def getPaimaiDatas(){ def q = new BasicDBObject() // q.put("city",new BasicDBObject('$in', ["ÄϾ©","ËÞǨ","ËÕÖÝ"])) - q.put("city","ËÕÖÝ") - q.put("mDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-10-09"))) + q.put("province","½­ËÕ") + q.put("mDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-10-10"))) def dbcursor = paimai43_COLL.find(q).batchSize(5000) def rets = [] for(def d : dbcursor){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/SeaweedAroundPoi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/SeaweedAroundPoi.groovy index ca74c0184..2bc9b09b2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/SeaweedAroundPoi.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/SeaweedAroundPoi.groovy @@ -73,11 +73,11 @@ class SeaweedAroundPoi extends BaseBatch { // void run() { def city = obj.city if (obj.lng) { - //def lng = SeaweedUtils.formatLatLng(obj.lng) - //def lat = SeaweedUtils.formatLatLng(obj.lat) + def lng = SeaweedUtils.formatLatLng(obj.lng) + def lat = SeaweedUtils.formatLatLng(obj.lat) // {'lon': 121.810877, 'lat': 31.737642} - def lng = 121.810877 - def lat = 31.737642 +// def lng = 121.810877 +// def lat = 31.737642 List pois = GaoDeUtils.searchNearDtoByPoi(city, types, lng, lat, 1000, "") if (CollectionUtils.isNotEmpty(pois)) { String jsonStr = JSONObject.toJSONString(pois) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 50ac505aa..17b02bb6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -146,13 +146,13 @@ class GaoDeUtils { while (result.size() < count) { params.page = "${page}".toString() page++ - //params.key = this.getGaodeKey("v3/place/around") - params.key = "25b2d459fd133e22f8abcebeac972692" + params.key = this.getGaodeKey("v3/place/around") + //params.key = "25b2d459fd133e22f8abcebeac972692" params.offset = "100" JSONObject json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/around", params); if (json == null) { - //params.key = this.getGaodeKey("v3/place/around") - params.key = "25b2d459fd133e22f8abcebeac972692" + params.key = this.getGaodeKey("v3/place/around") + //params.key = "25b2d459fd133e22f8abcebeac972692" params.offset = "100" json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/around", params); }