写字楼出售样本查询优化

This commit is contained in:
liuhongyang
2025-03-27 15:02:48 +08:00
parent 75e954a14c
commit 267d672c53
@@ -186,7 +186,7 @@ public class OfficeServiceImpl implements OfficeService {
selectedSeawaters.add(seawater); selectedSeawaters.add(seawater);
} }
if (selectedSeawaters.size() == 3) { if (selectedSeawaters.size() == 3) {
return getOfficeEvaluationDto(selectedSeawaters, evaluation); return getOfficeEvaluationDto(selectedSeawaters, evaluation, "office_rent");
} }
} }
} }
@@ -279,7 +279,7 @@ public class OfficeServiceImpl implements OfficeService {
selectedSeawaters.add(seawater); selectedSeawaters.add(seawater);
} }
if (selectedSeawaters.size() == 3) { if (selectedSeawaters.size() == 3) {
return getOfficeEvaluationDto(selectedSeawaters, evaluation); return getOfficeEvaluationDto(selectedSeawaters, evaluation, "office_sell");
} }
} }
} }
@@ -328,8 +328,13 @@ public class OfficeServiceImpl implements OfficeService {
private OfficeEvaluationDto getOfficeEvaluationDtoWithAvgPrice(Double avgPrice, Evaluation evaluation, String cat) { private OfficeEvaluationDto getOfficeEvaluationDtoWithAvgPrice(Double avgPrice, Evaluation evaluation, String cat) {
SeawaterQuery query = new SeawaterQuery(); SeawaterQuery query = new SeawaterQuery();
query.setRegion(evaluation.getRegion()); query.setRegion(evaluation.getRegion());
query.setStartPrice((int) (avgPrice * 30 * 0.9)); if ("office_rent".equals(cat)) {
query.setEndPrice((int) (avgPrice * 30 * 1.1)); query.setStartPrice((int) (avgPrice * 30 * 0.9));
query.setEndPrice((int) (avgPrice * 30 * 1.1));
} else {
query.setStartPrice((int) (avgPrice * 0.9));
query.setEndPrice((int) (avgPrice * 1.1));
}
query.setCat(cat); query.setCat(cat);
query.setRadius(3000); query.setRadius(3000);
@@ -345,7 +350,7 @@ public class OfficeServiceImpl implements OfficeService {
query.setPager(pager); query.setPager(pager);
query.setTable("latest_seawater"); query.setTable("latest_seawater");
List<Seawater> seawaters = seawaterService.findSeawatersByQuery(query); List<Seawater> seawaters = seawaterService.findSeawatersByQuery(query);
return getOfficeEvaluationDto(seawaters, evaluation); return getOfficeEvaluationDto(seawaters, evaluation, cat);
} }
/** /**
@@ -418,25 +423,44 @@ public class OfficeServiceImpl implements OfficeService {
* @param evaluation * @param evaluation
* @return * @return
*/ */
private static OfficeEvaluationDto getOfficeEvaluationDto(List<Seawater> seawaters, Evaluation evaluation) { private static OfficeEvaluationDto getOfficeEvaluationDto(List<Seawater> seawaters, Evaluation evaluation, String cat) {
Integer sum = 0; Integer sum = 0;
Double size = 0.0; Double size = 0.0;
for (Seawater seawater : seawaters) { OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto();
if (seawater.getTotalPrice() != null && seawater.getArea() != null && seawater.getTotalPrice() / seawater.getArea() / 30 > 0 && seawater.getTotalPrice() / seawater.getArea() / 30 < 30) {
sum += seawater.getTotalPrice(); if ("office_rent".equals(cat)) {
size += seawater.getArea(); for (Seawater seawater : seawaters) {
if (seawater.getTotalPrice() != null && seawater.getArea() != null && seawater.getTotalPrice() / seawater.getArea() / 30 > 0 && seawater.getTotalPrice() / seawater.getArea() / 30 < 30) {
sum += seawater.getTotalPrice();
size += seawater.getArea();
}
}
if (size > 0) {
Double unitPrice = DataUtil.roundDouble(sum / size / 30, 2);
officeEvaluationDto.setUnitPrice(unitPrice);
officeEvaluationDto.setSeawater(seawaters);
officeEvaluationDto.setCity(evaluation.getCity());
officeEvaluationDto.setDistrict(evaluation.getRegion());
officeEvaluationDto.setName(evaluation.getDistrictName());
}
} else {
for (Seawater seawater : seawaters) {
if (seawater.getTotalPrice() != null && seawater.getArea() != null && seawater.getTotalPrice() / seawater.getArea() > 0) {
sum += seawater.getTotalPrice();
size += seawater.getArea();
}
}
if (size > 0) {
Double unitPrice = DataUtil.roundDouble(sum / size, 2);
officeEvaluationDto.setUnitPrice(unitPrice);
officeEvaluationDto.setSeawater(seawaters);
officeEvaluationDto.setCity(evaluation.getCity());
officeEvaluationDto.setDistrict(evaluation.getRegion());
officeEvaluationDto.setName(evaluation.getDistrictName());
} }
} }
OfficeEvaluationDto officeEvaluationDto = new OfficeEvaluationDto();
if (size > 0) {
Double unitPrice = DataUtil.roundDouble(sum / size / 30, 2);
officeEvaluationDto.setUnitPrice(unitPrice);
officeEvaluationDto.setSeawater(seawaters);
officeEvaluationDto.setCity(evaluation.getCity());
officeEvaluationDto.setDistrict(evaluation.getRegion());
officeEvaluationDto.setName(evaluation.getDistrictName());
}
return officeEvaluationDto; return officeEvaluationDto;
} }