feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java

@@ -39,4 +39,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private BigDecimal yearSellMax;
 
     private List<String> wgCodes;
+
+    private String name;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceProfileGraph.java

@@ -18,8 +18,9 @@ public class HouseResourceProfileGraph {
 
     private long kzCount;
 
-    @Deprecated
     private BigDecimal jzArea;
 
+    private BigDecimal areaTotal;
+
     private List<HouseResourcePage> houseResources;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -187,9 +187,14 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             if (StringUtils.hasText(wgName)) {
                 houseResourceProfileGraph.setWgName(wgName);
             }
+            String jzAreaByCode = gridRegionMapper.getJzAreaByCode(k);
+            if (StringUtils.hasText(jzAreaByCode)) {
+                houseResourceProfileGraph.setJzArea(new BigDecimal(jzAreaByCode));
+            }
             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.setAreaTotal(v.stream().map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             List<HouseResourcePage> houseResourcePages = handleHouseList(v);
             houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
             resourceProfileGraphList.add(houseResourceProfileGraph);

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -152,6 +152,9 @@
             <if test="query.houseResourceType != null">
                 and t1.house_resource_type = #{query.houseResourceType}
             </if>
+            <if test="query.name != null and query.name != ''">
+                and t3.name like concat('%', #{query.name}, '%')
+            </if>
             <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
                 and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>