From d2e1b37b566578c608da5b59080ce6e0c01df33e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:48:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=99=E5=95=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/zsbank/BasicInfoDataSynch.groovy | 56 ++++++++++++++++++- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy index 69a998c48..4cdcf5656 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy @@ -9,6 +9,8 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject +import com.mongodb.QueryOperators + /** * 浙商本地化部署å�Œæ­¥è„šæœ¬ */ @@ -186,8 +188,57 @@ class BasicInfoDataSynch extends BaseBatch{ println "[${fjTowns.size()}]个乡镇å�Œæ­¥å®Œæˆ�" } def synchDict(){ + def dbcursor = ZS_DICT_CONN.find(new BasicDBObject()).sort(new BasicDBObject("version",-1)).limit(1) + def maxObj = null + for(def dbo : dbcursor){ + maxObj = dbo + } + def version = 1 + if(maxObj && maxObj.version){ + version = maxObj.version + 1 + } + + def fjDicts = CommonDatautils.getAllDictionary() - def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) + + def deleteQuery = new BasicDBObject() + if(maxObj && maxObj.version){ + deleteQuery.put("version", maxObj.version) + }else{ + deleteQuery.put("version", new BasicDBObject(QueryOperators.EXISTS, false)) + } + ZS_DICT_CONN.remove(deleteQuery) + + if(fjDicts) { + def addDatas = [] + for (def fjDict : fjDicts) { + def udata = new BasicDBObject() + udata.put("cat",fjDict.cat) + udata.put("name",fjDict.name) + if(fjDict.address_components){ + udata.put("address_components", fjDict.address_components) + } + udata.put("status",0) + udata.put("update_date",new Date().getTime()) + udata.put("version", version) + udata.put("_id",fjDict._id) + addDatas << udata + if(addDatas.size()%10000==0){ + println addDatas.size()/10000 +" 10000" + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } + if(addDatas.size()>0){ + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } + + + + + /* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) def zsDicts = [] def zsDictMap = [:] def fjDictMap = [:] @@ -205,6 +256,7 @@ class BasicInfoDataSynch extends BaseBatch{ udata.put("name",fjDict.name) udata.put("status",0) udata.put("update_date",new Date().getTime()) + udata.put("version", version) if(zsDictObj){ if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){ ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata)) @@ -235,7 +287,7 @@ class BasicInfoDataSynch extends BaseBatch{ ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata)) } } - } + }*/ println "[${fjDicts.size()}]个字典数æ�®å�Œæ­¥å®Œæˆ�" } def synchDistrict(cat){ From b252cfa765adf95db7bed378756f18c349d1e5fa Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:49:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E9=81=93=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index e07d6eff0..844282d7e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -53,10 +53,11 @@ class GaoDeMapCrawl extends BaseBatch{ // def prefix = "district_" // def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//סլÏà¹Ø -// def categorys = ["190301"]//µÀ·Ïà¹Ø + def prefix = "road_" + def categorys = ["190301"]//µÀ·Ïà¹Ø - def prefix = "village_" - def categorys = ["190108","190109"]//´åׯ +// def prefix = "village_" +// def categorys = ["190108","190109"]//´åׯ def totalCount = new AtomicLong() static main(args) { @@ -114,7 +115,7 @@ class GaoDeMapCrawl extends BaseBatch{ def run(){//,"Î÷°²","ÖØÇì" - def citys = ["ÖØÇì","¹þ¶û±õ","ÉòÑô","¶«Ý¸","Äϲý","À¥Ã÷","½ð»ª","ÎÂÖÝ","×Ͳ©","Õ¿½­","ÕØÇì","Ò˲ý","ÔÀÑô","°²Çì","Îߺþ","Î÷Äþ","ÈÕÕÕ","³£µÂ","ÕżҿÚ","±±¾©","ÉϺ£","¹ãÖÝ","ÉîÛÚ","ÖØÇì","Ö£ÖÝ","³¤É³","Î÷°²","³É¶¼","¶«Ý¸","·ðɽ","º¼ÖÝ","ºÏ·Ê","ÄϾ©","Çൺ","ÉòÑô","ËÕÖÝ","Ìì½ò","Î人","Ö麣","ÖÐɽ","³¤´º","ÑïÖÝ","ÑĮ̀","ÐìÖÝ","ÎÞÎý","ÎÂÖÝ","̫ԭ","̨ÖÝ","ʯ¼Òׯ","ÉÜÐË","ÏÃÃÅ","ȪÖÝ","Äþ²¨","ÄÏͨ","ÄÏÄþ","Äϲý","À¼ÖÝ","³£ÖÝ","´óÁ¬","¸£ÖÝ","¹óÑô","¹þ¶û±õ","º£¿Ú","»ÝÖÝ","¼ÃÄÏ","¼ÎÐË","½ð»ª","À¥Ã÷","×ñÒå","×Ͳ©","ÖêÖÞ","Õò½­","ÕØÇì","ÕÄÖÝ","Õ¿½­","ÔÀÑô","Òø´¨","Ò˲ý","ÑγÇ","Îߺþ","ÎÚ³ľÆë","ÌÆÉ½","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇåÔ¶","ÇØ»Êµº","Âí°°É½","ÂåÑô","ÁøÖÝ","Á¬ÔƸÛ","ÀÈ·»","¾Å½­","¼ªÁÖ","»´°²","ºþÖÝ","ºôºÍºÆÌØ","²×ÖÝ","±£¶¨","°²Çì","ÕżҿÚ","Î÷Äþ","ÈÕÕÕ","À­Èø","½õÖÝ","´óͬ","³£µÂ","±±º£","ÎIJý","ÁêË®","±£Í¤"] + def citys = ["ÉϺ£","ÖØÇì","¹þ¶û±õ","ÉòÑô","¶«Ý¸","Äϲý","À¥Ã÷","½ð»ª","ÎÂÖÝ","×Ͳ©","Õ¿½­","ÕØÇì","Ò˲ý","ÔÀÑô","°²Çì","Îߺþ","Î÷Äþ","ÈÕÕÕ","³£µÂ","ÕżҿÚ","±±¾©","¹ãÖÝ","ÉîÛÚ","ÖØÇì","Ö£ÖÝ","³¤É³","Î÷°²","³É¶¼","¶«Ý¸","·ðɽ","º¼ÖÝ","ºÏ·Ê","ÄϾ©","Çൺ","ÉòÑô","ËÕÖÝ","Ìì½ò","Î人","Ö麣","ÖÐɽ","³¤´º","ÑïÖÝ","ÑĮ̀","ÐìÖÝ","ÎÞÎý","ÎÂÖÝ","̫ԭ","̨ÖÝ","ʯ¼Òׯ","ÉÜÐË","ÏÃÃÅ","ȪÖÝ","Äþ²¨","ÄÏͨ","ÄÏÄþ","Äϲý","À¼ÖÝ","³£ÖÝ","´óÁ¬","¸£ÖÝ","¹óÑô","¹þ¶û±õ","º£¿Ú","»ÝÖÝ","¼ÃÄÏ","¼ÎÐË","½ð»ª","À¥Ã÷","×ñÒå","×Ͳ©","ÖêÖÞ","Õò½­","ÕØÇì","ÕÄÖÝ","Õ¿½­","ÔÀÑô","Òø´¨","Ò˲ý","ÑγÇ","Îߺþ","ÎÚ³ľÆë","ÌÆÉ½","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇåÔ¶","ÇØ»Êµº","Âí°°É½","ÂåÑô","ÁøÖÝ","Á¬ÔƸÛ","ÀÈ·»","¾Å½­","¼ªÁÖ","»´°²","ºþÖÝ","ºôºÍºÆÌØ","²×ÖÝ","±£¶¨","°²Çì","ÕżҿÚ","Î÷Äþ","ÈÕÕÕ","À­Èø","½õÖÝ","´óͬ","³£µÂ","±±º£","ÎIJý","ÁêË®","±£Í¤"] // def citys = CommonUtils.findAllCity() def totalCount = 0; for(def city : citys){ From 6f50888ba8f606e4a28cd921569dda0fe49b58a2 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:50:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=AB=98=E5=BE=B7key=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/paimai/GaoDeUtils.groovy | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy index 81837c698..4313382e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy @@ -502,18 +502,21 @@ class GaoDeUtils { } static String getRandomKey2() { - def KeyList = [ - "2af0b8533415a612b98d59bb93d664b9", - "0246c57bbcf24aa246c207b3c99dfe41", - "042328b3f0fa5daf426802d379521d87", - "055d4f1b5b64a2bce18f4fe1f15c2639", - "d5484f5170502405d88bbaffe1b496f0", - "e74ccc4258079d2200199695110cceb1", - "f58629fc799fbc8537ca85046c6d44a5", - "291073f17ee0b963ccb1927ed92bf265", - "2a1fb75990f2b39f6221e50892dd3988" - ] +// def KeyList = [ +// "2af0b8533415a612b98d59bb93d664b9", +// "0246c57bbcf24aa246c207b3c99dfe41", +// "042328b3f0fa5daf426802d379521d87", +// "055d4f1b5b64a2bce18f4fe1f15c2639", +// "d5484f5170502405d88bbaffe1b496f0", +// "e74ccc4258079d2200199695110cceb1", +// "f58629fc799fbc8537ca85046c6d44a5", +// "291073f17ee0b963ccb1927ed92bf265", +// "2a1fb75990f2b39f6221e50892dd3988" +// ] + def KeyList = [ + "10bcb421d2ee4e51ed9268d6dca58ad1" + ] def count = RandomUtils.nextInt(KeyList.size()) return KeyList.get(count); }