From 2f53597fc8bb1f6713b4f5b60c1d60c68d6046c4 Mon Sep 17 00:00:00 2001 From: yueminglinxia <1123_Wu813> Date: Wed, 9 Jun 2021 15:26:11 +0800 Subject: [PATCH] merge --- .../housing/controller/BlocksController.java | 6 +++--- .../controller/HousingEstatesController.java | 14 ++----------- .../air/housing/entity/HousingEstates.java | 1 + .../air/housing/service/BlocksService.java | 3 ++- .../service/HousingEstatesService.java | 4 ++-- .../service/impl/BlocksServiceImpl.java | 2 +- .../impl/HousingEstatesServiceImpl.java | 6 +++--- .../main/resources/mapper/BlocksMapper.xml | 20 ++++++++++++++++++- 8 files changed, 33 insertions(+), 23 deletions(-) diff --git a/air/src/main/java/com/air/housing/controller/BlocksController.java b/air/src/main/java/com/air/housing/controller/BlocksController.java index d8eba79..366a6b3 100644 --- a/air/src/main/java/com/air/housing/controller/BlocksController.java +++ b/air/src/main/java/com/air/housing/controller/BlocksController.java @@ -40,9 +40,9 @@ public class BlocksController { return R.ok(blocksService.page(page, Wrappers.query(blocks))); } - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page") - public R getBlocksPageByHousingEstatesId(Page page, BlockListDto blocks) { + @ApiOperation(value = "根据楼盘id分页查询", notes = "根据楼盘id分页查询") + @PostMapping("/getPageByHousingEstatesId") + public R getBlocksPageByHousingEstatesId(Page page, @RequestBody BlockListDto blocks) { return R.ok(blocksService.getBlocksPageByHousingEstatesId(page,blocks)); } /** diff --git a/air/src/main/java/com/air/housing/controller/HousingEstatesController.java b/air/src/main/java/com/air/housing/controller/HousingEstatesController.java index 80c1a82..18d5cd2 100644 --- a/air/src/main/java/com/air/housing/controller/HousingEstatesController.java +++ b/air/src/main/java/com/air/housing/controller/HousingEstatesController.java @@ -1,17 +1,11 @@ package com.air.housing.controller; -import cn.hutool.core.util.StrUtil; import com.air.housing.dto.HousingDefine; -import com.air.housing.entity.Format; import com.air.housing.entity.HousingEstates; -import com.air.housing.service.FormatService; 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.service.LandListedService; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cinderella.framework.common.core.util.R; import com.cinderella.framework.common.data.mybatis.QueryPage; @@ -36,10 +30,6 @@ public class HousingEstatesController { private final HousingEstatesService housingEstatesService; - private final FormatService formatService; - - - private final LandListedService landListedService; /** * 分页查询 @@ -73,7 +63,7 @@ public class HousingEstatesController { * @param housingEstatesId id * @return R */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") + @ApiOperation(value = "通过id查询详情", notes = "通过id查询详情") @GetMapping("/{housingEstatesId}") public R getById(@PathVariable("housingEstatesId") Long housingEstatesId,Long blockId) { HousingEstatesDetail housingEstates = housingEstatesService.getHousingEstatesDetail(housingEstatesId,blockId); @@ -88,7 +78,7 @@ public class HousingEstatesController { */ @ApiOperation(value = "新增楼盘（小区）", notes = "新增楼盘（小区）") @PostMapping - @PreAuthorize("@pms.hasPermission('generator_housingestates_add')") +// @PreAuthorize("@pms.hasPermission('generator_housingestates_add')") public R save(@RequestBody HousingEstates housingEstates) { return R.ok(housingEstatesService.save(housingEstates)); } diff --git a/air/src/main/java/com/air/housing/entity/HousingEstates.java b/air/src/main/java/com/air/housing/entity/HousingEstates.java index 9138e4d..c1d51d3 100644 --- a/air/src/main/java/com/air/housing/entity/HousingEstates.java +++ b/air/src/main/java/com/air/housing/entity/HousingEstates.java @@ -1,5 +1,6 @@ package com.air.housing.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/air/src/main/java/com/air/housing/service/BlocksService.java b/air/src/main/java/com/air/housing/service/BlocksService.java index a666a75..f3753b6 100644 --- a/air/src/main/java/com/air/housing/service/BlocksService.java +++ b/air/src/main/java/com/air/housing/service/BlocksService.java @@ -13,7 +13,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface BlocksService extends IService { /** - * 根据楼盘id,大业态，小业态查询楼栋分页信息 + * query by housing_estates_id and largeFormat,format + * @param page * @param blockListDto * @return */ diff --git a/air/src/main/java/com/air/housing/service/HousingEstatesService.java b/air/src/main/java/com/air/housing/service/HousingEstatesService.java index 77bdc39..1fb5330 100644 --- a/air/src/main/java/com/air/housing/service/HousingEstatesService.java +++ b/air/src/main/java/com/air/housing/service/HousingEstatesService.java @@ -35,9 +35,9 @@ public interface HousingEstatesService extends IService { /** * 根据楼盘id查询楼盘信息和相关的地块信息，如果楼栋个id不为空，再查询业态信息 - * @param estateId + * @param housingEstatesId * @param blockId * @return */ - HousingEstatesDetail getHousingEstatesDetail(Long estateId,Long blockId); + HousingEstatesDetail getHousingEstatesDetail(Long housingEstatesId,Long blockId); } diff --git a/air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java b/air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java index 7af6624..c63b5a5 100644 --- a/air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java +++ b/air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java @@ -24,6 +24,6 @@ public class BlocksServiceImpl extends ServiceImpl impleme @Override public Page getBlocksPageByHousingEstatesId(Page page,BlockListDto blockListDto) { - return null; + return blocksMapper.getBlocksPageByHousingEstatesId(page,blockListDto); } } diff --git a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java index 6ac21b9..4b91668 100644 --- a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java +++ b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java @@ -100,14 +100,14 @@ public class HousingEstatesServiceImpl extends ServiceImpllambdaQuery().eq(LandListed::getAnnoId,housingEstates.getAnnoId())); HousingEstatesDetail detail = new HousingEstatesDetail(); detail.setHousingEstates(housingEstates); detail.setLandListed(landListed); if(ObjectUtil.isNotNull(blockId)){ - Format format = formatService.getOne(Wrappers.lambdaQuery().eq(Format::getHousingEstateId,HousingEstateId)); + Format format = formatService.getOne(Wrappers.lambdaQuery().eq(Format::getHousingEstateId,housingEstatesId)); detail.setFormat(format); } return detail; diff --git a/air/src/main/resources/mapper/BlocksMapper.xml b/air/src/main/resources/mapper/BlocksMapper.xml index ce54ae1..a6f7ec0 100644 --- a/air/src/main/resources/mapper/BlocksMapper.xml +++ b/air/src/main/resources/mapper/BlocksMapper.xml @@ -3,7 +3,25 @@ + + b.block_id,b.housing_estates_id,b.pre_sale_permit_no,b.block_name,b.status_cd,b.status_date,b.create_user_id,b.create_date,b.update_user_id,b.update_date,b.remark + +