大屏房屋统计

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeStatisticsResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description 街道房屋统计
+ * @Author lc
+ * @Date
+ */
+@NoArgsConstructor
+@Data
+public class HouseStreeStatisticsResultDTO implements Serializable {
+    private static final long serialVersionUID = -1098032063828430218L;
+    private String streeId;
+    private String name;
+    private Integer count;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeTypeStatisticsResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description 街道房屋 类型 统计
+ * @Author lc
+ * @Date
+ */
+@NoArgsConstructor
+@Data
+public class HouseStreeTypeStatisticsResultDTO implements Serializable {
+    private static final long serialVersionUID = -1098032063828430218L;
+    private String type;
+    private String typeName;
+    private Integer count;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -666,4 +666,30 @@ public class HouseController implements ResultDataResolver {
         return new Result().ok(result);
     }
 
+    /**
+     * @Description: 获取大屏街道统计
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HouseStreeStatisticsResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/12/4 13:58
+     */
+    @GetMapping("screen/getStreeHouseStatistics")
+    public Result<List<HouseStreeStatisticsResultDTO>> getStreeHouseStatistics() {
+        List<HouseStreeStatisticsResultDTO> result = houseService.getStreeHouseStatistics();
+        return new Result<List<HouseStreeStatisticsResultDTO>>().ok(result);
+    }
+
+    /**
+     * @Description: 获取大屏街道 类型 统计
+     * @param : streetId
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HouseStreeStatisticsResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/12/4 13:58
+     */
+    @GetMapping("screen/getStreeHouseTypeStatistics")
+    public Result<List<HouseStreeTypeStatisticsResultDTO>> getStreeHouseTypeStatistics(String streetId) {
+        List<HouseStreeTypeStatisticsResultDTO> result = houseService.getStreeHouseTypeStatistics(streetId);
+        return new Result<List<HouseStreeTypeStatisticsResultDTO>>().ok(result);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -204,4 +204,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<HouseInfoDTO> getMicroGridHouseList(@Param("microGridId") String microGridId);
 
     String getMicroGridHouseName(@Param("id") String levelId);
+
+    List<HouseStreeTypeStatisticsResultDTO> getStreeHouseTypeStatistics(@Param("pids") String pids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -201,4 +201,8 @@ public interface HouseService {
     boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto);
 
     String getMicroGridHouseName(String levelId, String level);
+
+    List<HouseStreeStatisticsResultDTO> getStreeHouseStatistics();
+
+    List<HouseStreeTypeStatisticsResultDTO> getStreeHouseTypeStatistics(String streetId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -1360,4 +1360,47 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
         return result;
     }
+
+    @Override
+    public List<HouseStreeStatisticsResultDTO> getStreeHouseStatistics() {
+
+        List<HouseStreeStatisticsResultDTO> result = new ArrayList<>();
+
+        LambdaQueryWrapper<CustomerAgencyEntity> agencyEntityLambdaQueryWrapper
+                = new LambdaQueryWrapper<CustomerAgencyEntity>().eq(CustomerAgencyEntity::getLevel,"street");
+        List<CustomerAgencyEntity> streetList = customerAgencyDao.selectList(agencyEntityLambdaQueryWrapper);
+
+//        Map<String, CustomerAgencyEntity> streetMaps = streetList.stream().collect(Collectors.toMap(CustomerAgencyEntity::getId,entity->entity));
+//        List<String> streetIds = streetList.stream().map(street->street.getPids()+street.getId()).collect(Collectors.toList());
+
+        streetList.forEach(
+                street -> {
+                    HouseStreeStatisticsResultDTO houseStreeStatisticsResultDTO = new HouseStreeStatisticsResultDTO();
+
+                    LambdaQueryWrapper<IcHouseEntity> houseEntityLambdaQueryWrapper
+                            = new LambdaQueryWrapper<IcHouseEntity>().likeRight(IcHouseEntity::getOrgIdPath, street.getPids()+ ":" + street.getId());
+                    List<IcHouseEntity> houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper);
+                    houseStreeStatisticsResultDTO.setName(street.getOrganizationName());
+                    houseStreeStatisticsResultDTO.setStreeId(street.getId());
+                    houseStreeStatisticsResultDTO.setCount(houseEntities.size());
+                    result.add(houseStreeStatisticsResultDTO);
+                });
+        return result;
+    }
+
+    @Override
+    public List<HouseStreeTypeStatisticsResultDTO> getStreeHouseTypeStatistics(String streetId) {
+
+
+        List<HouseStreeTypeStatisticsResultDTO> result = new ArrayList<>();
+
+        CustomerAgencyEntity street = customerAgencyDao.selectById(streetId);
+
+        if (street!=null){
+            result = icHouseDao.getStreeHouseTypeStatistics(street.getPids() +":"+ street.getId());
+        }else{
+            throw new EpmetException("未查询到街道"+streetId);
+        }
+        return result;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -567,6 +567,14 @@
             house.id = #{id}
 
     </select>
+    <select id="getStreeHouseTypeStatistics"
+            resultType="com.epmet.dto.result.HouseStreeTypeStatisticsResultDTO">
 
-
+        select count(1) as count,RENT_FLAG as type,
+               if(RENT_FLAG=0,'自住',if(RENT_FLAG = 1,'出租',if(RENT_FLAG=2,'闲置',if(RENT_FLAG = 3,'未售出','')))) as typeName
+        from ic_house
+        where ORG_ID_PATH
+        like concat(#{pids},'%')
+        group by RENT_FLAG
+    </select>
 </mapper>