diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index e0d0fddff..52ee0ac44 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -223,7 +223,7 @@ public class ComprehensiveQueryController { HouseValueInformationDto houseValueInformation = new HouseValueInformationDto(); RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress()) || StringUtils.isBlank(String.valueOf(model.getSize()))) { + if (StringUtils.isBlank(model.getAddress()) || model.getSize() == null) { mav.setModel(BasicModel.buildBadRequestModel("地址(address),面积(size)为必填字段")); return mav; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java index 52cbca930..22e0b8ec4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseInfomationModel.java @@ -58,7 +58,7 @@ public class HouseInfomationModel extends FangjiaApiModel { /** * 面积 */ - private double size; + private Double size; /** * 所在楼层 @@ -402,11 +402,11 @@ public class HouseInfomationModel extends FangjiaApiModel { this.roomNumber = roomNumber; } - public double getSize() { + public Double getSize() { return size; } - public void setSize(double size) { + public void setSize(Double size) { this.size = size; } 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 d1696dd94..be5714bfd 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 @@ -50,8 +50,7 @@ class CcbCommonUtils { public static def sqlInstance = null - public static def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", - "postgres", "postgres", "org.postgresql.Driver") + public static def pgsqlInstance = null //Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse","postgres", "postgres", "org.postgresql.Driver") public static def getRunningCitys(def args){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy index 41dc71dc3..304f46830 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy @@ -530,6 +530,20 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } } + if(estate_type2 && estate_type2=="别墅"){ + def newName = name + "(别墅)" + if(!alias.contains(newName)){ + alias << newName + } + } + + if(estate_type2 && estate_type2=="商住"){ + def newName = name + "(商住)" + if(!alias.contains(newName)){ + alias << newName + } + } + if(alias && alias.size()>0){ BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); for(def s : alias){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy index 7bd1a3cdb..db468a556 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy @@ -250,7 +250,7 @@ class SeaweedDataSynch extends BaseBatch{ } def updating(city, cat){ - def dists = CommonDatautils.findAllDistrictsFromMg(city, cat, ["city","region","name","address","block","mapping_alias","addr_alias","cat","estate_type2","status","township","lng","lat","build_type","household_count","committee","estate_charge","car_site_count","property_life","house_property","build_area","all_area","build_structure","developer","estate_company","cubage_percent","virescence_percent","loudong_count","schools","main_type","main_type_area","create_year"]) + def dists = CommonDatautils.findAllDistrictsFromMg(city, cat, ["city","region","name","address","block","alias","addr_alias","cat","estate_type2","status","township","lng","lat","build_type","household_count","committee","estate_charge","car_site_count","property_life","house_property","build_area","all_area","build_structure","developer","estate_company","cubage_percent","virescence_percent","loudong_count","schools","main_type","main_type_area","create_year"]) def rets = new CopyOnWriteArrayList() def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(dists.size()) @@ -351,9 +351,9 @@ class SeaweedDataSynch extends BaseBatch{ map.name = dist.name map.address = dist.address map.block = dist.block - if(dist.mapping_alias){ + if(dist.alias){ def aliasNames = [] - for(def key : dist.mapping_alias){ + for(def key : dist.alias){ if(key && !key.toString().equals("null")){ aliasNames << key // if(aliasNames.size()>5){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy index 61cc61f88..5da7fc52d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy @@ -55,7 +55,7 @@ class AddressUtil { * 初始化城市数据 */ static def initCityMap() { - Mongo mongo = new Mongo("mongo.db.fangjia.com", 27017); + Mongo mongo = new Mongo("mongo.db.fangjia.com", 28017); DBCollection SERVER_AREA = mongo.getDB("fangjia").getCollection("server_area"); DBCursor cursor = SERVER_AREA.find(new BasicDBObject(), new BasicDBObject("display", 1).append("city_grade", 1)); for(DBObject dbObject : cursor) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy index 026ec703f..6f2735f65 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/batch/ApiProductFieldStatBatch.groovy @@ -51,11 +51,11 @@ class ApiProductFieldStatBatch extends BaseBatch { //成交数据 static final DBCollection deal_price_coll = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") //中介 - static final DBCollection agency_mount_level_coll = MongoUtils.getCollectionByName("fangjia_stat", "pds.agency_mount_level", "mongo.db.fangjia.com", 27017) + static final DBCollection agency_mount_level_coll = MongoUtils.getCollectionByName("fangjia_stat", "pds.agency_mount_level", "mongo.db.fangjia.com", 28017) //租金 - static final DBCollection district_stat_rent_coll = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com", 27017) + static final DBCollection district_stat_rent_coll = MongoUtils.getCollectionByName("fangjia", "district_stat_rent", "mongo.db.fangjia.com", 28017) //城市 - static final DBCollection server_area_coll = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 27017) + static final DBCollection server_area_coll = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com", 28017) //poi static final DBCollection district_nearby_coll = MongoUtils.getCollectionByName("fangjia", "district_nearby", "mongo.db.fangjia.com")