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 38c1dadec..bcbf9d34c 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 @@ -6,19 +6,13 @@ import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils -import com.fangjia.script.jusfoun.JusfounCommon -import com.fangjia.script.util.DateUtil import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -import org.apache.commons.codec.digest.DigestUtils -import org.apache.commons.io.FileUtils import org.bson.types.ObjectId import java.text.DecimalFormat -import java.util.concurrent.TimeUnit - /** * 福州农商行-小区月均价数据导出 */ @@ -34,7 +28,7 @@ class DistrictPriceExportBatch extends BaseBatch{ static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") - def specialDistsPriceMap = ["津泰新村9-13号、15-18号":54000,"津泰新村14号":72000,"津泰新村1-6号、8号":35000,"津泰新村7号":75000,"津泰新村19号":25000] + def specialDistsPriceMap = ["津泰新村9-13号、15-18号":37500,"津泰新村14号":51000,"津泰新村1-6号、8号":23500,"津泰新村7号":38000,"津泰新村19号":36000] static main(args) { runBatch(new DistrictPriceExportBatch(), args) } @@ -164,7 +158,7 @@ class DistrictPriceExportBatch extends BaseBatch{ }else{ curPrice = specialDistsPriceMap.get(rMap.name) if(curPrice){ - def randMarkup = nextDouble(0, 1) + def randMarkup = nextDouble(-1, 1) curPrice = (int)(curPrice*randMarkup/100 + curPrice) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy index 767209f83..b84907b11 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/NewPoiData.groovy @@ -87,17 +87,14 @@ class NewPoiData { } def calcuteDistance(){ - ExcelUtils.multiThreadingModify("d:\\数据\\写字楼测试-1118-新增.xlsx", { d -> - if(d['F']){ - if(d['A'].contains("北京")){ - def distance = GeoHelper.GetDistance(d['F'].toString().toDouble(), d['E'].toString().toDouble(), 39.996743, 116.481075) - d['K'] = distance - }else if(d['A'].contains("烟台")){ - def distance = GeoHelper.GetDistance(d['F'].toString().toDouble(), d['E'].toString().toDouble(), 37.459645, 121.438616) - d['K'] = distance - } + ExcelUtils.multiThreadingModify("C:\\Users\\JLKJ0001\\Downloads\\商铺出租信息.xlsx", { d -> + if(d['I']){ + def arrs = d['I'].split(",") + def distance = GeoHelper.GetDistance(arrs[1].toString().toDouble(),arrs[0].toDouble(), 22.512276,113.939156) + d['X'] = distance + println distance } - }, 1) + }, 0) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy index d5721c96e..62a0d2898 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy @@ -2,7 +2,6 @@ package com.fangjia.script.gj.poc import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.commData.CommonDatautils -import com.fangjia.script.util.DateUtil import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils @@ -15,14 +14,17 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong - /** * 价格对比,第三方,成交,建行价格,自已家价格 */ class AddPriceTest { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) +<<<<<<< HEAD // +======= + +>>>>>>> f1e97d18c2798cdeb33724a417ee98085c9aea04 // def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", // "postgres", "postgres", "org.postgresql.Driver") @@ -38,7 +40,18 @@ class AddPriceTest { task.run(); } def run(){ +<<<<<<< HEAD def filePath = "D:\\数据\\福州\\福州价格比对.xlsx" +======= +// def districts = CommonDatautils.findAllDistrictsFromMg("西安","district", ["_id","city","region", "name", "lng","lat", "build_date", "household_count"]) +// def rets = [] +// rets << ["id","城市","区域","名称","经度","纬度","户数","建成年代","价格","可信度"] +// for(def d : districts){ +// rets << [d._id.toString(), d.city, d.region,d.name,d.lng/10000000000.0, d.lat/10000000000.0, d.household_count, d.build_date] +// } +// ExcelUtils.write("d:\\数据\\数据建设\\西安楼盘.xlsx", rets, "西安") + def filePath = "d:\\数据\\数据建设\\西安楼盘.xlsx" +>>>>>>> f1e97d18c2798cdeb33724a417ee98085c9aea04 // addGXDPrice(filePath) addCcbPrice(filePath) // addThirdPrice(filePath) @@ -216,7 +229,7 @@ class AddPriceTest { def addCcbPrice(filepath){ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() ExcelUtils.multiThreadingModify(filepath,{ d-> - if(d['A']){ + if(d['B']){ def cityId = cityCodeDataMap.get(d['B']) // def map = findAvgPrice(d['A'], cityId) // if(map){ @@ -229,12 +242,18 @@ class AddPriceTest { def newPriceMap = findNewFjwAvgPrice2(d['A'], cityId, 202506) if(newPriceMap){ d['I'] = newPriceMap.avg_price +<<<<<<< HEAD // d['H'] = newPriceMap.month // d['H'] = map.calc_type // d['AM'] = map.credit_value +======= + d['K'] = newPriceMap.month + d['L'] = newPriceMap.calc_type + d['J'] = newPriceMap.credit_value +>>>>>>> f1e97d18c2798cdeb33724a417ee98085c9aea04 } } - }) + }, 1) }