Merge remote-tracking branch 'origin/master'
This commit is contained in:
+21
@@ -763,6 +763,27 @@ public class WeiXinEvaluationController {
|
|||||||
}
|
}
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 均价对比接口(房价通小程序用)
|
||||||
|
public Object otherSourcePlusAction(EvaluationModel model){
|
||||||
|
|
||||||
|
JsonModel jsonMmodel = new JsonModel();
|
||||||
|
Map<String, Integer> dataMap = new HashMap<String, Integer>();
|
||||||
|
if(StringUtils.isNotBlank(model.getCityName()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isNotBlank(model.getName()) && model.getBuildType() != null){
|
||||||
|
String category = getEnCategory(model.getBuildType());
|
||||||
|
AverageStatistics averageStatistics = averageStatisticsService.findOneAverageStatictics(model.getCityName(), model.getName(), category);
|
||||||
|
|
||||||
|
Integer tradeAvgPrice = dealPriceService.findDealPrices(model.getCityName(), model.getRegion(), model.getName(), DateUtil.getFirstDayOfMonth(new Date(), -6), DateUtil.getFirstDayOfMonth(new Date(), 0));
|
||||||
|
//columnX = "['成交均价(近半年)','房价网挂牌均价','搜房挂牌均价','安居客挂牌均价']";
|
||||||
|
dataMap.put("dealPrice", tradeAvgPrice);
|
||||||
|
dataMap.put("fjw", averageStatistics.getFangjiaPrice());
|
||||||
|
dataMap.put("soufang", averageStatistics.getSoufangEsfPrice());
|
||||||
|
dataMap.put("anjuke", averageStatistics.getAnjukeEsfPrice());
|
||||||
|
}
|
||||||
|
jsonMmodel.setJsonModel(dataMap);
|
||||||
|
return jsonMmodel;
|
||||||
|
}
|
||||||
|
|
||||||
//均价对比
|
//均价对比
|
||||||
public Object otherSourceAction(EvaluationModel model){
|
public Object otherSourceAction(EvaluationModel model){
|
||||||
|
|
||||||
|
|||||||
+27
@@ -57,6 +57,9 @@ public class EvaluationModel extends BaseModel{
|
|||||||
private Map<String, List<ReportFileAttach>> reportFileMap;
|
private Map<String, List<ReportFileAttach>> reportFileMap;
|
||||||
private UserTrades userTrades;
|
private UserTrades userTrades;
|
||||||
private String address;
|
private String address;
|
||||||
|
private Integer buildType;
|
||||||
|
private String name;
|
||||||
|
private String region;
|
||||||
|
|
||||||
|
|
||||||
public void setId(String id) {
|
public void setId(String id) {
|
||||||
@@ -326,4 +329,28 @@ public class EvaluationModel extends BaseModel{
|
|||||||
public void setLoan(Integer loan) {
|
public void setLoan(Integer loan) {
|
||||||
this.loan = loan;
|
this.loan = loan;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Integer getBuildType() {
|
||||||
|
return buildType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBuildType(Integer buildType) {
|
||||||
|
this.buildType = buildType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRegion() {
|
||||||
|
return region;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRegion(String region) {
|
||||||
|
this.region = region;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-11
@@ -35,22 +35,22 @@ class AutoAddDistrictBatch extends BaseBatch{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
void process(Object args) {
|
void process(Object args) {
|
||||||
// //查找第三方匹配没有匹配上的小区
|
//查找第三方匹配没有匹配上的小区
|
||||||
// def citys = CommonDatautils.findAllCity()
|
def citys = CommonDatautils.findAllCity()
|
||||||
// def list = []
|
def list = []
|
||||||
// list << ["城市", "区域", "名称", "成交量", "房源量", "百度地图", "百度类型","高德地图", "高德类型"]
|
list << ["城市", "区域", "名称", "成交量", "房源量", "百度地图", "百度类型","高德地图", "高德类型"]
|
||||||
// for(def c : citys){
|
for(def c : citys){
|
||||||
// def noMatchDatas = findNoMatchResult(c)
|
def noMatchDatas = findNoMatchResult(c)
|
||||||
// println c +" 新旧算法未匹配的数据量:"+noMatchDatas.size()
|
println c +" 新旧算法未匹配的数据量:"+noMatchDatas.size()
|
||||||
// def rets = checkDatas(noMatchDatas.keySet())
|
def rets = checkDatas(noMatchDatas.keySet())
|
||||||
// list.addAll(rets)
|
list.addAll(rets)
|
||||||
// }
|
}
|
||||||
|
|
||||||
def fileName = "/home/goojia/gj/add_dist_info.xlsx"
|
def fileName = "/home/goojia/gj/add_dist_info.xlsx"
|
||||||
if (CommonDatautils.isWindow()) {
|
if (CommonDatautils.isWindow()) {
|
||||||
fileName = "D:\\数据\\add_dist_info_1.xlsx"
|
fileName = "D:\\数据\\add_dist_info_1.xlsx"
|
||||||
}
|
}
|
||||||
// ExcelUtils.write(fileName, list, "待入库数据")
|
ExcelUtils.write(fileName, list, "待入库数据")
|
||||||
|
|
||||||
|
|
||||||
check(fileName)
|
check(fileName)
|
||||||
|
|||||||
+4
-4
@@ -358,9 +358,9 @@ class NewGaoDePoiBatch extends BaseBatch{
|
|||||||
def oldPoiMagre(){
|
def oldPoiMagre(){
|
||||||
def cityList = CommonDatautils.findFullNameCitys().reverse()
|
def cityList = CommonDatautils.findFullNameCitys().reverse()
|
||||||
for(def cityObj : cityList){
|
for(def cityObj : cityList){
|
||||||
if(!cityObj.city.contains("五指山市")){
|
// if(!cityObj.city.contains("攀枝花市")){
|
||||||
continue
|
// continue
|
||||||
}
|
// }
|
||||||
def fileName = "/home/goojia/gj/poi/old_poi/merge_poi/${cityObj.city}.csv"
|
def fileName = "/home/goojia/gj/poi/old_poi/merge_poi/${cityObj.city}.csv"
|
||||||
if (CommonDatautils.isWindow()) {
|
if (CommonDatautils.isWindow()) {
|
||||||
fileName = "D:\\数据\\merge_poi\\${cityObj.city}.csv"
|
fileName = "D:\\数据\\merge_poi\\${cityObj.city}.csv"
|
||||||
@@ -463,7 +463,7 @@ class NewGaoDePoiBatch extends BaseBatch{
|
|||||||
def findEsPoiByCity(city){
|
def findEsPoiByCity(city){
|
||||||
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
|
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
|
||||||
def map = new HashMap()
|
def map = new HashMap()
|
||||||
ElasticUtils89.executeQuery("192.168.0.89", "didata_map_poi", queryBuilder, { String id, Map d->
|
ElasticUtils89.executeQuery("192.168.0.89", "map_poi_2024", queryBuilder, { String id, Map d->
|
||||||
def district = ""
|
def district = ""
|
||||||
if(d.district){
|
if(d.district){
|
||||||
district = d.district
|
district = d.district
|
||||||
|
|||||||
@@ -52,6 +52,9 @@ public class EvaluateParamMap {
|
|||||||
BUILD_TYPE_MAP.put("6", "联排别墅");
|
BUILD_TYPE_MAP.put("6", "联排别墅");
|
||||||
BUILD_TYPE_MAP.put("7", "叠加别墅");
|
BUILD_TYPE_MAP.put("7", "叠加别墅");
|
||||||
BUILD_TYPE_MAP.put("8", "公寓");
|
BUILD_TYPE_MAP.put("8", "公寓");
|
||||||
|
BUILD_TYPE_MAP.put("9","联列住宅");
|
||||||
|
BUILD_TYPE_MAP.put("10","花园住宅");
|
||||||
|
BUILD_TYPE_MAP.put("11","旧式里弄2");
|
||||||
|
|
||||||
HOUSE_PROPERTY_MAP.put("1","个人产权");
|
HOUSE_PROPERTY_MAP.put("1","个人产权");
|
||||||
HOUSE_PROPERTY_MAP.put("2","集体产权");
|
HOUSE_PROPERTY_MAP.put("2","集体产权");
|
||||||
|
|||||||
Reference in New Issue
Block a user