新需求

src/main/java/com/huiju/estateagents/controller/TaBuildingBlockController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingBlock;
 import com.huiju.estateagents.service.ITaBuildingBlockService;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 楼栋表  前端控制器
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingBlockController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingBlockController.class);
 
 
     /**
+     * author fxf
      * 分页查询列表
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingBlock",method= RequestMethod.GET)
-    public ResponseBean taBuildingBlockList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingBlock",method= RequestMethod.GET)
+    public ResponseBean taBuildingBlockList(@RequestParam(value ="buildingId",required = true) String buildingId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingBlock> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingBlock> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingBlock> result = iTaBuildingBlockService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/controller/TaBuildingFloorController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingFloor;
 import com.huiju.estateagents.service.ITaBuildingFloorService;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 楼层表  前端控制器
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingFloorController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingFloorController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingFloor",method= RequestMethod.GET)
-    public ResponseBean taBuildingFloorList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingFloor",method= RequestMethod.GET)
+    public ResponseBean taBuildingFloorList(@RequestParam(value = "buildingId") String buildingId,
+                                            @RequestParam(value = "blockId",required = false) Integer blockId,
+                                            @RequestParam(value = "unitid",required = false) Integer unitId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingFloor> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingFloor> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(null != blockId,"block_id",blockId);
+            queryWrapper.eq(null != unitId,"unit_id",unitId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingFloor> result = iTaBuildingFloorService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/controller/TaBuildingUnitController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingUnit;
 import com.huiju.estateagents.service.ITaBuildingUnitService;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 单元表  前端控制器
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingUnitController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingUnitController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingUnit",method= RequestMethod.GET)
-    public ResponseBean taBuildingUnitList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingUnit",method= RequestMethod.GET)
+    public ResponseBean taBuildingUnitList(@RequestParam(value = "buildingId") String buildingId,
+                                           @RequestParam(value = "blockId", required = false) Integer blockId,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingUnit> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingUnit> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(null != blockId,"block_id",blockId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingUnit> result = iTaBuildingUnitService.page(pg, queryWrapper);