实有房屋接口更新

gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java

@@ -7,9 +7,10 @@ import com.ruoyi.business.domain.vo.*;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.business.controller.utils.NumKit;
-import com.ruoyi.business.controller.utils.StringKit;
+
+import com.ruoyi.common.utils.NumKit;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringKit;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.database.domain.*;
 import com.ruoyi.database.domain.dto.MetaRealEstateInfoDTO;
@@ -65,8 +66,8 @@ public class BigScreenController extends BaseController {
 //            querySyrkWrapper.ne("actual_user_type", 101);
             int actualUserSyrkCount = actualUserInfoService.count();
             //实有房屋总数
-            int countSyfw = realEstateInfoService.countSyfw(new MetaRealEstateInfo());
-
+//            int countSyfw = realEstateInfoService.countSyfw(new MetaRealEstateInfo());
+            int countSyfw = realEstateInfoService.count();
             //实有单位总数
             int countSydw = actualUnitInfoService.count();
 
@@ -104,8 +105,8 @@ public class BigScreenController extends BaseController {
         QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.between("longitude", startLongitude, endLongitude)
                 .between("latitude", startLatitude, endLatitude);
+        queryWrapper.groupBy("real_estate_brief_address","building_name");
         List<MetaRealEstateInfo> list = realEstateInfoService.list(queryWrapper);
-        int count = realEstateInfoService.count(queryWrapper);
         List<MetaRealEstateInfoDTO> resultList = new ArrayList<>();
         for (MetaRealEstateInfo info : list) {
             MetaRealEstateInfoDTO dto = new MetaRealEstateInfoDTO();
@@ -550,12 +551,13 @@ public class BigScreenController extends BaseController {
                     })
                     .collect(Collectors.toList());
             Map<String, List<Map<String, String>>> resultMap = modifiedEstateInfoList.stream()
-                    .filter(info -> info.getHomeName().length() >= 3 && info.getHomeName().length() <= 4)
+                    .filter(info -> info.getHomeName() != "0")
                     .collect(Collectors.groupingBy(
                             info -> {
                                 String homeName = info.getHomeName();
-                                return homeName.length() == 3 ? String.valueOf(homeName.charAt(0)) :
-                                        homeName.length() == 4 ? homeName.substring(0, 2) : null;
+//                                return homeName.length() == 3 ? String.valueOf(homeName.charAt(0)) :
+//                                        homeName.length() == 4 ? homeName.substring(0, 2) : null;
+                                return homeName;
                             },
                             Collectors.mapping(
                                     info -> {
@@ -607,14 +609,14 @@ public class BigScreenController extends BaseController {
             queryWrapper.eq("rental_housing_address", para);
             long count = housingInfoService.count(queryWrapper);
             //是否出租
-            homeInfoVo.setIsRent(count > 0 ? "" : "出租");
+            homeInfoVo.setIsRent(count > 0 ? "出租" : "");
             //
             homeInfoVo.setPoliceDistrictCode(estateInfo.getPoliceDistrictCode());
             buildUserInformationVo.setHomeInfo(homeInfoVo);
 
 
             QueryWrapper<MetaActualUserInfo> actualQueryWrapper = new QueryWrapper<>();
-            actualQueryWrapper.eq("home_id", estateInfo == null ? null : estateInfo.getId());
+            actualQueryWrapper.eq("habitation_address", estateInfo == null ? null : estateInfo.getRealEstateAddress());
             List<MetaActualUserInfo> actualUserInfos = actualUserInfoService.list(actualQueryWrapper);