diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy index dabf9a38b..40fe526e8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/Watcher.groovy @@ -2,38 +2,36 @@ package com.fangjia.script public enum Watcher { //离职同事 - LiuPeiPei('13621626685', 'duxiaoyu@fangjia.com'), - YanZhou('13621626685','duxiaoyu@fangjia.com'), - HuangXiaoHu('13621626685', 'duxiaoyu@fangjia.com'), - SongYingXia('13621626685', 'duxiaoyu@fangjia.com'), - YuKai('13621626685', 'duxiaoyu@fangjia.com'), - RuanYaDong('13621626685', 'duxiaoyu@fangjia.com'), - Reda('13621626685', 'duxiaoyu@fangjia.com'), - Tomzhao('13621626685','duxiaoyu@fangjia.com'), - YuHai('13621626685','duxiaoyu@fangjia.com'), - Shibb('13621626685','duxiaoyu@fangjia.com'), - HeLvYuan('13621626685','duxiaoyu@fangjia.com'), - WangYuHui('13621626685','duxiaoyu@fangjia.com'), - LinXiaoShuai('15801810393','linxiaoshuai@fangjia.com'), - FangRui('17717680589','fangrui@fangjia.com'), - //DuXiaoYu('13621626685', 'duxiaoyu@fangjia.com'), + LiuPeiPei('13621626685', 'wangwenyan@fangjia.com'), + YanZhou('13621626685','wangwenyan@fangjia.com'), + HuangXiaoHu('13621626685', 'wangwenyan@fangjia.com'), + SongYingXia('13621626685', 'wangwenyan@fangjia.com'), + YuKai('13621626685', 'wangwenyan@fangjia.com'), + RuanYaDong('13621626685', 'wangwenyan@fangjia.com'), + Reda('13621626685', 'wangwenyan@fangjia.com'), + Tomzhao('13621626685','wangwenyan@fangjia.com'), + YuHai('13621626685','wangwenyan@fangjia.com'), + Shibb('13621626685','wangwenyan@fangjia.com'), + HeLvYuan('13621626685','wangwenyan@fangjia.com'), + WangYuHui('13621626685','wangwenyan@fangjia.com'), + LinXiaoShuai('15801810393','wangwenyan@fangjia.com'), + FangRui('17717680589','wangwenyan@fangjia.com'), + DuXiaoYu('13621626685', 'wangwenyan@fangjia.com'), //在职同事 - DuXiaoYu('13916076378', 'wangwenyan@fangjia.com'), - LiXue('13311649646','lixue@fangjia.com'), + LiXue('13311649646','wangwenyan@fangjia.com'), WangWenYan('13916076378','wangwenyan@fangjia.com'), GaoJuan('15021384995','gaojuan@fangjia.com'), - Hubingliang('15179856208','hubingliang@126.com'), - ZhouTongYun('13585834921','zhoutongyun@fangjia.com'), - YinJiHuan('18217642009','yinjihuan@fangjia.com'), - Xuhe('13862416422','xuhe@fangjia.com'), - ZongZhiMin('18260046486','zongzhimin@fangjia.com'), - RaoYanHui('18516539752','raoyanhui@fangjia.com'), - BaYi('15300424133','bayi@fangjia.com'), - WeiLei('18101751850','weilei@fangjia.com'), - JiangYaHui('13684913780','jiangyahui@fangjia.com'), - ShenJian('13764369683', 'shenjian@fangjia.com'), - MaJinTao('13607600062','majintao@fangjia.com') + Hubingliang('15179856208','wangwenyan@fangjia.com'), + ZhouTongYun('13585834921','wangwenyan@fangjia.com'), + YinJiHuan('18217642009','wangwenyan@fangjia.com'), + Xuhe('13862416422','wangwenyan@fangjia.com'), + ZongZhiMin('18260046486','wangwenyan@fangjia.com'), + RaoYanHui('18516539752','wangwenyan@fangjia.com'), + BaYi('15300424133','wangwenyan@fangjia.com'), + WeiLei('18101751850','wangwenyan@fangjia.com'), + JiangYaHui('13684913780','wangwenyan@fangjia.com'), + ShenJian('13764369683', 'shenjian@fangjia.com') private final String mobile; private final String email; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy index 6212900b5..a0ed5c281 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dailyCount/ApiDailyCount.groovy @@ -27,8 +27,8 @@ class ApiDailyCount extends BaseBatch{ private static final Jms jms = Jms.create('tcp://monitor.jms.db.fangjia.com:61616') def static emails = [ - 'xuqi@fangjia.com', - 'zongzhimin@fangjia.com' + 'wangwenyan@fangjia.com', + 'gaojuan@fangjia.com' ] static void main(String[] args){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index 621b548e7..c40aca736 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -52,9 +52,9 @@ class YouDaDataParser { static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//友达一手房存入mongo - task.esfParser("D:\\数据\\友达\\2024年1月\\查询1.DBF");//友达二手房存入mongo +// task.esfParser("D:\\数据\\友达\\2024年2月\\查询1.DBF");//友达二手房存入mongo // task.newhouseToSaveEs();//新房保存到es -// task.esfhouseToSaveEs();//二手房保存到es + task.esfhouseToSaveEs();//二手房保存到es // task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间 } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy index 7d683c976..1196b6bd2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/GuangdaTest.groovy @@ -18,7 +18,44 @@ DBCollection development_zone_CONN = MongoUtils.getCollectionByName2("fangjia", DBCollection community_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) -def filePath = "D:\\数据\\光大\\全量.xlsx" +def filePath = "D:\\数据\\南京\\南京银行测试-新跑.xlsx" +ExcelUtils.multiThreadingModify(filePath, { row -> + def communityObj = null + if(row['E']){ + communityObj = findCommunityTown(community_CONN, row['C'], row['D'], row['E']) + } + if(communityObj){ + row['M'] = communityObj.province_code + row['N'] = communityObj.city_code + row['O'] = communityObj.area_code + row['P'] = communityObj.street_code + } + if(row['D']){ + if(row['D'].toString().endsWith("区")){ + row['F'] = "非农" + }else{ + if(communityObj){ + if(communityObj.has_gov && communityObj.has_gov=="是"){ + row['I'] = "是" + row['F'] = "非农" + }else{ + row['I'] = "否" + if(row['E']){ + def townObj = isTown(row['C'], row['D'], row['E']) + if(townObj){ + row['J'] = "是" + row['F'] = "非农" + }else{ + row['F'] = "农" + } + } + } + } + } + } + +}); +//def filePath = "D:\\数据\\光大\\全量.xlsx" //ExcelUtils.modify(filePath, { row -> // if(!row['O']){ // def jsonObj = FangjiaClientUtils.villageIdentify(null, row['A']) @@ -62,19 +99,19 @@ def filePath = "D:\\ // } // } - def retMap = SignatureUtils.getAliAddressStrc(row['A']) - println row['A'] +" " + retMap.toString() - if(retMap){ - row['Y'] = retMap.prov - row['Z'] = retMap.city - row['AA'] = retMap.district - row['AB'] = retMap.town - row['AC'] = retMap.devzone - row['AD'] = retMap.road - row['AE'] = retMap.roadno - row['AF'] = retMap.poi - row['AG'] = retMap.subpoi - } +// def retMap = SignatureUtils.getAliAddressStrc(row['A']) +// println row['A'] +" " + retMap.toString() +// if(retMap){ +// row['Y'] = retMap.prov +// row['Z'] = retMap.city +// row['AA'] = retMap.district +// row['AB'] = retMap.town +// row['AC'] = retMap.devzone +// row['AD'] = retMap.road +// row['AE'] = retMap.roadno +// row['AF'] = retMap.poi +// row['AG'] = retMap.subpoi +// } // }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy index d5d8303d5..cfda2228d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy @@ -66,8 +66,10 @@ class GaoDePoiDataProcess extends BaseBatch{ @Override void process(Object args) { // println ProvinceData.getProvince("成都") - synchMapPoi(); -// synchCompany() +// synchMapPoi(); + + + synchCompany() // poiCatProcess() // addressAndCatProcess() // synchNetwork() @@ -99,10 +101,10 @@ class GaoDePoiDataProcess extends BaseBatch{ def synchCompany(){ fullCityMap = CommonDatautils.queryFullNameCity() //"三明市","宁德市","泉州市","厦门市","福州市","漳州市","南平市","龙岩市","莆田市", - def citys = ["湖州市"] + def citys = ["杭州","宁波","温州","嘉兴","台州","绍兴","金华","舟山","衢州","丽水"] for(def sampleCity : citys){ - def cityObj = fullCityMap.get("湖州"); + def cityObj = fullCityMap.get(sampleCity); def city = null if(cityObj){ city = cityObj.city @@ -112,6 +114,7 @@ class GaoDePoiDataProcess extends BaseBatch{ println city+ " 加载公司数据:"+companyDatas.size() def rows = running(city, companyDatas, "company", townMap) save(city, rows) +// saveToMG(city, rows) println "完成" } } @@ -182,7 +185,7 @@ class GaoDePoiDataProcess extends BaseBatch{ def createCompanyData(map, townMap){ def retMap = [:] - retMap._id = map._id + retMap.data_id = map._id.toString() retMap.fjw_province = map.province_name retMap.fjw_city = map.city_name diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy index 7c9ed802c..33e407462 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy @@ -26,8 +26,8 @@ class SynchDistrictPrice extends BaseBatch{ // "吉屋":"吉屋","365淘房":"365淘房","我爱我家":"我爱我家","诸葛找房APP":"诸葛找房","贝壳":"贝壳找房","链家":"链家","Q房":"Q房","麦田":"麦田", // "中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","乐有家":"乐有家","C21":"C21","城市房产":"城市房产","兔博士PC端":"兔博士" -// def esSources = ["我爱我家":"我爱我家","兔博士PC端":"兔博士","吉屋":"吉屋","贝壳找房":"贝壳找房","乐有家":"乐有家","365淘房":"365淘房","诸葛找房APP":"诸葛找房","链家":"链家","Q房":"Q房","麦田":"麦田","中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","C21":"C21","城市房产":"城市房产"] - def esSources = ["我爱我家":"我爱我家","兔博士PC端":"兔博士","吉屋":"吉屋","贝壳找房":"贝壳找房","乐有家":"乐有家","365淘房":"365淘房","诸葛找房APP":"诸葛找房","链家":"链家","Q房":"Q房","麦田":"麦田","中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","C21":"C21","城市房产":"城市房产","幸福里APP":"幸福里"] +// def esSources = ["搜房":"搜房"] + def esSources = ["我爱我家":"我爱我家","兔博士PC端":"兔博士","吉屋":"吉屋","贝壳找房":"贝壳找房","乐有家":"乐有家","365淘房":"365淘房","诸葛找房APP":"诸葛找房","链家":"链家","Q房":"Q房","麦田":"麦田","中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","C21":"C21","城市房产小程序":"城市房产","幸福里APP":"幸福里"] static main(args) { runBatch(new SynchDistrictPrice(), args); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zongzhimin/ApiDailyCountOfficialAccount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zongzhimin/ApiDailyCountOfficialAccount.groovy index 4d695b799..366adad0f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zongzhimin/ApiDailyCountOfficialAccount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zongzhimin/ApiDailyCountOfficialAccount.groovy @@ -27,8 +27,7 @@ class ApiDailyCountOfficialAccount extends BaseBatch{ private static final Jms jms = Jms.create('tcp://monitor.jms.db.fangjia.com:61616') def static emails = [ - 'xuqi@fangjia.com', - 'zongzhimin@fangjia.com' + 'wangwenyan@fangjia.com' ] static void main(String[] args){