merge

air/src/main/java/com/air/housing/controller/BlocksController.java

@@ -27,22 +27,22 @@ public class BlocksController {
 
     private final BlocksService blocksService;
 
-    /**
-     * 分页查询
-     *
-     * @param page   分页对象
-     * @param blocks 楼栋信息
-     * @return
-     */
-    @ApiOperation(value = "分页查询", notes = "分页查询")
-    @GetMapping("/page")
-    public R getBlocksPage(Page page, Blocks blocks) {
-        return R.ok(blocksService.page(page, Wrappers.query(blocks)));
-    }
+//    /**
+//     * 分页查询
+//     *
+//     * @param page   分页对象
+//     * @param blocks 楼栋信息
+//     * @return
+//     */
+//    @ApiOperation(value = "分页查询", notes = "分页查询")
+//    @GetMapping("/page")
+//    public R getBlocksPage(Page page, Blocks blocks) {
+//        return R.ok(blocksService.page(page, Wrappers.query(blocks)));
+//    }
 
     @ApiOperation(value = "根据楼盘id分页查询", notes = "根据楼盘id分页查询")
-    @PostMapping("/getPageByHousingEstatesId")
-    public R getBlocksPageByHousingEstatesId(Page page, @RequestBody BlockListDto blocks) {
+    @GetMapping("/page")
+    public R getBlocksPageByHousingEstatesId(Page page, BlockListDto blocks) {
         return R.ok(blocksService.getBlocksPageByHousingEstatesId(page,blocks));
     }
     /**

air/src/main/java/com/air/housing/dto/HousingDefine.java

@@ -18,7 +18,7 @@ public class HousingDefine {
     @ApiModelProperty(value = "楼盘名称")
     private String name;
     @ApiModelProperty(value = "公告id")
-    private Long annoId;
+    private String annoId;
     @ApiModelProperty(value = "大业态")
     private String largeFormat;
     @ApiModelProperty(value = "业态")

air/src/main/java/com/air/housing/entity/HousingEstates.java

@@ -30,7 +30,7 @@ public class HousingEstates extends Model<HousingEstates> {
     private Long housingEstatesId;
 
     @ApiModelProperty(value = "公告id")
-    private Long annoId;
+    private String annoId;
 
     @ApiModelProperty(value = "315楼盘名称（爬虫获取的）")
     private String netName;

air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

@@ -16,6 +16,7 @@ import com.air.housing.service.HousingEstatesService;
 import com.air.housing.vo.HousingEstatesDetail;
 import com.air.housing.vo.HousingEstatesName;
 import com.air.land.entity.LandListed;
+import com.air.land.mapper.LandListedMapper;
 import com.air.land.service.LandListedService;
 import com.air.origin.entity.BlocksOrigin;
 import com.air.origin.entity.HousesOrigin;
@@ -55,7 +56,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     @Autowired
     private HousingEstatesMapper housingEstatesMapper;
     @Autowired
-    private LandListedService landListedService;
+    private LandListedMapper landListedMapper;
     @Autowired
     private FormatService formatService;
 
@@ -109,7 +110,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     @Override
     public HousingEstatesDetail getHousingEstatesDetail(Long housingEstatesId, Long blockId) {
         HousingEstates housingEstates = baseMapper.selectById(housingEstatesId);
-        LandListed landListed = landListedService.getOne(Wrappers.<LandListed>lambdaQuery().eq(StringUtils.isNotBlank(String.valueOf(housingEstates.getAnnoId())),LandListed::getAnnoId,housingEstates.getAnnoId()));
+        List<LandListed> landListed = landListedMapper.selectList(Wrappers.<LandListed>lambdaQuery().eq(LandListed::getAnnoId,housingEstates.getAnnoId()));
         HousingEstatesDetail detail = new HousingEstatesDetail();
         detail.setHousingEstates(housingEstates);
         detail.setLandListed(landListed);

air/src/main/java/com/air/housing/vo/HousingEstatesDetail.java

@@ -21,5 +21,5 @@ public class HousingEstatesDetail {
 
     Format format;
 
-    LandListed landListed;
+    List<LandListed> landListed;
 }