Merge branch 'script_gj' into 'master'

update

See merge request !918
This commit is contained in:
2024-08-21 20:47:50 +08:00
7 changed files with 49 additions and 10 deletions
@@ -7,7 +7,7 @@ public interface Constants {
String FANGJIA_CRAWL_MONGO_URI = "mongodb://192.168.0.235:27018";
String LOG_MONGO_URI = "mongodb://192.168.0.42:52002";
String SEABIRD_MONGO_URI = "mongodb://192.168.0.74:57007";
String SEAWATER_MONGO_URI = "mongodb://192.168.0.206:27020";
String SEAWATER_MONGO_URI = "mongodb://root:Goojia%40206!!#@192.168.0.206:27020";
String MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH ="http://192.168.0.100:38080/FangJiaDataService";
}
@@ -9,7 +9,7 @@ import com.mongodb.DBCollection
/**
* 深圳公众号成交数据录入
*/
def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\2024年6月深圳二手房成交.xlsx", 0, 1)
def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\2024年7月深圳二手房成交.xlsx", 0, 1)
def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017";
DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl)
@@ -33,7 +33,7 @@ class DevProcess {
DBCollection DEVELOPMENT_ZONE_43_COLL = MongoUtils.getCollectionByName("fangjia_base", "development_zone", "mongo.db.fangjia.com")
DBCollection ADMINISTRATIVE_MAPPING_COLL = MongoUtils.getCollectionByName("business", "administrative_mapping", "mongo.db.fangjia.com")
DBCollection kfq_COLL = MongoUtils.getCollectionByName("crawl", "kfq_investchn_com", "192.168.0.206",27020)
// DBCollection kfq_COLL = MongoUtils.getCollectionByName("crawl", "kfq_investchn_com", "192.168.0.206",27020)
static main(args) {
def task = new DevProcess();
@@ -25,9 +25,11 @@ class MinglujiData {
}
def run(){
// exportDatas("湖州")
exportDatas("嘉兴")
// matchDev("浙江省","湖州")
matchCommunity("湖州")
// matchCommunity("湖州")
// tempMatchDev("浙江省")
}
def exportDatas(city){
def datas = findMinglujiDatas(city)
@@ -66,8 +68,41 @@ class MinglujiData {
})
}
def tempMatchDev(prov){
def devs = loadAllDevs(prov)
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\湖州-开发区-等级.xlsx",{d->
if(d['U'] && !d['W'] ){
def obj = findDevByName(d['U'])
if(!obj){
obj = findDevByAlias(d['U'])
if(!obj){
obj = findDebBySimlar(devs, d['U'], d['B'])
if(!obj){
obj = findDevByPark(d['A'], d['B'], d['U'])
if (!obj) {
}else{
d['X'] = "园区"
}
}else{
d['X'] = "相似"
}
}else{
d['X'] = "别名"
}
}else{
d['X'] = "相同"
}
if(obj){
d['W'] = obj.name
d['Y'] = obj.city
d['Z'] = obj.district
}
}
})
}
def matchCommunity(city){
ExcelUtils.modify("D:\\数据\\数据建设\\名录集\\${city}-没配居委1.xlsx",{d->
ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\名录集\\${city}-没配居委1.xlsx",{d->
if(d['A'] && d['B'] && d['L'] && !d['Q']){
def list = findCommunityByName(d['A'], d['B'], d['L'])
if(!list){
@@ -27,7 +27,7 @@ class QiliangTest {
// task.run()
def data = [
'address': '景县开发区东区',
'address': '湖州市南太湖高新技术产业园区大港村陈家斗80号',
'type': '1' //1:对公 0:对私
]
def s = task.getProxyResult(data);
@@ -126,8 +126,7 @@ class GaoDePoiDataProcess extends BaseBatch{
}
def sysnchVillage(){
def buducitys = [ '七台河市', '上海市','万宁市', '三亚市', '三明市', '三门峡市', '上饶市', '东方市', '东莞市',
'东营市', '中卫市', '中山市', '临夏回族自治州', '临汾市', '临沂市', '临沧市', '临高县', '丹东市',
def buducitys = [ '临汾市', '临沂市', '临沧市', '临高县', '丹东市',
'丽水市', '丽江市', '乌兰察布市', '乌海市', '乌鲁木齐市', '乐东黎族自治县', '乐山市', '九江市',
'云浮市', '五家渠市', '五指山市', '亳州市', '仙桃市', '伊春市', '伊犁哈萨克自治州', '佛山市',
'佳木斯市', '保亭黎族苗族自治县', '保定市', '保山市', '信阳市', '儋州市', '克孜勒苏柯尔克孜自治州',
@@ -169,7 +168,8 @@ class GaoDePoiDataProcess extends BaseBatch{
'黔东南苗族侗族自治州', '黔南布依族苗族自治州', '黔西南布依族苗族自治州', '齐齐哈尔市', '龙岩市']
//"丽水市","杭州市",
def runbuducitys = ["湖州市","宁波市","温州市","嘉兴市","台州市","绍兴市","金华市","舟山市","衢州市"]
def runbuducitys = ["湖州市","宁波市","温州市","嘉兴市","台州市","绍兴市","金华市","舟山市","衢州市",'七台河市', '上海市','万宁市', '三亚市', '三明市', '三门峡市', '上饶市', '东方市', '东莞市',
'东营市', '中卫市', '中山市', '临夏回族自治州']
for(def city : buducitys){
if(runbuducitys.contains(city)){
continue
@@ -71,6 +71,10 @@ class MongoUtils {
return com.fangjia.core.util.MongoUtils.getDbCollection(Constants.TEST_FANGJIA_MONGO_URI, db, name)
}
if ((domainUrl == "192.168.0.206") && (port == 27020)) {
return com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI, db, name)
}
def key = db + name + domainUrl + port
if (collectionMap.containsKey(key)) {
return collectionMap[key]