diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java index 0c0895c34..b2b02d3c3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeController.java @@ -532,7 +532,7 @@ public class OfficeController { } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); - + model.setCity(district.getCity()); OfficeEvaluationDto evaluation = officeService.evaluateRent(district, buildEvaluation(model, request)); if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { @@ -783,7 +783,7 @@ public class OfficeController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); - + model.setCity(district.getCity()); OfficeEvaluationDto evaluation = officeService.evaluateRent(district, buildEvaluation(model, request)); if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { @@ -865,7 +865,7 @@ public class OfficeController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); - + model.setCity(district.getCity()); OfficeEvaluationDto evaluation = officeService.evaluateRent(district, buildEvaluation(model, request)); Double minPrice = null; Double maxPrice = null; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java index c2c1950e7..df6378fef 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/OfficeSellController.java @@ -313,7 +313,7 @@ public class OfficeSellController { } model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); - + model.setCity(district.getCity()); OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { @@ -507,7 +507,7 @@ public class OfficeSellController { return mav; } } - + model.setCity(district.getCity()); model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); @@ -603,6 +603,7 @@ public class OfficeSellController { model.setRegion(district.getRegion()); model.setDistrictName(district.getName()); + model.setCity(district.getCity()); OfficeEvaluationDto evaluation = officeService.evaluateSell(district, buildEvaluation(model, request)); if (evaluation.getUnitPrice() != null && evaluation.getUnitPrice() != 0) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/test/CollectData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/test/CollectData.groovy index b84383a26..2a8da4356 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/test/CollectData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/test/CollectData.groovy @@ -1,63 +1,33 @@ -import com.fangjia.datastore.driver.DSObject -import com.fangjia.script.commData.CommonDatautils -import com.fangjia.script.util.CommonUtils -import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils -import com.fangjia.script.util.GeoHelper -import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.OpenApiClient -import com.mongodb.BasicDBObject -import com.mongodb.DBCollection -import com.mongodb.DBCursor -import com.mongodb.DBObject -import com.mongodb.QueryOperators import net.sf.json.JSONObject -//ExcelUtils.multiThreadingModify("D:\\业务数据\\四川锦程\\四川锦程测试数据.xlsx",{List item-> -// if(item["K"] == null){ -// JSONObject json = OpenApiClient.addressMatch(item["B"], item["G"], "district", false, item["C"] ) -// if(json.getDouble("credit") > 0){ -// item["I"] = json.city -// item["J"] = json.district -// item["K"] = json.name -// println(item) -// } -// } -//}) -//ExcelUtils.multiThreadingModify("D:\\业务数据\\四川锦程\\四川锦程测试数据.xlsx",{List item-> -// if(item["K"] == null){ -// JSONObject json = OpenApiClient.addressMatch(item["B"], item["G"], "district", false, item["C"] ) -// if(json.getDouble("credit") > 0){ -// item["I"] = json.city -// item["J"] = json.district -// item["K"] = json.name -// println(item) -// } -// } -//}) -ExcelUtils.multiThreadingModify("D:\\业务数据\\四川锦程\\四川锦程测试数据(人工介入).xlsx",{List item-> - def city = item["I"] - def region = item["J"] - def name = item["K"] - if(name){ - BasicDBObject seaweed = DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery(city, region, name)) - if(seaweed){ - def propertyType = 0 - if(seaweed.estate_type2.toString().contains("别墅")){ - propertyType = 1 +ExcelUtils.multiThreadingModify("C:\\Users\\wenyan\\Desktop\\地址分区域-20260522.xls",{List item-> + if(item["C"]){ + JSONObject json = OpenApiClient.addressStandard("", item["C"]) + if(json){ + if(json.province){ + item["D"]=json.province } - JSONObject res = OpenApiClient.evaluateDistrictPrice(city, region, name, item["H"], propertyType) - if(res.getDouble("credit") > 0){ - item["L"] = res.avgPrice - item["M"] = res.totalPrice - }else { - CommonUtils.recalculationAverage(city, region, name, seaweed.estate_type2, new Date(), false) + if(json.city){ + item["E"] =json.city } - item["N"] = CommonUtils.getDistrictBuildYear(seaweed) - }else{ - println("################" + item) + if(json.district){ + item["F"]= json.district + } + if(json.provinceCode){ + item["G"]= json.provinceCode.toString().substring(0, 6) + } + if(json.cityCode){ + item["H"] =json.cityCode.toString().substring(0, 6) + } + if(json.districtCode){ + item["I"] =json.districtCode.toString().substring(0, 6) + } + println(json) } + } println(item) }) \ No newline at end of file diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java index c2885c6d1..fa2924bdf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java @@ -157,7 +157,7 @@ public class OfficeServiceImpl implements OfficeService { Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); query.setStartDate(startDate); query.setEndDate(endDate); - + query.setCityDisplay(RegionData.formatCity(evaluation.getCity())); query.setCityDisplay(evaluation.getCity()); Pager pager = new Pager(); pager.setStartRow(0); @@ -255,8 +255,7 @@ public class OfficeServiceImpl implements OfficeService { Integer startDate = Integer.valueOf(DateUtil.formatByPattern(DateUtil.addMonthToDate(new Date(), -12), "yyyyMMdd")); query.setStartDate(startDate); query.setEndDate(endDate); - - query.setCityDisplay(evaluation.getCity()); + query.setCityDisplay(RegionData.formatCity(evaluation.getCity())); Pager pager = new Pager(); pager.setStartRow(0); pager.setPageSize(100);