diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index 2439e06d8..b9a415811 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -28,7 +28,7 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class BigdataCommunityBatch extends BaseBatch{ - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(1) static main(args) { runBatch(new BigdataCommunityBatch(), args); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy index 27732efd9..73b4cf4b0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy @@ -68,7 +68,6 @@ class BigdataForsaleBatch extends BaseBatch{ public void process(Object args) { def index = 0 def citys = CcbCommonUtils.getRunningCitys(args) - def citys = ["阿坝州"]//CcbCommonUtils.getRunningCitys(args) def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() for(def city : citys){ index++ 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 46aa81fac..d9d7660c0 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 @@ -16,7 +16,7 @@ import groovy.sql.Sql class CcbCommonUtils { // - public static def citys_all = [ "长春","上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"] + public static def citys_all = [ "上海","长春","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"] public static def citys_92 = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"] public static def citys_252 = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index e987ea5af..6326f35f4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -446,6 +446,10 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business //// } ////},0) // + +ExcelUtils.modify("D:\\数据\\建行\\二期\\重庆无效小区_3159.xlsx",{d-> +},0) + // // // @@ -1001,30 +1005,30 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business -def fileName = "D:\\数据\\建行\\房产估值\\指导价\\人工指导价录入_1020.xlsx" - -ExcelUtils.multiThreadingModify(fileName, {d-> - if(d['A']){ -// def region = RegionData.formatRegion(d['A'], d['B']) -// if(region){ -// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") +//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\人工指导价录入_1020.xlsx" +// +//ExcelUtils.multiThreadingModify(fileName, {d-> +// if(d['A']){ +//// def region = RegionData.formatRegion(d['A'], d['B']) +//// if(region){ +//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") +//// if(dist){ +//// d['E'] = dist.region +//// d['F'] = dist._id.toString() +//// } +//// } +// if(!d['F']){ +// def dist = CommonDatautils.findDistrictById(d['A']) +//// // if(dist){ -// d['E'] = dist.region -// d['F'] = dist._id.toString() +//// d['H'] = dist.region +//// d['G'] = dist.name +// d['F'] = dist.status // } // } - if(!d['F']){ - def dist = CommonDatautils.findDistrictById(d['A']) // - if(dist){ -// d['H'] = dist.region -// d['G'] = dist.name - d['F'] = dist.status - } - } - - } -},0) +// } +//},0) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy index 1656648bd..638323257 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy @@ -1,15 +1,597 @@ package com.fangjia.script.ccbevaluation.ronghe import com.fangjia.script.BaseBatch +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBObject +import org.apache.commons.lang.StringUtils +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong class BigdataCitypriceBatch extends BaseBatch{ + public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"]; + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) + static main(args) { runBatch(new BigdataCitypriceBatch(), args) } @Override void process(Object args) { + def citys = CcbCommonUtils.getRunningCitys(args) + def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger(); + def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger(); + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +// cityRun(citys, startDate, endDate, cityCodeDataMap) +// regionRun(citys, startDate, endDate, cityCodeDataMap) + districtRun(citys, startDate, endDate, cityCodeDataMap) } + + def cityRun(citys, startDate, endDate, cityCodeDataMap){ + def rets = [] + def index = 0 + for(def city : citys){ + index ++ + def row = createDatas(city, null, startDate, endDate, cityCodeDataMap, null) + if(row){ + rets << row + } + println "[ ${index} ]"+city+" 完成 " + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_CITYPRICE.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); + println "BIGDATA_CITYPRICE 数据文件输出完成......" + } + + + def regionRun(citys, startDate, endDate, cityCodeDataMap){ + def regionDatas = [] + for(def c : citys) { + def regionMap = CcbCommonUtils.findAllDistrictCodeValue(c) + regionMap.each{region, regionCodeDataMap-> + regionDatas << [c, region, regionCodeDataMap] + } + } + + def rets = new CopyOnWriteArrayList() + def size = regionDatas.size() + final CountDownLatch latch = new CountDownLatch(size) + def totalCount = new AtomicLong() + for(def i = 0;i3){ + sell_avg_price = avgValue(sellMap.avg_price) + sell_avg_area = avgValue(sellMap.area) + sell_avg_total = avgValue(sellMap.total_price) + }else{ + sell_count = 0 + } + } + + def rent_avg_price = null + def rent_avg_area = null + def rent_avg_total = null + def rentStartDate = null + def rent_count = 0 + def rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2) + if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){ + rentDataType = 3 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2) + if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){ + rentDataType = 6 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2) + } + } + if(rentMap){ + rent_count = rentMap.avg_price.size() + if(rent_count>3){ + rent_avg_price = avgValue(rentMap.avg_price) + rent_avg_area = avgValue(rentMap.area) + rent_avg_total = avgValue(rentMap.total_price) + }else{ + rent_count = 0 + } + } + if (sell_avg_price || rent_avg_price) { + def row = [] + row << cityCodeDataMap.get(dist.city) + row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger(); + row << dist._id.toString() + + if (sell_avg_price) { + row << sell_avg_price.toInteger() + } else { + row << '' + } + row << sell_count + + if (rent_avg_price) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_price) + } else { + row << '' + } + row << rent_count + + row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + + if (sell_avg_area) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_area) + } else { + row << '' + } + + if (rent_avg_area) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_area) + } else { + row << '' + } + + if (sell_avg_total) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_total) + } else { + row << '' + } + + if (rent_avg_total) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_total) + } else { + row << '' + } + row << '11' + row << sellDataType + row << rentDataType + row << 1 + row << 'FJW' + return row + } + return null + } + + + def createDatas(city, region , startDate, endDate, cityCodeDataMap, regionCodeDataMap) { + def sellDataType = 1 + def rentDataType = 1 + def sell_count = findHouseCountByType(city, region, "sell", startDate, endDate) + def sell_avg_price = null + def sell_avg_area = null + def sell_avg_total = null + def sellStartDate = null + if (sell_count < 10) { + sellDataType = 3 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate) + if (sell_count < 10) { + sellDataType = 6 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate) + } + } else { + sellStartDate = startDate + } + if (sell_count) { + sell_avg_price = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"avg_price") + sell_avg_area = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"area") + sell_avg_total = findHouseAvgByType(city, region, "sell", sellStartDate, endDate, "total_price") + } + + + def rentStartDate = null + def rent_count = findHouseCountByType(city, region, "rent", startDate, endDate) + if (rent_count < 10) { + rentDataType = 3 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + rent_count = findHouseCountByType(city, region, "sell", startDate, endDate) + if (rent_count < 10) { + rentDataType = 6 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + rent_count = findHouseCountByType(city, region, "sell", rentStartDate, endDate) + } + } else { + rentStartDate = startDate + } + + def rent_avg_price = null + def rent_avg_area = null + def rent_avg_total = null + if (rent_count>=10) { + rent_avg_price = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "avg_price") + rent_avg_area = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "area") + rent_avg_total = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "total_price") + } + + println city +" "+region +" sell: "+ sell_count +" rent: "+rent_count + + if (sell_avg_price || rent_avg_price) { + def row = [] + row << cityCodeDataMap.get(city) + row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger(); + + if(region){ + row << regionCodeDataMap.district_code + } + + if (sell_avg_price) { + row << sell_avg_price.toInteger() + } else { + row << '' + } + + if (rent_avg_price) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_price) + } else { + row << '' + } + + row << sell_count + row << rent_count + row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + row << '11' + + if (sell_avg_area) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_area) + } else { + row << '' + } + + if (rent_avg_area) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_area) + } else { + row << '' + } + + if (sell_avg_total) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_total) + } else { + row << '' + } + + if (rent_avg_total) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_total) + } else { + row << '' + } + + row << 1 + row << sellDataType + row << rentDataType + row << 'FJW' + return row + } + + return null + } + + + def avgValue(def datas){ + def avgValue = null + if(datas){ + avgValue = datas.sum()/datas.size() + } + return avgValue; + } + + def findHouseAvgByType(def city, def region, def cat, def startDate, def endDate, def type){ + String sql = "select avg(${type}) as avg_val from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def val = null + ElasticUtils.executeSqlQuery(sql, { d -> + val = d.avg_val + }) + return val; + } + + def findHouseCountByType(def city, def region, def cat, def startDate, def endDate){ + String sql = "select count(1) as count from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def val = null + ElasticUtils.executeSqlQuery(sql, { d -> + val = d.count + }) + return val; + } + + def findHouseDetail(def city, def region, def cat, def startDate, def endDate, def estate_type2){ + + String sql = "select estate_type,area,avg_price,total_price,name,height,room c from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def avgPrices = [] + def areas = [] + def totalPrices = [] + ElasticUtils.executeSqlQuery(sql,{ seawater-> + def flag = true + if(estate_type2 && estate_type2=="普通住宅"){ + if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){ + flag = false + } + + if(seawater.estate_type&& seawater.estate_type.contains("别墅")){ + flag = false + } + + def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room) + if(vallaFlag){ + flag = false + } + } + if(cat == "rent"){ + if(seawater.avg_price && seawater.avg_price>1000){ + flag = false + } + + if(seawater.avg_price && seawater.avg_price<10){ + flag = false + } + } + if(flag){ + avgPrices << seawater.avg_price + areas << seawater.area + totalPrices << seawater.total_price + } + }) + def retMap = [:] + if(areas){ + retMap.avg_price = avgPrices + retMap.area = areas + retMap.total_price = totalPrices + } + return retMap; + } + + + + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(true).includeUpper(true); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)) + .must(QueryBuilders.termQuery("cat", cat)).must(date_range).must(area_range) + + if(region){ + queryBuilder.must(QueryBuilders.termQuery("region", region)) + } + + if(name || alias){ + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + if(name.contains("弄小区")){ + def newName = name.replace("弄小区","弄") + if(!alias.contains(newName)){ + alias << newName + } + } + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + } + + def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); + + def avgPrices = [] + def areas = [] + def totalPrices = [] + + if(houses){ + for (int k=0;k1000){ + continue + } + + if(seawater.avg_price && seawater.avg_price<10){ + continue + } + } + avgPrices << seawater.avg_price + areas << seawater.area + totalPrices << seawater.total_price + } + } + + def retMap = [:] + if(areas){ + retMap.avg_price = avgPrices + retMap.area = areas + retMap.total_price = totalPrices + } + return retMap; + } + + /** + * 是否是别墅 + * @return + */ + public boolean isVilla(area, name, height, room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + + + + + } 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 64580b128..a4a366773 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 @@ -541,7 +541,7 @@ class ExportDistrictRongHe extends BaseBatch{ allRows.addAll(rets2) }else{ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";// - allRows = createDeal(sql) + allRows.addAll(createDeal(sql)) } } } 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 78537bc39..0722c4464 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 @@ -24,7 +24,7 @@ class FzDataResultStat { static main(args) { def task = new FzDataResultStat() -// task.priceMarkupRun(); + task.priceMarkupRun(); task.regionPriceTrendRun() //// task.margeExcel() // task.saveCsvData() 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 43203f42f..bcbe886de 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_202209.csv") +def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202210.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy index b18f43f40..9d9f4c2d0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy @@ -109,7 +109,8 @@ public class DataUtil { //System.out.println(isCellPhoneNumber("15221169682")); //System.out.println(isCellPhoneNumber("12345611123")); //println getRound(2,125.269); - println formateAddress("苏州","江苏路56号"); +// println formateAddress("苏州","江苏路56号"); + } public static String getHanzi(String s) { @@ -243,7 +244,7 @@ public class DataUtil { return ""; } String regEx = "<[^>]*(>)?"; - return str.replaceAll(regEx, ""); + return str.replaceAll(regEx, " "); } public static Pattern nameTags = Pattern.compile(']*)(\\s|$|>)');