From 65b8edb112b14914dbfa8d78359f4cd94308be56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Mon, 17 May 2021 10:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E4=BD=8D=E6=AF=94?= =?UTF-8?q?=E5=8F=8A=E7=BB=BF=E5=8C=96=E7=8E=87=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/temp/shenjian/cqrcb/POIRule.groovy | 5 +++++ .../temp/shenjian/cqrcb/SeaweedExport.groovy | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy index ca637b48e..e6ab78d3d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/POIRule.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.temp.shenjian.cqrcb +import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection @@ -18,6 +19,10 @@ class POIRule { static DBCollection poiConn = MongoUtils.getCollectionByName("address_analytics", "gaode_address_poi", "192.168.0.43", 28017) static void main(String[] args) { + + } + + static void changeSchool() { // СѧУתΪѧУ poiConn.find(new BasicDBObject("typecode", "141203").append("status", 0)).batchSize(1000).each {obj -> if (obj.name.indexOf('СѧУ') != -1 ) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy index 69638ec6f..e5e264415 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/cqrcb/SeaweedExport.groovy @@ -1,6 +1,8 @@ package com.fangjia.script.temp.shenjian.cqrcb import com.fangjia.core.util.DateUtil +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.datastore.FieldValidatorUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils @@ -85,9 +87,6 @@ class SeaweedExport { ret[0] = obj.developer ret[1] = obj.estate_company ret[2] = obj.cubage_percent - if (obj.developer == 'ÖØÇì»ã¿­ÖÃÒµÓÐÏÞ¹«Ë¾') { - println('ÖØÇì»ã¿­ÖÃÒµÓÐÏÞ¹«Ë¾') - } ret[3] = virescencePercentValidator(obj.virescence_percent) if (obj.alias) { @@ -99,7 +98,17 @@ class SeaweedExport { ret[4] = temp.join(",") } ret[5] = obj.car_site_count - ret[6] = "" + if (com.fangjia.script.datastore.FieldValidatorUtils.householdCountValidator(obj.household_count) + && FieldValidatorUtils.carSiteValidator(obj.car_site_count)) { + double val = DataHandleUtils.getDoubleRound(1, (Double.valueOf(obj.car_site_count) / Double.valueOf(obj.household_count))) + if (val == 0.0) { + val = DataHandleUtils.getDoubleRound(2, (Double.valueOf(obj.car_site_count) / Double.valueOf(obj.household_count))) + } + if (val == 0.0) { + val = DataHandleUtils.getDoubleRound(3, (Double.valueOf(obj.car_site_count) / Double.valueOf(obj.household_count))) + } + ret[6] = "1:" + val + } ret[7] = "" ret[8] = obj.all_area ret[9] = obj.loudong_count @@ -146,7 +155,7 @@ class SeaweedExport { def value = com.fangjia.script.datastore.DistrictFieldNumberic.checkValue(virescence_percent); if(value){ if(value>=10 && value<=100){ - return value; + return com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, Double.valueOf(value)) } else if (value > 0 && value < 1) { return com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, Double.valueOf(value) * 100) } else{