feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/enums/HouseEnums.java

@@ -38,7 +38,8 @@ public class HouseEnums {
         // 房源类型
         ZY(0, "在营"),
         KZ(1, "闲置"),
-        GK(2, "挂靠");
+        GK(2, "挂靠"),
+        SBC(3, "设备层");
 
         private final int code;
         private final String desc;

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

@@ -12,9 +12,12 @@ public class HouseResourceProfileGraph {
 
     private String wgName;
 
-    private BigDecimal jzArea;
-
     private BigDecimal jyArea;
 
+    private BigDecimal kzArea;
+
+    @Deprecated
+    private BigDecimal jzArea;
+
     private List<HouseResourcePage> houseResources;
 }

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

@@ -171,11 +171,8 @@ 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.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).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);