@@ -478,7 +491,7 @@
var down_pic_temp = 0;
$(document).ready(function(){
//璧板娍鍥�
- <#if districtStatBo?? || regionStatBo??>
+ <#if districtStatBo?? || regionStatBo?? || citySellStatBo?? || regionSellStatBo??>
<#if type??>
<#if type == '4' || type == 'quarter'>
var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
diff --git a/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl b/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl
index e9b882a94..7b54d3b4c 100644
--- a/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/yinLianEvaluation/index.ftl
@@ -103,12 +103,12 @@
<#if districtStatBo?? || regionStatBo??>
<#if districtStatBo??>
-
<#if districtStatBo.lastTimeDistrictStat??>${districtStatBo.lastTimeDistrictStat.avgPrice}<#else>鏆傛棤#if>
-
<#if districtStatBo.districtStat??>${districtStatBo.districtStat.avgPrice}<#else>鏆傛棤#if>
+
<#if districtStatBo.lastTimeDistrictStat??>${districtStatBo.lastTimeDistrictStat.avgPrice}<#else>鏆傛棤#if>
+
<#if districtStatBo.districtStat??>${districtStatBo.districtStat.avgPrice}<#else>鏆傛棤#if>
${(districtStatBo.districtStat.weekendMarkup/100)?string('0.00')}%
<#elseif regionStatBo??>
-
${regionStatBo.lastTimeAvgPrice!}
-
${regionStatBo.avgPrice!}
+
${regionStatBo.lastTimeAvgPrice!}
+
${regionStatBo.avgPrice!}
${(regionStatBo.weekendMarkup/100)?string('0.00')}%
#if>
#if>
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterDaoImpl.java
index cb50b9293..b7f00fc08 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterDaoImpl.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterDaoImpl.java
@@ -110,8 +110,8 @@ public abstract class SeawaterDaoImpl
extends Abstract
}
}
- public void setSeawater(DataStore seawater) {
- this.seawater = seawater;
- }
+// public void setSeawater(DataStore seawater) {
+// this.seawater = seawater;
+// }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java
index 7ce356ffa..5d2ee9181 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/SeawaterQuery.java
@@ -6,6 +6,7 @@ import java.util.List;
public class SeawaterQuery {
private String id;
+ private List ids;
private String cat;
private String region;
private String districtName;
@@ -38,6 +39,7 @@ public class SeawaterQuery {
private Integer radius;
private String level;
+ private List tags;
public String getId() {
return id;
@@ -278,4 +280,20 @@ public class SeawaterQuery {
public void setLevel(String level) {
this.level = level;
}
+
+ public List getTags() {
+ return tags;
+ }
+
+ public void setTags(List tags) {
+ this.tags = tags;
+ }
+
+ public List getIds() {
+ return ids;
+ }
+
+ public void setIds(List ids) {
+ this.ids = ids;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java
index d726b3806..c6ade6b04 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDao.java
@@ -2,9 +2,16 @@ package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.CitySellStat;
+import com.fangjia.dal.mongo.model.RegionStat;
+
+import java.util.Date;
+import java.util.List;
/**
* Created by hubingliang on 2016/12/8.
*/
public interface CitySellStatDao extends MongoDao {
+
+ List findCitySellStat(String city, Integer startDate, Integer endDate);
+
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java
index f09616ce9..56eb779a2 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CitySellStatDaoImpl.java
@@ -1,10 +1,33 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
+import com.fangjia.dal.QueryParam;
+import com.fangjia.dal.SortParam;
import com.fangjia.dal.mongo.model.CitySellStat;
+import com.fangjia.dal.mongo.model.RegionStat;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* Created by hubingliang on 2016/12/8.
*/
public class CitySellStatDaoImpl extends MongoDaoImpl implements CitySellStatDao {
+
+ @Override
+ public List findCitySellStat(String city, Integer startDate, Integer endDate) {
+ List params = new ArrayList();
+ params.add(new QueryParam("city", city));
+ params.add(new QueryParam("date", QueryParam.LESS_THAN_EQUAL_OPERATOR, endDate));
+ if (startDate!=null) {
+ params.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
+ }
+
+ List sortParms = new ArrayList(1);
+ sortParms.add(new SortParam("date", true));
+ List statList = findAllByParams(params, sortParms);
+ return statList;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDao.java
new file mode 100644
index 000000000..f30672858
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDao.java
@@ -0,0 +1,7 @@
+package com.fangjia.dal.mongo.dao;
+
+import com.fangjia.dal.MongoDao;
+import com.fangjia.dal.mongo.model.CommunityRate;
+
+public interface CommunityRateDao extends MongoDao {
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDaoImpl.java
new file mode 100644
index 000000000..781a12097
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/CommunityRateDaoImpl.java
@@ -0,0 +1,7 @@
+package com.fangjia.dal.mongo.dao;
+
+import com.fangjia.dal.MongoDaoImpl;
+import com.fangjia.dal.mongo.model.CommunityRate;
+
+public class CommunityRateDaoImpl extends MongoDaoImpl implements CommunityRateDao{
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java
index 65c0123ef..87a77e9a2 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDao.java
@@ -1,8 +1,13 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
+import com.fangjia.dal.mongo.model.CitySellStat;
import com.fangjia.dal.mongo.model.RegionSellStat;
+import java.util.List;
+
public interface RegionSellStatDao extends MongoDao {
+ List findRegionSellStat(String city, String region, Integer startDate, Integer endDate);
+
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java
index 389c4e30d..940c9b9da 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/RegionSellStatDaoImpl.java
@@ -1,9 +1,31 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
+import com.fangjia.dal.QueryParam;
+import com.fangjia.dal.SortParam;
+import com.fangjia.dal.mongo.model.CitySellStat;
import com.fangjia.dal.mongo.model.RegionSellStat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
public class RegionSellStatDaoImpl extends MongoDaoImpl
implements RegionSellStatDao {
+ @Override
+ public List findRegionSellStat(String city, String region, Integer startDate, Integer endDate) {
+ List params = new ArrayList();
+ params.add(new QueryParam("city", city));
+ params.add(new QueryParam("region", region));
+ params.add(new QueryParam("date", QueryParam.LESS_THAN_EQUAL_OPERATOR, endDate));
+ if (startDate!=null) {
+ params.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
+ }
+
+ List sortParms = new ArrayList(1);
+ sortParms.add(new SortParam("date", true));
+ List statList = findAllByParams(params, sortParms);
+ return statList;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDao.java
new file mode 100644
index 000000000..a03b21129
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDao.java
@@ -0,0 +1,9 @@
+package com.fangjia.dal.mongo.dao.shop;
+
+import com.fangjia.dal.MongoDao;
+import com.fangjia.dal.mongo.model.ShopRentStat;
+
+public interface ShopRentStatDao extends MongoDao {
+
+
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDaoImpl.java
new file mode 100644
index 000000000..e1f611b37
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopRentStatDaoImpl.java
@@ -0,0 +1,8 @@
+package com.fangjia.dal.mongo.dao.shop;
+
+import com.fangjia.dal.MongoDaoImpl;
+import com.fangjia.dal.mongo.model.ShopRentStat;
+
+public class ShopRentStatDaoImpl extends MongoDaoImpl implements ShopRentStatDao {
+
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDao.java
new file mode 100644
index 000000000..2fec3b1d9
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDao.java
@@ -0,0 +1,9 @@
+package com.fangjia.dal.mongo.dao.shop;
+
+import com.fangjia.dal.MongoDao;
+import com.fangjia.dal.mongo.model.ShopSellStat;
+
+public interface ShopSellStatDao extends MongoDao {
+
+
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDaoImpl.java
new file mode 100644
index 000000000..c233ba1db
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/shop/ShopSellStatDaoImpl.java
@@ -0,0 +1,8 @@
+package com.fangjia.dal.mongo.dao.shop;
+
+import com.fangjia.dal.MongoDaoImpl;
+import com.fangjia.dal.mongo.model.ShopSellStat;
+
+public class ShopSellStatDaoImpl extends MongoDaoImpl implements ShopSellStatDao {
+
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommunityRate.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommunityRate.java
new file mode 100644
index 000000000..e3ecf7d68
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/CommunityRate.java
@@ -0,0 +1,990 @@
+package com.fangjia.dal.mongo.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import com.fangjia.dal.MongoEntity;
+import java.util.Date;
+
+@Entity
+@Table(name = "fangjia_stat.community_rate")
+public class CommunityRate implements MongoEntity {
+
+ private static final long serialVersionUID = 8312754864385108472L;
+ private String id;
+ private String commId;
+ private String city;
+ private String region;
+ private String regionRating;
+ private String name;
+ private String block;
+ private String blockRating;
+ private String address;
+ private Integer avgPrice;
+ private Double sqmetreRent;
+ private Double yoy;
+ private Double rentToPriceRatio;
+ private Integer halfOnYearSellNum;
+ private Double totalScore;
+ private Double communityQualityScore;
+ private Double communityPriceScore;
+ private Double locationAdvantageScore;
+ private Double flowabilityScore;
+ private Double livingFacilitiesScore;
+ private Double educationScore;
+ private Double hospitalScore;
+ private String rating;
+ private String communityQualityRating;
+ private String communityPriceRating;
+ private String locationAdvantageRating;
+ private String flowabilityRating;
+ private String livingFacilitiesRating;
+ private String educationRating;
+ private String hospitalRating;
+ private Integer supermarketNum;
+ private Integer parkNum;
+ private Integer cateringNum;
+ private Integer mallNum;
+ private Integer kindergartenNum;
+ private Integer keyPrimarySchoolNum;
+ private Integer ordinaryPrimarySchoolNum;
+ private Integer keyMiddleSchoolNum;
+ private Integer ordinaryMiddleSchoolNum;
+ private Integer topThreeHospitalNum;
+ private Integer non3aHospitalNum;
+ private Integer buildYear;
+ private Double cubagePercent;
+ private Double virescencePercent;
+ private Double estateCharge;
+ private String estateType;
+ private Integer cityRank;
+ private Integer cityTotalRank;
+ private Integer regionRank;
+ private Integer regionTotalRank;
+ private Integer blockTotalRank;
+ private Integer blockRank;
+ private Integer cityCommunityQualityRank;
+ private Integer cityCommunityQualityTotalRank;
+ private Integer regionCommunityQualityRank;
+ private Integer regionCommunityQualityTotalRank;
+ private Integer blockCommunityQualityTotalRank;
+ private Integer blockCommunityQualityRank;
+ private Integer cityCommunityPriceRank;
+ private Integer cityCommunityPriceTotalRank;
+ private Integer regionCommunityPriceRank;
+ private Integer regionCommunityPriceTotalRank;
+ private Integer blockCommunityPriceTotalRank;
+ private Integer blockCommunityPriceRank;
+ private Integer cityLocationAdvantageRank;
+ private Integer cityLocationAdvantageTotalRank;
+ private Integer regionLocationAdvantageRank;
+ private Integer regionLocationAdvantageTotalRank;
+ private Integer blockLocationAdvantageTotalRank;
+ private Integer blockLocationAdvantageRank;
+ private Integer cityFlowabilityRank;
+ private Integer cityFlowabilityTotalRank;
+ private Integer regionFlowabilityRank;
+ private Integer regionFlowabilityTotalRank;
+ private Integer blockFlowabilityTotalRank;
+ private Integer blockFlowabilityRank;
+ private Integer cityLivingFacilitiesRank;
+ private Integer cityLivingFacilitiesTotalRank;
+ private Integer regionLivingFacilitiesRank;
+ private Integer regionLivingFacilitiesTotalRank;
+ private Integer blockLivingFacilitiesTotalRank;
+ private Integer blockLivingFacilitiesRank;
+ private Integer cityEducationRank;
+ private Integer cityEducationTotalRank;
+ private Integer regionEducationRank;
+ private Integer regionEducationTotalRank;
+ private Integer blockEducationTotalRank;
+ private Integer blockEducationRank;
+ private Integer cityHospitalRank;
+ private Integer cityHospitalTotalRank;
+ private Integer regionHospitalRank;
+ private Integer regionHospitalTotalRank;
+ private Integer blockHospitalTotalRank;
+ private Integer blockHospitalRank;
+ private Date mDate;
+ private Date cDate;
+ private Integer resistanceCoef;
+
+ // Getter and Setter 锟斤拷锟斤拷
+ @Id
+ @GeneratedValue
+ @Column(name = "_id", unique = true, nullable = false)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Column(name = "comm_id")
+ public String getCommId() {
+ return commId;
+ }
+
+ public void setCommId(String commId) {
+ this.commId = commId;
+ }
+
+ @Column(name = "city")
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ @Column(name = "region")
+ public String getRegion() {
+ return region;
+ }
+
+ public void setRegion(String region) {
+ this.region = region;
+ }
+
+ @Column(name = "region_rating")
+ public String getRegionRating() {
+ return regionRating;
+ }
+
+ public void setRegionRating(String regionRating) {
+ this.regionRating = regionRating;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(name = "block")
+ public String getBlock() {
+ return block;
+ }
+
+ public void setBlock(String block) {
+ this.block = block;
+ }
+
+ @Column(name = "block_rating")
+ public String getBlockRating() {
+ return blockRating;
+ }
+
+ public void setBlockRating(String blockRating) {
+ this.blockRating = blockRating;
+ }
+
+ @Column(name = "address")
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ @Column(name = "avg_price")
+ public Integer getAvgPrice() {
+ return avgPrice;
+ }
+
+ public void setAvgPrice(Integer avgPrice) {
+ this.avgPrice = avgPrice;
+ }
+
+ @Column(name = "sqmetre_rent")
+ public Double getSqmetreRent() {
+ return sqmetreRent;
+ }
+
+ public void setSqmetreRent(Double sqmetreRent) {
+ this.sqmetreRent = sqmetreRent;
+ }
+
+ @Column(name = "yoy")
+ public Double getYoy() {
+ return yoy;
+ }
+
+ public void setYoy(Double yoy) {
+ this.yoy = yoy;
+ }
+
+ @Column(name = "rent_to_price_ratio")
+ public Double getRentToPriceRatio() {
+ return rentToPriceRatio;
+ }
+
+ public void setRentToPriceRatio(Double rentToPriceRatio) {
+ this.rentToPriceRatio = rentToPriceRatio;
+ }
+
+ @Column(name = "half_on_year_sell_num")
+ public Integer getHalfOnYearSellNum() {
+ return halfOnYearSellNum;
+ }
+
+ public void setHalfOnYearSellNum(Integer halfOnYearSellNum) {
+ this.halfOnYearSellNum = halfOnYearSellNum;
+ }
+
+ @Column(name = "total_score")
+ public Double getTotalScore() {
+ return totalScore;
+ }
+
+ public void setTotalScore(Double totalScore) {
+ this.totalScore = totalScore;
+ }
+
+ @Column(name = "community_quality_score")
+ public Double getCommunityQualityScore() {
+ return communityQualityScore;
+ }
+
+ public void setCommunityQualityScore(Double communityQualityScore) {
+ this.communityQualityScore = communityQualityScore;
+ }
+
+ @Column(name = "community_price_score")
+ public Double getCommunityPriceScore() {
+ return communityPriceScore;
+ }
+
+ public void setCommunityPriceScore(Double communityPriceScore) {
+ this.communityPriceScore = communityPriceScore;
+ }
+
+ @Column(name = "location_advantage_score")
+ public Double getLocationAdvantageScore() {
+ return locationAdvantageScore;
+ }
+
+ public void setLocationAdvantageScore(Double locationAdvantageScore) {
+ this.locationAdvantageScore = locationAdvantageScore;
+ }
+
+ @Column(name = "flowability_score")
+ public Double getFlowabilityScore() {
+ return flowabilityScore;
+ }
+
+ public void setFlowabilityScore(Double flowabilityScore) {
+ this.flowabilityScore = flowabilityScore;
+ }
+
+ @Column(name = "living_facilities_score")
+ public Double getLivingFacilitiesScore() {
+ return livingFacilitiesScore;
+ }
+
+ public void setLivingFacilitiesScore(Double livingFacilitiesScore) {
+ this.livingFacilitiesScore = livingFacilitiesScore;
+ }
+
+ @Column(name = "education_score")
+ public Double getEducationScore() {
+ return educationScore;
+ }
+
+ public void setEducationScore(Double educationScore) {
+ this.educationScore = educationScore;
+ }
+
+ @Column(name = "hospital_score")
+ public Double getHospitalScore() {
+ return hospitalScore;
+ }
+
+ public void setHospitalScore(Double hospitalScore) {
+ this.hospitalScore = hospitalScore;
+ }
+
+ @Column(name = "rating")
+ public String getRating() {
+ return rating;
+ }
+
+ public void setRating(String rating) {
+ this.rating = rating;
+ }
+
+ @Column(name = "community_quality_rating")
+ public String getCommunityQualityRating() {
+ return communityQualityRating;
+ }
+
+ public void setCommunityQualityRating(String communityQualityRating) {
+ this.communityQualityRating = communityQualityRating;
+ }
+
+ @Column(name = "community_price_rating")
+ public String getCommunityPriceRating() {
+ return communityPriceRating;
+ }
+
+ public void setCommunityPriceRating(String communityPriceRating) {
+ this.communityPriceRating = communityPriceRating;
+ }
+
+ @Column(name = "location_advantage_rating")
+ public String getLocationAdvantageRating() {
+ return locationAdvantageRating;
+ }
+
+ public void setLocationAdvantageRating(String locationAdvantageRating) {
+ this.locationAdvantageRating = locationAdvantageRating;
+ }
+
+ @Column(name = "flowability_rating")
+ public String getFlowabilityRating() {
+ return flowabilityRating;
+ }
+
+ public void setFlowabilityRating(String flowabilityRating) {
+ this.flowabilityRating = flowabilityRating;
+ }
+
+ @Column(name = "living_facilities_rating")
+ public String getLivingFacilitiesRating() {
+ return livingFacilitiesRating;
+ }
+
+ public void setLivingFacilitiesRating(String livingFacilitiesRating) {
+ this.livingFacilitiesRating = livingFacilitiesRating;
+ }
+
+ @Column(name = "education_rating")
+ public String getEducationRating() {
+ return educationRating;
+ }
+
+ public void setEducationRating(String educationRating) {
+ this.educationRating = educationRating;
+ }
+
+ @Column(name = "hospital_rating")
+ public String getHospitalRating() {
+ return hospitalRating;
+ }
+
+ public void setHospitalRating(String hospitalRating) {
+ this.hospitalRating = hospitalRating;
+ }
+
+ @Column(name = "supermarket_num")
+ public Integer getSupermarketNum() {
+ return supermarketNum;
+ }
+
+ public void setSupermarketNum(Integer supermarketNum) {
+ this.supermarketNum = supermarketNum;
+ }
+
+ @Column(name = "park_num")
+ public Integer getParkNum() {
+ return parkNum;
+ }
+
+ public void setParkNum(Integer parkNum) {
+ this.parkNum = parkNum;
+ }
+
+ @Column(name = "catering_num")
+ public Integer getCateringNum() {
+ return cateringNum;
+ }
+
+ public void setCateringNum(Integer cateringNum) {
+ this.cateringNum = cateringNum;
+ }
+
+ @Column(name = "mall_num")
+ public Integer getMallNum() {
+ return mallNum;
+ }
+
+ public void setMallNum(Integer mallNum) {
+ this.mallNum = mallNum;
+ }
+
+ @Column(name = "kindergarten_num")
+ public Integer getKindergartenNum() {
+ return kindergartenNum;
+ }
+
+ public void setKindergartenNum(Integer kindergartenNum) {
+ this.kindergartenNum = kindergartenNum;
+ }
+
+ @Column(name = "key_primary_school_num")
+ public Integer getKeyPrimarySchoolNum() {
+ return keyPrimarySchoolNum;
+ }
+
+ public void setKeyPrimarySchoolNum(Integer keyPrimarySchoolNum) {
+ this.keyPrimarySchoolNum = keyPrimarySchoolNum;
+ }
+
+ @Column(name = "ordinary_primary_school_num")
+ public Integer getOrdinaryPrimarySchoolNum() {
+ return ordinaryPrimarySchoolNum;
+ }
+
+ public void setOrdinaryPrimarySchoolNum(Integer ordinaryPrimarySchoolNum) {
+ this.ordinaryPrimarySchoolNum = ordinaryPrimarySchoolNum;
+ }
+
+ @Column(name = "key_middle_school_num")
+ public Integer getKeyMiddleSchoolNum() {
+ return keyMiddleSchoolNum;
+ }
+
+ public void setKeyMiddleSchoolNum(Integer keyMiddleSchoolNum) {
+ this.keyMiddleSchoolNum = keyMiddleSchoolNum;
+ }
+
+ @Column(name = "ordinary_middle_school_num")
+ public Integer getOrdinaryMiddleSchoolNum() {
+ return ordinaryMiddleSchoolNum;
+ }
+
+ public void setOrdinaryMiddleSchoolNum(Integer ordinaryMiddleSchoolNum) {
+ this.ordinaryMiddleSchoolNum = ordinaryMiddleSchoolNum;
+ }
+
+ @Column(name = "top_three_hospital_num")
+ public Integer getTopThreeHospitalNum() {
+ return topThreeHospitalNum;
+ }
+
+ public void setTopThreeHospitalNum(Integer topThreeHospitalNum) {
+ this.topThreeHospitalNum = topThreeHospitalNum;
+ }
+
+ @Column(name = "non_3a_hospital_num")
+ public Integer getNon3aHospitalNum() {
+ return non3aHospitalNum;
+ }
+
+ public void setNon3aHospitalNum(Integer non3aHospitalNum) {
+ this.non3aHospitalNum = non3aHospitalNum;
+ }
+
+ @Column(name = "build_year")
+ public Integer getBuildYear() {
+ return buildYear;
+ }
+
+ public void setBuildYear(Integer buildYear) {
+ this.buildYear = buildYear;
+ }
+
+ @Column(name = "cubage_percent")
+ public Double getCubagePercent() {
+ return cubagePercent;
+ }
+
+ public void setCubagePercent(Double cubagePercent) {
+ this.cubagePercent = cubagePercent;
+ }
+
+ @Column(name = "virescence_percent")
+ public Double getVirescencePercent() {
+ return virescencePercent;
+ }
+
+ public void setVirescencePercent(Double virescencePercent) {
+ this.virescencePercent = virescencePercent;
+ }
+
+ @Column(name = "estate_charge")
+ public Double getEstateCharge() {
+ return estateCharge;
+ }
+
+ public void setEstateCharge(Double estateCharge) {
+ this.estateCharge = estateCharge;
+ }
+
+ @Column(name = "estate_type")
+ public String getEstateType() {
+ return estateType;
+ }
+
+ public void setEstateType(String estateType) {
+ this.estateType = estateType;
+ }
+
+ @Column(name = "city_rank")
+ public Integer getCityRank() {
+ return cityRank;
+ }
+
+ public void setCityRank(Integer cityRank) {
+ this.cityRank = cityRank;
+ }
+
+ @Column(name = "city_total_rank")
+ public Integer getCityTotalRank() {
+ return cityTotalRank;
+ }
+
+ public void setCityTotalRank(Integer cityTotalRank) {
+ this.cityTotalRank = cityTotalRank;
+ }
+
+ @Column(name = "region_rank")
+ public Integer getRegionRank() {
+ return regionRank;
+ }
+
+ public void setRegionRank(Integer regionRank) {
+ this.regionRank = regionRank;
+ }
+
+ @Column(name = "region_total_rank")
+ public Integer getRegionTotalRank() {
+ return regionTotalRank;
+ }
+
+ public void setRegionTotalRank(Integer regionTotalRank) {
+ this.regionTotalRank = regionTotalRank;
+ }
+
+ @Column(name = "block_total_rank")
+ public Integer getBlockTotalRank() {
+ return blockTotalRank;
+ }
+
+ public void setBlockTotalRank(Integer blockTotalRank) {
+ this.blockTotalRank = blockTotalRank;
+ }
+
+ @Column(name = "block_rank")
+ public Integer getBlockRank() {
+ return blockRank;
+ }
+
+ public void setBlockRank(Integer blockRank) {
+ this.blockRank = blockRank;
+ }
+
+ @Column(name = "city_community_quality_rank")
+ public Integer getCityCommunityQualityRank() {
+ return cityCommunityQualityRank;
+ }
+
+ public void setCityCommunityQualityRank(Integer cityCommunityQualityRank) {
+ this.cityCommunityQualityRank = cityCommunityQualityRank;
+ }
+
+ @Column(name = "city_community_quality_total_rank")
+ public Integer getCityCommunityQualityTotalRank() {
+ return cityCommunityQualityTotalRank;
+ }
+
+ public void setCityCommunityQualityTotalRank(Integer cityCommunityQualityTotalRank) {
+ this.cityCommunityQualityTotalRank = cityCommunityQualityTotalRank;
+ }
+
+ @Column(name = "region_community_quality_rank")
+ public Integer getRegionCommunityQualityRank() {
+ return regionCommunityQualityRank;
+ }
+
+ public void setRegionCommunityQualityRank(Integer regionCommunityQualityRank) {
+ this.regionCommunityQualityRank = regionCommunityQualityRank;
+ }
+
+ @Column(name = "region_community_quality_total_rank")
+ public Integer getRegionCommunityQualityTotalRank() {
+ return regionCommunityQualityTotalRank;
+ }
+
+ public void setRegionCommunityQualityTotalRank(Integer regionCommunityQualityTotalRank) {
+ this.regionCommunityQualityTotalRank = regionCommunityQualityTotalRank;
+ }
+
+ @Column(name = "block_community_quality_total_rank")
+ public Integer getBlockCommunityQualityTotalRank() {
+ return blockCommunityQualityTotalRank;
+ }
+
+ public void setBlockCommunityQualityTotalRank(Integer blockCommunityQualityTotalRank) {
+ this.blockCommunityQualityTotalRank = blockCommunityQualityTotalRank;
+ }
+
+ @Column(name = "block_community_quality_rank")
+ public Integer getBlockCommunityQualityRank() {
+ return blockCommunityQualityRank;
+ }
+
+ public void setBlockCommunityQualityRank(Integer blockCommunityQualityRank) {
+ this.blockCommunityQualityRank = blockCommunityQualityRank;
+ }
+
+ @Column(name = "city_community_price_rank")
+ public Integer getCityCommunityPriceRank() {
+ return cityCommunityPriceRank;
+ }
+
+ public void setCityCommunityPriceRank(Integer cityCommunityPriceRank) {
+ this.cityCommunityPriceRank = cityCommunityPriceRank;
+ }
+
+ @Column(name = "city_community_price_total_rank")
+ public Integer getCityCommunityPriceTotalRank() {
+ return cityCommunityPriceTotalRank;
+ }
+
+ public void setCityCommunityPriceTotalRank(Integer cityCommunityPriceTotalRank) {
+ this.cityCommunityPriceTotalRank = cityCommunityPriceTotalRank;
+ }
+
+ @Column(name = "region_community_price_rank")
+ public Integer getRegionCommunityPriceRank() {
+ return regionCommunityPriceRank;
+ }
+
+ public void setRegionCommunityPriceRank(Integer regionCommunityPriceRank) {
+ this.regionCommunityPriceRank = regionCommunityPriceRank;
+ }
+
+ @Column(name = "region_community_price_total_rank")
+ public Integer getRegionCommunityPriceTotalRank() {
+ return regionCommunityPriceTotalRank;
+ }
+
+ public void setRegionCommunityPriceTotalRank(Integer regionCommunityPriceTotalRank) {
+ this.regionCommunityPriceTotalRank = regionCommunityPriceTotalRank;
+ }
+
+ @Column(name = "block_community_price_total_rank")
+ public Integer getBlockCommunityPriceTotalRank() {
+ return blockCommunityPriceTotalRank;
+ }
+
+ public void setBlockCommunityPriceTotalRank(Integer blockCommunityPriceTotalRank) {
+ this.blockCommunityPriceTotalRank = blockCommunityPriceTotalRank;
+ }
+
+ @Column(name = "block_community_price_rank")
+ public Integer getBlockCommunityPriceRank() {
+ return blockCommunityPriceRank;
+ }
+
+ public void setBlockCommunityPriceRank(Integer blockCommunityPriceRank) {
+ this.blockCommunityPriceRank = blockCommunityPriceRank;
+ }
+
+ @Column(name = "city_location_advantage_rank")
+ public Integer getCityLocationAdvantageRank() {
+ return cityLocationAdvantageRank;
+ }
+
+ public void setCityLocationAdvantageRank(Integer cityLocationAdvantageRank) {
+ this.cityLocationAdvantageRank = cityLocationAdvantageRank;
+ }
+
+ @Column(name = "city_location_advantage_total_rank")
+ public Integer getCityLocationAdvantageTotalRank() {
+ return cityLocationAdvantageTotalRank;
+ }
+
+ public void setCityLocationAdvantageTotalRank(Integer cityLocationAdvantageTotalRank) {
+ this.cityLocationAdvantageTotalRank = cityLocationAdvantageTotalRank;
+ }
+
+ @Column(name = "region_location_advantage_rank")
+ public Integer getRegionLocationAdvantageRank() {
+ return regionLocationAdvantageRank;
+ }
+
+ public void setRegionLocationAdvantageRank(Integer regionLocationAdvantageRank) {
+ this.regionLocationAdvantageRank = regionLocationAdvantageRank;
+ }
+
+ @Column(name = "region_location_advantage_total_rank")
+ public Integer getRegionLocationAdvantageTotalRank() {
+ return regionLocationAdvantageTotalRank;
+ }
+
+ public void setRegionLocationAdvantageTotalRank(Integer regionLocationAdvantageTotalRank) {
+ this.regionLocationAdvantageTotalRank = regionLocationAdvantageTotalRank;
+ }
+
+ @Column(name = "block_location_advantage_total_rank")
+ public Integer getBlockLocationAdvantageTotalRank() {
+ return blockLocationAdvantageTotalRank;
+ }
+
+ public void setBlockLocationAdvantageTotalRank(Integer blockLocationAdvantageTotalRank) {
+ this.blockLocationAdvantageTotalRank = blockLocationAdvantageTotalRank;
+ }
+
+ @Column(name = "block_location_advantage_rank")
+ public Integer getBlockLocationAdvantageRank() {
+ return blockLocationAdvantageRank;
+ }
+
+ public void setBlockLocationAdvantageRank(Integer blockLocationAdvantageRank) {
+ this.blockLocationAdvantageRank = blockLocationAdvantageRank;
+ }
+
+ @Column(name = "city_flowability_rank")
+ public Integer getCityFlowabilityRank() {
+ return cityFlowabilityRank;
+ }
+
+ public void setCityFlowabilityRank(Integer cityFlowabilityRank) {
+ this.cityFlowabilityRank = cityFlowabilityRank;
+ }
+
+ @Column(name = "city_flowability_total_rank")
+ public Integer getCityFlowabilityTotalRank() {
+ return cityFlowabilityTotalRank;
+ }
+
+ public void setCityFlowabilityTotalRank(Integer cityFlowabilityTotalRank) {
+ this.cityFlowabilityTotalRank = cityFlowabilityTotalRank;
+ }
+
+ @Column(name = "region_flowability_rank")
+ public Integer getRegionFlowabilityRank() {
+ return regionFlowabilityRank;
+ }
+
+ public void setRegionFlowabilityRank(Integer regionFlowabilityRank) {
+ this.regionFlowabilityRank = regionFlowabilityRank;
+ }
+
+ @Column(name = "region_flowability_total_rank")
+ public Integer getRegionFlowabilityTotalRank() {
+ return regionFlowabilityTotalRank;
+ }
+
+ public void setRegionFlowabilityTotalRank(Integer regionFlowabilityTotalRank) {
+ this.regionFlowabilityTotalRank = regionFlowabilityTotalRank;
+ }
+
+ @Column(name = "block_flowability_total_rank")
+ public Integer getBlockFlowabilityTotalRank() {
+ return blockFlowabilityTotalRank;
+ }
+
+ public void setBlockFlowabilityTotalRank(Integer blockFlowabilityTotalRank) {
+ this.blockFlowabilityTotalRank = blockFlowabilityTotalRank;
+ }
+
+ @Column(name = "block_flowability_rank")
+ public Integer getBlockFlowabilityRank() {
+ return blockFlowabilityRank;
+ }
+
+ public void setBlockFlowabilityRank(Integer blockFlowabilityRank) {
+ this.blockFlowabilityRank = blockFlowabilityRank;
+ }
+
+ @Column(name = "city_living_facilities_rank")
+ public Integer getCityLivingFacilitiesRank() {
+ return cityLivingFacilitiesRank;
+ }
+
+ public void setCityLivingFacilitiesRank(Integer cityLivingFacilitiesRank) {
+ this.cityLivingFacilitiesRank = cityLivingFacilitiesRank;
+ }
+
+ @Column(name = "city_living_facilities_total_rank")
+ public Integer getCityLivingFacilitiesTotalRank() {
+ return cityLivingFacilitiesTotalRank;
+ }
+
+ public void setCityLivingFacilitiesTotalRank(Integer cityLivingFacilitiesTotalRank) {
+ this.cityLivingFacilitiesTotalRank = cityLivingFacilitiesTotalRank;
+ }
+
+ @Column(name = "region_living_facilities_rank")
+ public Integer getRegionLivingFacilitiesRank() {
+ return regionLivingFacilitiesRank;
+ }
+
+ public void setRegionLivingFacilitiesRank(Integer regionLivingFacilitiesRank) {
+ this.regionLivingFacilitiesRank = regionLivingFacilitiesRank;
+ }
+
+ @Column(name = "region_living_facilities_total_rank")
+ public Integer getRegionLivingFacilitiesTotalRank() {
+ return regionLivingFacilitiesTotalRank;
+ }
+
+ public void setRegionLivingFacilitiesTotalRank(Integer regionLivingFacilitiesTotalRank) {
+ this.regionLivingFacilitiesTotalRank = regionLivingFacilitiesTotalRank;
+ }
+
+ @Column(name = "block_living_facilities_total_rank")
+ public Integer getBlockLivingFacilitiesTotalRank() {
+ return blockLivingFacilitiesTotalRank;
+ }
+
+ public void setBlockLivingFacilitiesTotalRank(Integer blockLivingFacilitiesTotalRank) {
+ this.blockLivingFacilitiesTotalRank = blockLivingFacilitiesTotalRank;
+ }
+
+ @Column(name = "block_living_facilities_rank")
+ public Integer getBlockLivingFacilitiesRank() {
+ return blockLivingFacilitiesRank;
+ }
+
+ public void setBlockLivingFacilitiesRank(Integer blockLivingFacilitiesRank) {
+ this.blockLivingFacilitiesRank = blockLivingFacilitiesRank;
+ }
+
+ @Column(name = "city_education_rank")
+ public Integer getCityEducationRank() {
+ return cityEducationRank;
+ }
+
+ public void setCityEducationRank(Integer cityEducationRank) {
+ this.cityEducationRank = cityEducationRank;
+ }
+
+ @Column(name = "city_education_total_rank")
+ public Integer getCityEducationTotalRank() {
+ return cityEducationTotalRank;
+ }
+
+ public void setCityEducationTotalRank(Integer cityEducationTotalRank) {
+ this.cityEducationTotalRank = cityEducationTotalRank;
+ }
+
+ @Column(name = "region_education_rank")
+ public Integer getRegionEducationRank() {
+ return regionEducationRank;
+ }
+
+ public void setRegionEducationRank(Integer regionEducationRank) {
+ this.regionEducationRank = regionEducationRank;
+ }
+
+ @Column(name = "region_education_total_rank")
+ public Integer getRegionEducationTotalRank() {
+ return regionEducationTotalRank;
+ }
+
+ public void setRegionEducationTotalRank(Integer regionEducationTotalRank) {
+ this.regionEducationTotalRank = regionEducationTotalRank;
+ }
+
+ @Column(name = "block_education_total_rank")
+ public Integer getBlockEducationTotalRank() {
+ return blockEducationTotalRank;
+ }
+
+ public void setBlockEducationTotalRank(Integer blockEducationTotalRank) {
+ this.blockEducationTotalRank = blockEducationTotalRank;
+ }
+
+ @Column(name = "block_education_rank")
+ public Integer getBlockEducationRank() {
+ return blockEducationRank;
+ }
+
+ public void setBlockEducationRank(Integer blockEducationRank) {
+ this.blockEducationRank = blockEducationRank;
+ }
+
+ @Column(name = "city_hospital_rank")
+ public Integer getCityHospitalRank() {
+ return cityHospitalRank;
+ }
+
+ public void setCityHospitalRank(Integer cityHospitalRank) {
+ this.cityHospitalRank = cityHospitalRank;
+ }
+
+ @Column(name = "city_hospital_total_rank")
+ public Integer getCityHospitalTotalRank() {
+ return cityHospitalTotalRank;
+ }
+
+ public void setCityHospitalTotalRank(Integer cityHospitalTotalRank) {
+ this.cityHospitalTotalRank = cityHospitalTotalRank;
+ }
+
+ @Column(name = "region_hospital_rank")
+ public Integer getRegionHospitalRank() {
+ return regionHospitalRank;
+ }
+
+ public void setRegionHospitalRank(Integer regionHospitalRank) {
+ this.regionHospitalRank = regionHospitalRank;
+ }
+
+ @Column(name = "region_hospital_total_rank")
+ public Integer getRegionHospitalTotalRank() {
+ return regionHospitalTotalRank;
+ }
+
+ public void setRegionHospitalTotalRank(Integer regionHospitalTotalRank) {
+ this.regionHospitalTotalRank = regionHospitalTotalRank;
+ }
+
+ @Column(name = "block_hospital_total_rank")
+ public Integer getBlockHospitalTotalRank() {
+ return blockHospitalTotalRank;
+ }
+
+ public void setBlockHospitalTotalRank(Integer blockHospitalTotalRank) {
+ this.blockHospitalTotalRank = blockHospitalTotalRank;
+ }
+
+ @Column(name = "block_hospital_rank")
+ public Integer getBlockHospitalRank() {
+ return blockHospitalRank;
+ }
+
+ public void setBlockHospitalRank(Integer blockHospitalRank) {
+ this.blockHospitalRank = blockHospitalRank;
+ }
+
+ @Column(name = "m_date")
+ public Date getMDate() {
+ return mDate;
+ }
+
+ public void setMDate(Date mDate) {
+ this.mDate = mDate;
+ }
+
+ @Column(name = "c_date")
+ public Date getCDate() {
+ return cDate;
+ }
+
+ public void setCDate(Date cDate) {
+ this.cDate = cDate;
+ }
+
+
+ @Column(name = "resistance_coef")
+ public Integer getResistanceCoef() {
+ return resistanceCoef;
+ }
+
+ public void setResistanceCoef(Integer resistanceCoef) {
+ this.resistanceCoef = resistanceCoef;
+ }
+}
\ No newline at end of file
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java
index 96b0bcbf3..32c207540 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictAnalyData.java
@@ -80,6 +80,8 @@ public class DistrictAnalyData implements MongoEntity {
private String tag;
private String economic;
private Double halfYearMarkup;
+ private Integer valueRate;
+ private String commId;
@Id
@@ -501,4 +503,21 @@ public class DistrictAnalyData implements MongoEntity {
public void setHalfYearMarkup(Double halfYearMarkup) {
this.halfYearMarkup = halfYearMarkup;
}
+
+ @Column(name = "value_rate")
+ public Integer getValueRate() {
+ return valueRate;
+ }
+
+ public void setValueRate(Integer valueRate) {
+ this.valueRate = valueRate;
+ }
+ @Column(name = "comm_id")
+ public String getCommId() {
+ return commId;
+ }
+
+ public void setCommId(String commId) {
+ this.commId = commId;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java
index 7c8dd0ca2..8bea1a0c3 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Evaluation.java
@@ -146,6 +146,18 @@ public class Evaluation implements MongoEntity {
* 楼层描述
*/
private String floorDesc;
+ /**
+ * 查询范围
+ */
+ private Integer radius;
+ /**
+ * 样本IDS
+ */
+ private String sampleIds;
+ /**
+ * 商铺标签
+ */
+ private String tags;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
@@ -1066,4 +1078,31 @@ public class Evaluation implements MongoEntity {
public void setFloorDesc(String floorDesc) {
this.floorDesc = floorDesc;
}
+
+ @Transient
+ public Integer getRadius() {
+ return radius;
+ }
+
+ public void setRadius(Integer radius) {
+ this.radius = radius;
+ }
+
+ @Transient
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ @Column(name = "sample_ids")
+ public String getSampleIds() {
+ return sampleIds;
+ }
+
+ public void setSampleIds(String sampleIds) {
+ this.sampleIds = sampleIds;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopRentStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopRentStat.java
new file mode 100644
index 000000000..510e8e392
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopRentStat.java
@@ -0,0 +1,84 @@
+package com.fangjia.dal.mongo.model;
+
+import com.fangjia.dal.MongoEntity;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "fangjia_stat.shop_rent_stat")
+public class ShopRentStat implements MongoEntity {
+ private static final long serialVersionUID = 4425229045088250573L;
+
+ private String id;
+ private String cat;
+ private String city;
+ private String district;
+ private Integer date;
+ private Double avgPrice;
+ private String name;
+
+ @Id
+ @GeneratedValue
+ @Column(name = "_id", unique = true, nullable = false)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Column(name = "cat")
+ public String getCat() {
+ return cat;
+ }
+
+ public void setCat(String cat) {
+ this.cat = cat;
+ }
+
+ @Column(name = "city")
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ @Column(name = "district")
+ public String getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(String district) {
+ this.district = district;
+ }
+
+ @Column(name = "date")
+ public Integer getDate() {
+ return date;
+ }
+
+ public void setDate(Integer date) {
+ this.date = date;
+ }
+
+ @Column(name = "avg_price")
+ public Double getAvgPrice() {
+ return avgPrice;
+ }
+
+ public void setAvgPrice(Double avgPrice) {
+ this.avgPrice = avgPrice;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopSellStat.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopSellStat.java
new file mode 100644
index 000000000..97c6c4623
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/ShopSellStat.java
@@ -0,0 +1,84 @@
+package com.fangjia.dal.mongo.model;
+
+import com.fangjia.dal.MongoEntity;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "fangjia_stat.shop_sell_stat")
+public class ShopSellStat implements MongoEntity {
+ private static final long serialVersionUID = 4425229045088250573L;
+
+ private String id;
+ private String cat;
+ private String city;
+ private String district;
+ private Integer date;
+ private Integer avgPrice;
+ private String name;
+
+ @Id
+ @GeneratedValue
+ @Column(name = "_id", unique = true, nullable = false)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Column(name = "cat")
+ public String getCat() {
+ return cat;
+ }
+
+ public void setCat(String cat) {
+ this.cat = cat;
+ }
+
+ @Column(name = "city")
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ @Column(name = "district")
+ public String getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(String district) {
+ this.district = district;
+ }
+
+ @Column(name = "date")
+ public Integer getDate() {
+ return date;
+ }
+
+ public void setDate(Integer date) {
+ this.date = date;
+ }
+
+ @Column(name = "avg_price")
+ public Integer getAvgPrice() {
+ return avgPrice;
+ }
+
+ public void setAvgPrice(Integer avgPrice) {
+ this.avgPrice = avgPrice;
+ }
+
+ @Column(name = "name")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java
index ea8f98f6a..7f302cd8c 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java
@@ -19,6 +19,7 @@ public class Township implements MongoEntity {
private String street;
private String pid;
private String id;
+ private String hasGov;
@JSONField(name = "tjj_province_code")
private String tjjProvinceCode;
@@ -325,4 +326,13 @@ public class Township implements MongoEntity {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ @Column(name = "has_gov")
+ public String getHasGov() {
+ return hasGov;
+ }
+
+ public void setHasGov(String hasGov) {
+ this.hasGov = hasGov;
+ }
}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java
index 6979bd15a..907fee553 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/tool/model/OpenUriLog.java
@@ -1,5 +1,6 @@
package com.fangjia.dal.mongo.tool.model;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
@@ -73,6 +74,7 @@ public class OpenUriLog implements MongoEntity {
private Map resMap;
private String parameterMaps;
private String tid;
+ private Double cost;
public String getParameterMaps() {
return this.parameterMaps;
@@ -238,6 +240,14 @@ public class OpenUriLog implements MongoEntity {
this.tid = tid;
}
+ @Column(name = "cost")
+ public Double getCost() {
+ return cost;
+ }
+
+ public void setCost(Double cost) {
+ this.cost = cost;
+ }
@Override
public String toString() {
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java
index ecb61ff6f..58d5b0b40 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java
@@ -1,6 +1,7 @@
package com.fangjia.dal.seawater.dao;
import java.util.List;
+import java.util.Map;
import com.fangjia.dal.SeawaterQuery;
import com.fangjia.dal.seawater.model.Seawater;
@@ -10,21 +11,24 @@ import com.fangjia.dal.seawater.model.Seawater;
*/
public interface SeawaterDao extends com.fangjia.dal.SeawaterDao {
- long findSeawatersCountFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate,
- Integer room, String root,String table);
-
- Seawater findByIdFromEs(String id,String table);
+ long findSeawatersCountFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate,
+ Integer room, String root, String table);
- List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate,
- Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit , String table);
+ Seawater findByIdFromEs(String id, String table);
- List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit);
+ List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate,
+ Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit, String table);
- List findSeawatersByQuery(SeawaterQuery query);
+ List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit);
- long findSeawatersCountByQuery(SeawaterQuery query);
+ List findSeawatersByQuery(SeawaterQuery query);
- void batchDeleteByParams(SeawaterQuery query);
+ long findSeawatersCountByQuery(SeawaterQuery query);
- void batchUpdateEstateType(SeawaterQuery query);
+ void batchDeleteByParams(SeawaterQuery query);
+
+ void batchUpdateEstateType(SeawaterQuery query);
+
+ List