实有房屋接口更新

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

@@ -328,14 +328,14 @@ public class BigScreenController extends BaseController {
     public AjaxResult buildRealEstate(@ApiParam("楼栋地址")  @RequestParam String para) {
         try {
 
-            int index = para.indexOf("幢");
+            int index = para.lastIndexOf("幢");
             String buildName = null;
             if (index != -1 && index > 0 ){
                 buildName = String.valueOf(para.charAt(index-1));
-                para = para.substring(index - 1);
+                para = para.substring(0,index - 1);
             }
             QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like("real_estate_address", para);
+            queryWrapper.eq("real_estate_brief_address",para);
             queryWrapper.eq("building_name",buildName);
             int a = realEstateInfoService.count(queryWrapper);
             List<MetaRealEstateInfo> list = realEstateInfoService.list(queryWrapper);
@@ -372,16 +372,25 @@ public class BigScreenController extends BaseController {
     @ApiOperation("楼栋信息:实有人口统计")
     public AjaxResult buildRealActual(@ApiParam("楼栋地址")  @RequestParam String para) {
         try {
+            int index = para.indexOf("幢");
+            String buildName = null;
+            if (index != -1 && index > 0 ){
+                buildName = String.valueOf(para.charAt(index-1));
+                para = para.substring(0,index - 1);
+            }
 
             // 创建查询条件，使用模糊查询
             QueryWrapper<MetaRealEstateInfo> queryWrapperEstate = new QueryWrapper<>();
-            queryWrapperEstate.like("real_estate_address", para); // 你需要替换成实际的模糊查询条件
+//            queryWrapperEstate.like("real_estate_address", para); // 你需要替换成实际的模糊查询条件
+            queryWrapperEstate.eq("real_estate_brief_address", para);
+            queryWrapperEstate.eq("building_name",buildName);
             // 执行查询
             List<MetaRealEstateInfo> realEstateInfos = realEstateInfoService.list(queryWrapperEstate);
 
             // 提取符合条件的 realEstateAddress 字段
             List<String> realEstateAddressList = realEstateInfos.stream()
                     .map(MetaRealEstateInfo::getRealEstateAddress)
+                    .distinct()
                     .collect(Collectors.toList());
 
 
@@ -441,9 +450,17 @@ public class BigScreenController extends BaseController {
             @ApiParam(value = "单元") @RequestParam String unit) {
         try {
             //获取到房屋数据的实际地址
-            para = para.substring(0, para.indexOf("号"));
+//            para = para.substring(0, para.indexOf("号"));
+            int index = para.indexOf("幢");
+            String buildName = null;
+            if (index != -1 && index > 0 ){
+                buildName = String.valueOf(para.charAt(index-1));
+                para = para.substring(0,index - 1);
+            }
             QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like("real_estate_address", para);
+            queryWrapper.eq("real_estate_brief_address", para);
+//            queryWrapper.like("real_estate_address", para);
+            queryWrapper.eq("building_name",buildName);
             queryWrapper.eq("unit_name", unit);
             List<MetaRealEstateInfo> estateInfoList = realEstateInfoService.list(queryWrapper);
 

gather-app/src/main/java/com/ruoyi/database/controller/MetaRealEstateInfoController.java

@@ -47,9 +47,9 @@ public class MetaRealEstateInfoController extends BaseController {
 
         for (MetaRealEstateInfo info : list) {
             // 检查realEstateAddress是否包含"独立商铺"，如果是则跳过这些记录
-            if (info.getRealEstateAddress() != null && info.getRealEstateAddress().contains("独立商铺")) {
-                continue; // 跳过包含"独立商铺"的记录
-            }
+//            if (info.getRealEstateAddress() != null && info.getRealEstateAddress().contains("独立商铺")) {
+//                continue; // 跳过包含"独立商铺"的记录
+//            }
 
             MetaRealEstateInfoDTO dto = new MetaRealEstateInfoDTO();
             // Copy existing fields