Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
|
||||
<meta name="baidu-site-verification" content="codeva-PD58wqOG1Q" />
|
||||
<meta name="baidu-site-verification" content="codeva-tQ1XnRBEAd" />
|
||||
<title>全国房价查询,上海房价,房产评估,地址搜索,房产信息网 - 房价网 fangjia.com</title>
|
||||
<meta name="keywords" content="房产评估,房产估价,房价走势,房产大数据">
|
||||
<meta name="description" content="房价网是国内最早成立的第三方线上房产估价平台,建立了中国领先的房产大数据库(CPDB),提供全国367个城市基于地址的房产大数据服务。">
|
||||
|
||||
+66
-69
@@ -746,78 +746,75 @@ public class PropertyController {
|
||||
}
|
||||
}
|
||||
|
||||
if (model.getDetailLevel() != null && model.getDetailLevel() >= 1) {
|
||||
districtInfoDto.setBlock(district.getBlock());
|
||||
districtInfoDto.setBlock(district.getBlock());
|
||||
districtInfoDto.setLoopLine(district.getLoopLineInfo());
|
||||
if (HouseValidator.validateBuildingType(district.getBuildType())) {
|
||||
districtInfoDto.setBuildingType(district.getBuildType());
|
||||
} else {
|
||||
districtInfoDto.setBuildingType("");
|
||||
}
|
||||
districtInfoDto.setAlias(district.getMappingAlias());
|
||||
districtInfoDto.setAddressAlias(district.getAddrAlias());
|
||||
districtInfoDto.setCommunity(district.getStreetCommunity());
|
||||
districtInfoDto.setCommercialArea(district.getBusinessQuarter());
|
||||
if (district.getHouseholdCount() != null) {
|
||||
districtInfoDto.setTotalUnitCount(SeaweedUtils.formatHouseholdCount(district.getHouseholdCount().toString()));
|
||||
} else {
|
||||
districtInfoDto.setTotalUnitCount("");
|
||||
}
|
||||
districtInfoDto.setManagementFee(district.getEstateCharge());
|
||||
if (district.getCarSiteCount() != null) {
|
||||
districtInfoDto.setParking(SeaweedUtils.formatCarSiteCount(district.getCarSiteCount().toString()));
|
||||
} else {
|
||||
districtInfoDto.setParking("");
|
||||
}
|
||||
districtInfoDto.setParkingDescription(district.getCarSite());
|
||||
districtInfoDto.setOwnershipPeriod(district.getPropertyLife());
|
||||
districtInfoDto.setOwnershipType(district.getHouseProperty());
|
||||
districtInfoDto.setStartBuildTime(district.getStartBuildingDate());
|
||||
if (district.getOpenDate() != null) {
|
||||
Date minDate = DateUtil.parseDate("1900-01-01", "yyyy-MM-dd");
|
||||
Date maxDate = DateUtil.parseDate("2025-01-01", "yyyy-MM-dd");
|
||||
if (district.getOpenDate().after(minDate) && district.getOpenDate().before(maxDate)) {
|
||||
districtInfoDto
|
||||
.setStartSellingTime(DateUtil.formatByPattern(district.getOpenDate(), "yyyy-MM-dd"));
|
||||
}
|
||||
} else {
|
||||
districtInfoDto.setStartSellingTime("");
|
||||
}
|
||||
|
||||
if (model.getDetailLevel() != null && model.getDetailLevel() >= 2) {
|
||||
districtInfoDto.setLoopLine(district.getLoopLineInfo());
|
||||
if (HouseValidator.validateBuildingType(district.getBuildType())) {
|
||||
districtInfoDto.setBuildingType(district.getBuildType());
|
||||
} else {
|
||||
districtInfoDto.setBuildingType("");
|
||||
}
|
||||
districtInfoDto.setAlias(district.getMappingAlias());
|
||||
districtInfoDto.setAddressAlias(district.getAddrAlias());
|
||||
districtInfoDto.setCommunity(district.getStreetCommunity());
|
||||
districtInfoDto.setCommercialArea(district.getBusinessQuarter());
|
||||
if (district.getHouseholdCount() != null) {
|
||||
districtInfoDto.setTotalUnitCount(SeaweedUtils.formatHouseholdCount(district.getHouseholdCount().toString()));
|
||||
} else {
|
||||
districtInfoDto.setTotalUnitCount("");
|
||||
}
|
||||
districtInfoDto.setManagementFee(district.getEstateCharge());
|
||||
if (district.getCarSiteCount() != null) {
|
||||
districtInfoDto.setParking(SeaweedUtils.formatCarSiteCount(district.getCarSiteCount().toString()));
|
||||
} else {
|
||||
districtInfoDto.setParking("");
|
||||
}
|
||||
districtInfoDto.setParkingDescription(district.getCarSite());
|
||||
districtInfoDto.setOwnershipPeriod(district.getPropertyLife());
|
||||
districtInfoDto.setOwnershipType(district.getHouseProperty());
|
||||
districtInfoDto.setStartBuildTime(district.getStartBuildingDate());
|
||||
if (district.getOpenDate() != null) {
|
||||
Date minDate = DateUtil.parseDate("1900-01-01", "yyyy-MM-dd");
|
||||
Date maxDate = DateUtil.parseDate("2025-01-01", "yyyy-MM-dd");
|
||||
if (district.getOpenDate().after(minDate) && district.getOpenDate().before(maxDate)) {
|
||||
districtInfoDto
|
||||
.setStartSellingTime(DateUtil.formatByPattern(district.getOpenDate(), "yyyy-MM-dd"));
|
||||
}
|
||||
} else {
|
||||
districtInfoDto.setStartSellingTime("");
|
||||
}
|
||||
|
||||
districtInfoDto.setFinishBuildTime(district.getFinishBuildingDate());
|
||||
districtInfoDto.setMoveinTime(district.getLiveDate());
|
||||
districtInfoDto.setFloorSpace(SeaweedUtils.formatAllArea(district.getAllArea()));
|
||||
districtInfoDto.setConstructionSpace(district.getBuildArea());
|
||||
districtInfoDto.setPlotRatio(SeaweedUtils.formatCubagePercent(district.getCubagePercent()));
|
||||
districtInfoDto.setGreenPercentage(SeaweedUtils.formatVirescencePercent(district.getVirescencePercent()));
|
||||
districtInfoDto.setPreSalePermit(district.getLicence());
|
||||
districtInfoDto.setDeveloper(district.getDeveloper());
|
||||
districtInfoDto.setDiscount(district.getDiscount());
|
||||
districtInfoDto.setPropertyManagement(district.getEstateCompany());
|
||||
if (HouseValidator.fetchFitmentInfo(district.getFitment()) == null) {
|
||||
districtInfoDto.setDecorationStandard("");
|
||||
} else {
|
||||
districtInfoDto.setDecorationStandard(HouseValidator.fetchFitmentInfo(district.getFitment()));
|
||||
}
|
||||
districtInfoDto.setBuildingStructure(district.getBuildStructure());
|
||||
districtInfoDto.setSupportingFacilities(district.getFacilities());
|
||||
districtInfoDto.setTransportation(district.getTraffic());
|
||||
districtInfoDto.setRelatedInfo(district.getRelateInfo());
|
||||
districtInfoDto.setDescription(district.getDescription());
|
||||
districtInfoDto.setSalesOfficeAdd(district.getSellAddress());
|
||||
districtInfoDto.setSalesPhoneNumber(district.getMobile());
|
||||
districtInfoDto.setTownship(district.getTownship());
|
||||
if (district.getLoudongCount() != null && district.getLoudongCount() > 0) {
|
||||
districtInfoDto.setBuildingCount(district.getLoudongCount());
|
||||
}
|
||||
Integer finishYear = districtService.getBuildYear(district);
|
||||
if (finishYear != null) {
|
||||
districtInfoDto.setFinishYear(finishYear);
|
||||
}
|
||||
districtInfoDto.setFinishBuildTime(district.getFinishBuildingDate());
|
||||
districtInfoDto.setMoveinTime(district.getLiveDate());
|
||||
districtInfoDto.setFloorSpace(SeaweedUtils.formatAllArea(district.getAllArea()));
|
||||
districtInfoDto.setConstructionSpace(district.getBuildArea());
|
||||
districtInfoDto.setPlotRatio(SeaweedUtils.formatCubagePercent(district.getCubagePercent()));
|
||||
districtInfoDto.setGreenPercentage(SeaweedUtils.formatVirescencePercent(district.getVirescencePercent()));
|
||||
districtInfoDto.setPreSalePermit(district.getLicence());
|
||||
districtInfoDto.setDeveloper(district.getDeveloper());
|
||||
districtInfoDto.setDiscount(district.getDiscount());
|
||||
districtInfoDto.setPropertyManagement(district.getEstateCompany());
|
||||
if (HouseValidator.fetchFitmentInfo(district.getFitment()) == null) {
|
||||
districtInfoDto.setDecorationStandard("");
|
||||
} else {
|
||||
districtInfoDto.setDecorationStandard(HouseValidator.fetchFitmentInfo(district.getFitment()));
|
||||
}
|
||||
districtInfoDto.setBuildingStructure(district.getBuildStructure());
|
||||
districtInfoDto.setSupportingFacilities(district.getFacilities());
|
||||
districtInfoDto.setTransportation(district.getTraffic());
|
||||
districtInfoDto.setRelatedInfo(district.getRelateInfo());
|
||||
districtInfoDto.setDescription(district.getDescription());
|
||||
districtInfoDto.setSalesOfficeAdd(district.getSellAddress());
|
||||
districtInfoDto.setSalesPhoneNumber(district.getMobile());
|
||||
districtInfoDto.setTownship(district.getTownship());
|
||||
if (district.getLoudongCount() != null && district.getLoudongCount() > 0) {
|
||||
districtInfoDto.setBuildingCount(district.getLoudongCount());
|
||||
}
|
||||
// Integer finishYear = districtService.getBuildYear(district);
|
||||
Integer finishYear = districtService.getCreateYear(district);
|
||||
if (finishYear != null) {
|
||||
districtInfoDto.setFinishYear(finishYear);
|
||||
}
|
||||
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(districtInfoDto));
|
||||
return mav;
|
||||
}
|
||||
|
||||
+2
@@ -563,6 +563,8 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
|
||||
*/
|
||||
Integer getBuildYear(District district);
|
||||
|
||||
Integer getCreateYear(District district);
|
||||
|
||||
/**
|
||||
* in查询小区信息
|
||||
*
|
||||
|
||||
+9
@@ -2667,6 +2667,15 @@ public class DistrictServiceImpl implements DistrictService {
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getCreateYear(District district) {
|
||||
Integer buildYear = getYearFormDate(district.getCreateYear());
|
||||
int minYear = Integer.MAX_VALUE;
|
||||
if (buildYear != null && buildYear < minYear) {
|
||||
minYear = buildYear;
|
||||
}
|
||||
return minYear;
|
||||
}
|
||||
|
||||
public Integer getBuildYear(District district) {
|
||||
|
||||
Integer finishYear = getYearFormDate(district.getFinishBuildingDate());
|
||||
|
||||
Reference in New Issue
Block a user