Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
Conflicts: fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java
This commit is contained in:
+74
-2
@@ -4,6 +4,7 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import org.springframework.data.annotation.Id;
|
||||
import org.springframework.data.mongodb.core.mapping.Document;
|
||||
import org.springframework.data.mongodb.core.mapping.Field;
|
||||
|
||||
/**
|
||||
* 小区详情<br>用于有房中小区的信息汇总
|
||||
@@ -33,16 +34,25 @@ public class DistrictDetail {
|
||||
/**
|
||||
* 物业类型
|
||||
*/
|
||||
@Field("estate_type")
|
||||
private String estateType;
|
||||
|
||||
/**
|
||||
* 地址
|
||||
*/
|
||||
@Field("addr")
|
||||
private String address;
|
||||
|
||||
/**
|
||||
* 小区key(city_region_name)
|
||||
*/
|
||||
@Field("d_key")
|
||||
private String districtKey;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@Field("m_time")
|
||||
private Date modifyTime;
|
||||
|
||||
/**
|
||||
@@ -53,66 +63,91 @@ public class DistrictDetail {
|
||||
/**
|
||||
* 最新均价
|
||||
*/
|
||||
@Field("a_price")
|
||||
private int avgPrice;
|
||||
|
||||
/**
|
||||
* 涨跌幅在城市中的排名
|
||||
*/
|
||||
@Field("updown_clevel")
|
||||
private double upDownRangecityLevel;
|
||||
|
||||
/**
|
||||
* 上月参考均价
|
||||
*/
|
||||
@Field("tm_a_price")
|
||||
private Integer topMonthAvgPrice;
|
||||
|
||||
/**
|
||||
* 近1年涨跌幅(%)
|
||||
*/
|
||||
@Field("oy_updown")
|
||||
private Double oneYearUpDownRange;
|
||||
|
||||
/**
|
||||
* 房产等级
|
||||
*/
|
||||
@Field("l_rate")
|
||||
private double levelRate;
|
||||
|
||||
/**
|
||||
* 周涨幅
|
||||
*/
|
||||
@Field("w_markup")
|
||||
private int lastWeekendMarkup;
|
||||
|
||||
/**
|
||||
* 租房回报率
|
||||
*/
|
||||
@Field("r_rate")
|
||||
private Double rentRate;
|
||||
|
||||
/**
|
||||
* 近30天涨跌幅(%)
|
||||
*/
|
||||
@Field("om_updown")
|
||||
private Double oneMonthUpDownRange;
|
||||
|
||||
/**
|
||||
* 价格城市中的排名
|
||||
*/
|
||||
@Field("p_rate")
|
||||
private double priceRate;
|
||||
|
||||
/**
|
||||
* 流动性评级得分
|
||||
*/
|
||||
@Field("t_score")
|
||||
private double totalScore;
|
||||
|
||||
/**
|
||||
* 一年前房屋均价
|
||||
*/
|
||||
@Field("oy_a_price")
|
||||
private int oneYearAvgPrice;
|
||||
|
||||
/**
|
||||
* 相对最高价
|
||||
*/
|
||||
@Field("mas_price")
|
||||
private int cityDistrictMaxSellPrice;
|
||||
|
||||
/**
|
||||
* 相对最低价
|
||||
*/
|
||||
@Field("mis_price")
|
||||
private int cityDistrictMinSellPrice;
|
||||
|
||||
/**
|
||||
* 小区标签
|
||||
*/
|
||||
@Field("tags")
|
||||
private List<String> poiTags;
|
||||
|
||||
/**
|
||||
* 小区标签数量(排序用)
|
||||
*/
|
||||
@Field("tags_size")
|
||||
private int poiSize;
|
||||
|
||||
/**
|
||||
@@ -133,76 +168,91 @@ public class DistrictDetail {
|
||||
/**
|
||||
* 物业公司
|
||||
*/
|
||||
@Field("e_company")
|
||||
private String estateCompany;
|
||||
|
||||
/**
|
||||
* 容积率
|
||||
*/
|
||||
@Field("c_percent")
|
||||
private String cubagePercent;
|
||||
|
||||
/**
|
||||
* 绿化率
|
||||
*/
|
||||
@Field("v_percent")
|
||||
private String virescencePercent;
|
||||
|
||||
/**
|
||||
* 物业费
|
||||
*/
|
||||
@Field("e_charge")
|
||||
private String estateCharge;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Field("b_date")
|
||||
private String buildDate;
|
||||
|
||||
/**
|
||||
* 停车位
|
||||
*/
|
||||
@Field("car_count")
|
||||
private Integer carSiteCount;
|
||||
|
||||
/**
|
||||
* 总户数
|
||||
*/
|
||||
@Field("hold_count")
|
||||
private Integer householdCount;
|
||||
|
||||
/**
|
||||
* 竣工时间
|
||||
*/
|
||||
@Field("fb_date")
|
||||
private String finishBuildingDate;
|
||||
|
||||
/**
|
||||
* 主力面积
|
||||
*/
|
||||
@Field("m_area")
|
||||
private String moreArea;
|
||||
|
||||
/**
|
||||
* 中介总数量
|
||||
*/
|
||||
@Field("ag_mount")
|
||||
private int agencyMount;
|
||||
|
||||
/**
|
||||
* 知名中介数量
|
||||
*/
|
||||
@Field("fa_ag_mount")
|
||||
private int famousAgency;
|
||||
|
||||
/**
|
||||
* 其他中介数量
|
||||
*/
|
||||
@Field("other_ag")
|
||||
private int otherAgency;
|
||||
|
||||
/**
|
||||
* 中介数量在城市中的排名
|
||||
*/
|
||||
@Field("mc_level")
|
||||
private int momCityLevel;
|
||||
|
||||
/**
|
||||
* 城市排名总量
|
||||
*/
|
||||
@Field("c_size")
|
||||
private int citySize;
|
||||
|
||||
/**
|
||||
* 城市中介最多的数量
|
||||
*/
|
||||
@Field("max_ag")
|
||||
private int maxCityAgency;
|
||||
|
||||
/**
|
||||
@@ -529,7 +579,29 @@ public class DistrictDetail {
|
||||
public void setEstateType(String estateType) {
|
||||
this.estateType = estateType;
|
||||
}
|
||||
|
||||
public double getLevelRate() {
|
||||
return levelRate;
|
||||
}
|
||||
|
||||
public void setLevelRate(double levelRate) {
|
||||
this.levelRate = levelRate;
|
||||
}
|
||||
|
||||
public int getLastWeekendMarkup() {
|
||||
return lastWeekendMarkup;
|
||||
}
|
||||
|
||||
public void setLastWeekendMarkup(int lastWeekendMarkup) {
|
||||
this.lastWeekendMarkup = lastWeekendMarkup;
|
||||
}
|
||||
|
||||
public String getDistrictKey() {
|
||||
return districtKey;
|
||||
}
|
||||
|
||||
public void setDistrictKey(String districtKey) {
|
||||
this.districtKey = districtKey;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1
@@ -94,6 +94,7 @@ public class DistrictInfoJob implements SimpleJob{
|
||||
if(data.containsKey("estate_type2")){
|
||||
estateType = (String) data.get("estate_type2");
|
||||
}
|
||||
districtDetail.setDistrictKey(city + "_" + region + "_" + name);
|
||||
districtDetail.setCity(city);
|
||||
districtDetail.setRegion(region);
|
||||
districtDetail.setName(name);
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
<!-- 有房小区详情信息汇总 每周一0点10分执行-->
|
||||
<job:simple id="districtInfoJob" class="com.fangjia.job.youfang.job.DistrictInfoJob" registry-center-ref="regCenter"
|
||||
sharding-total-count="1" cron="0 46 16 ? * 2" sharding-item-parameters=""
|
||||
sharding-total-count="1" cron="0 10 0 ? * 2" sharding-item-parameters=""
|
||||
failover="true" description="【有房】 有房小区详情信息汇总"
|
||||
overwrite="true" event-trace-rdb-data-source="elasticJobLog" job-exception-handler="com.fangjia.job.youfang.handler.CustomJobExceptionHandler">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user