Merge branch 'open_v2' into 'master'

周边房源单位修改及平米租金接口单位

See merge request !1208
This commit is contained in:
2025-12-19 09:56:35 +08:00
2 changed files with 29 additions and 19 deletions
@@ -975,6 +975,21 @@ public class HouseController {
mav.setModel(BasicModel.buildBadRequestModel("非中国经纬度"));
return mav;
}
List<Seawater> houses = new ArrayList<Seawater>();
List<Seawater> houseSelf = new ArrayList<Seawater>();
List<Seawater> houseAround = new ArrayList<Seawater>();
List<Seawater> houseList = new ArrayList<Seawater>();
// if (cat.contains("_")) {
// 商铺,写字楼有经纬度,直接查
SeawaterQuery query = new SeawaterQuery();
// 先用名字查自身的样本
query.setCityDisplay(city);
query.setRegion(region);
query.setDistrictName(districtName);
query.setStartDate(model.getStartTime());
query.setEndDate(model.getEndTime());
String category = "district";
if ("1".equals(model.getPropertyType())) {
category = "office";
@@ -991,6 +1006,11 @@ public class HouseController {
} else {
cat = "rent";
}
if (model.getPrice() != null) {
query.setStartPrice((int) (model.getPrice() * 0.9 * 30));
query.setEndPrice((int) (model.getPrice() * 1.1 * 30));
}
} else {
if ("1".equals(model.getPropertyType())) {
cat = "office_sell";
@@ -998,21 +1018,13 @@ public class HouseController {
if ("2".equals(model.getPropertyType())) {
cat = "shop_sell";
}
if (model.getPrice() != null) {
query.setStartPrice((int) (model.getPrice() * 0.9));
query.setEndPrice((int) (model.getPrice() * 1.1));
}
}
List<Seawater> houses = new ArrayList<Seawater>();
List<Seawater> houseSelf = new ArrayList<Seawater>();
List<Seawater> houseAround = new ArrayList<Seawater>();
List<Seawater> houseList = new ArrayList<Seawater>();
// if (cat.contains("_")) {
// 商铺,写字楼有经纬度,直接查
SeawaterQuery query = new SeawaterQuery();
// 先用名字查自身的样本
query.setCityDisplay(city);
query.setRegion(region);
query.setDistrictName(districtName);
query.setCat(cat);
query.setStartDate(model.getStartTime());
query.setEndDate(model.getEndTime());
if (model.getSize() != null && model.getSize() != 0) {
query.setStartArea(model.getSize() * 0.9);
@@ -1025,10 +1037,6 @@ public class HouseController {
} else {
pager.setPageSize(5);
}
if (model.getPrice() != null) {
query.setStartPrice((int) (model.getPrice() * 0.9));
query.setEndPrice((int) (model.getPrice() * 1.1));
}
query.setPager(pager);
query.setSortField("p_date");
query.setOrder(false);
@@ -1,6 +1,7 @@
package com.fangjia.open.controllers;
import com.fangjia.core.RegionData;
import com.fangjia.core.util.DataUtil;
import com.fangjia.core.util.DateUtil;
import com.fangjia.dal.mongo.model.SqmetreRent;
import com.fangjia.dal.seaweed.model.District;
@@ -232,7 +233,8 @@ public class SqmetreRentController {
item.put("district", sqmetreRent.getRegion());
item.put("name", sqmetreRent.getDistrictName());
Integer currentRent = (sqmetreRent.getAvgPrice() != null) ? sqmetreRent.getAvgPrice().intValue() : 0;
item.put("rent", currentRent);
Double dayRentPrice = currentRent/30.0;
item.put("rent", DataUtil.getRound(2, dayRentPrice));
item.put("date", sqmetreRent.getWeekend() != null ? DateUtil.formatByPattern(sqmetreRent.getWeekend(), "yyyy-MM") : "未知日期");
// 计算月涨幅
@@ -249,7 +251,7 @@ public class SqmetreRentController {
}
// 设置返回结果,防止 subList 越界
if (result.size() > 1) {
if (result.size() > 0) {
mav.setModel(BasicModel.buildOKModel().setResult(result.subList(1, result.size())));
} else {
mav.setModel(BasicModel.buildOKModel().setResult(null));