Commit 5f7f0202 authored by lixuan's avatar lixuan

feat: 房源

parent 75a2d96a
Pipeline #143841 failed with stages
in 30 minutes and 36 seconds
...@@ -16,6 +16,8 @@ public class HouseResourceProfileGraph { ...@@ -16,6 +16,8 @@ public class HouseResourceProfileGraph {
private BigDecimal kzArea; private BigDecimal kzArea;
private long kzCount;
@Deprecated @Deprecated
private BigDecimal jzArea; private BigDecimal jzArea;
......
...@@ -172,6 +172,7 @@ public class HouseResourceServiceImpl implements HouseResourceService { ...@@ -172,6 +172,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
houseResourceProfileGraph.setWgName(wgName); houseResourceProfileGraph.setWgName(wgName);
} }
houseResourceProfileGraph.setJyArea(v.stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); houseResourceProfileGraph.setJyArea(v.stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
houseResourceProfileGraph.setKzCount(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).count());
houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add)); houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
List<HouseResourcePage> houseResourcePages = handleHouseList(v); List<HouseResourcePage> houseResourcePages = handleHouseList(v);
houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList())); houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
...@@ -320,12 +321,6 @@ public class HouseResourceServiceImpl implements HouseResourceService { ...@@ -320,12 +321,6 @@ public class HouseResourceServiceImpl implements HouseResourceService {
Map<String, List<HouseResource>> collect = result.stream().collect(Collectors.groupingBy(HouseResource::getThree)); Map<String, List<HouseResource>> collect = result.stream().collect(Collectors.groupingBy(HouseResource::getThree));
pageBusinessEntityStatisticsDetail.setSjTotalCount(collect.size()); pageBusinessEntityStatisticsDetail.setSjTotalCount(collect.size());
for (String three : collect.keySet()) {
System.out.println("three = " + three);
long count = result.stream().filter(x -> x.getThree().equals(three)).filter(x -> x.getType() == 1).count();
System.out.println("count = " + count);
}
return pageBusinessEntityStatisticsDetail; return pageBusinessEntityStatisticsDetail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment