From e04f7c0f431eea99dbb2c168776f74e7912680f6 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 24 Mar 2025 14:21:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/zsbank/DistrictLevelBatch.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy index 6c1344eb9..3e2bb2862 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy @@ -8,9 +8,8 @@ import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection - /** - * 浙商本地化部署å�Œæ­¥è„šæœ¬ + * ÕãÉ̱¾µØ»¯²¿Êðͬ²½½Å±¾ */ @BatchOwner(Watcher.GaoJuan) class DistrictLevelBatch extends BaseBatch{ @@ -31,7 +30,7 @@ class DistrictLevelBatch extends BaseBatch{ def datas = addPriceData(dists, priceMap); datas = calcuteLevel(datas); saveOrUpdateDB(city, datas); - println city +" 楼盘评级å�Œæ­¥å®Œæˆ�" + println city +" Â¥ÅÌÆÀ¼¶Í¬²½Íê³É" } } From 8ae91d49f97c329e4ddf948362788f18e850ddc0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 24 Mar 2025 14:23:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy index 3e2bb2862..99ca37d49 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy @@ -30,7 +30,7 @@ class DistrictLevelBatch extends BaseBatch{ def datas = addPriceData(dists, priceMap); datas = calcuteLevel(datas); saveOrUpdateDB(city, datas); - println city +" Â¥ÅÌÆÀ¼¶Í¬²½Íê³É" + println city +" Â¥ÅÌÆÀ¼¶Í¬²½Íê³É!" } } From 4928af6da1b170544913c3e584fc107901a16d7d Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 24 Mar 2025 15:03:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E6=8C=89=E5=9F=8E=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/zsbank/DistrictLevelBatch.groovy | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy index 99ca37d49..5f8cd208e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy @@ -16,12 +16,21 @@ class DistrictLevelBatch extends BaseBatch{ public static final def ZS_MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; public static final DBCollection ZS_LEVEL_CONN = MongoUtils.getCollectionByName2("fangjia", "district_analy", ZS_MONGODB_URL) + public static final zsDistLevelMap = [:] + public static final zsDistLevels = [] static main(args) { runBatch(new DistrictLevelBatch(), args); } @Override public void process(Object args) { + + def zsDistLevelCursor = ZS_LEVEL_CONN.find(new BasicDBObject()) + for(def distLevel : zsDistLevelCursor){ + zsDistLevelMap.put(distLevel._id.toString(), distLevel) + zsDistLevels << distLevel + } + def citys = CommonDatautils.findAllCity(); def weekend = DateUtils.getFirstDayOfWeek(new Date()); for(def city : citys){ @@ -92,13 +101,7 @@ class DistrictLevelBatch extends BaseBatch{ } def saveOrUpdateDB(city, datas){ - def zsDistLevelCursor = ZS_LEVEL_CONN.find(new BasicDBObject("city",city)) - def zsDistLevelMap = [:] - def zsDistLevels = [] - for(def distLevel : zsDistLevelCursor){ - zsDistLevelMap.put(distLevel._id.toString(), distLevel) - zsDistLevels << distLevel - } + def newDataMap = [:] def addDatas = [] for(def d : datas){ From 800fbae9bd6dd7ce00e71183c2c26fd7741883f6 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 24 Mar 2025 15:27:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/zsbank/DistrictLevelBatch.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy index 5f8cd208e..9b0e7c63e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy @@ -28,7 +28,7 @@ class DistrictLevelBatch extends BaseBatch{ def zsDistLevelCursor = ZS_LEVEL_CONN.find(new BasicDBObject()) for(def distLevel : zsDistLevelCursor){ zsDistLevelMap.put(distLevel._id.toString(), distLevel) - zsDistLevels << distLevel + zsDistLevels << distLevel._id.toString() } def citys = CommonDatautils.findAllCity(); @@ -132,8 +132,8 @@ class DistrictLevelBatch extends BaseBatch{ ZS_LEVEL_CONN.insert(addDatas); } if(zsDistLevels.size()>0){ - for(def zs : zsDistLevels){ - def newData = newDataMap.get(zs._id.toString()); + for(def zs_id : zsDistLevels){ + def newData = newDataMap.get(zs_id.toString()); if(!newData){ def udata = new BasicDBObject() udata.put("status",1) From 95b98d079387642e67e6495c7fd1400500beebfe Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 24 Mar 2025 15:41:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/zsbank/DistrictLevelBatch.groovy | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy index 9b0e7c63e..43c2826da 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/DistrictLevelBatch.groovy @@ -17,7 +17,6 @@ class DistrictLevelBatch extends BaseBatch{ public static final def ZS_MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; public static final DBCollection ZS_LEVEL_CONN = MongoUtils.getCollectionByName2("fangjia", "district_analy", ZS_MONGODB_URL) public static final zsDistLevelMap = [:] - public static final zsDistLevels = [] static main(args) { runBatch(new DistrictLevelBatch(), args); @@ -28,7 +27,6 @@ class DistrictLevelBatch extends BaseBatch{ def zsDistLevelCursor = ZS_LEVEL_CONN.find(new BasicDBObject()) for(def distLevel : zsDistLevelCursor){ zsDistLevelMap.put(distLevel._id.toString(), distLevel) - zsDistLevels << distLevel._id.toString() } def citys = CommonDatautils.findAllCity(); @@ -101,6 +99,11 @@ class DistrictLevelBatch extends BaseBatch{ } def saveOrUpdateDB(city, datas){ + def zsDistLevels = [] + def zsDistLevelCursor = ZS_LEVEL_CONN.find(new BasicDBObject("city",city)) + for(def distLevel : zsDistLevelCursor){ + zsDistLevels << distLevel._id.toString() + } def newDataMap = [:] def addDatas = [] @@ -138,7 +141,7 @@ class DistrictLevelBatch extends BaseBatch{ def udata = new BasicDBObject() udata.put("status",1) udata.put("update_date",new Date().getTime()) - ZS_LEVEL_CONN.update(new BasicDBObject("_id",zs._id), new BasicDBObject('$set',udata)) + ZS_LEVEL_CONN.update(new BasicDBObject("_id",zs_id), new BasicDBObject('$set',udata)) } } }