zhiyuxing
/
estateagents
Tarkkaile 0
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 15 Wiki Activity
Selaa lähdekoodia

新需求

傅行帆 5 vuotta sitten
vanhempi
5a7e8fab16
commit
f84a216a84
3 muutettua tiedostoa jossa 42 lisäystä ja 12 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 13
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingBlockController.java
  2. 15
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingFloorController.java
  3. 14
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingUnitController.java

+ 13
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingBlockController.java Näytä tiedosto 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 
 import com.huiju.estateagents.base.BaseController;
7 7 
 import com.huiju.estateagents.base.ResponseBean;
8 
+import com.huiju.estateagents.common.CommConstant;
8 9 
 import com.huiju.estateagents.entity.TaBuildingBlock;
9 10 
 import com.huiju.estateagents.service.ITaBuildingBlockService;
10 11 
 import org.slf4j.Logger;
 
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
12 13 
 import org.springframework.beans.factory.annotation.Autowired;
13 14 
 import org.springframework.web.bind.annotation.*;
14 15
16 
+import javax.servlet.http.HttpServletRequest;
17 
+
15 18 
 /**
16 19 
  * <p>
17 20 
     * 楼栋表  前端控制器
 
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
21 24 
  * @since 2020-02-10
22 25 
  */
23 26 
 @RestController
24 
-@RequestMapping("/")
27 
+@RequestMapping("/api")
25 28 
 public class TaBuildingBlockController extends BaseController {
26 29
27 30 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingBlockController.class);
 
@@ -31,19 +34,25 @@ public class TaBuildingBlockController extends BaseController {
31 34
32 35
33 36 
     /**
37 
+     * author fxf
34 38 
      * 分页查询列表
35 39 
      * @param pageNum
36 40 
      * @param pageSize
37 41 
      * @return
38 42 
      */
39 
-    @RequestMapping(value="/taBuildingBlock",method= RequestMethod.GET)
40 
-    public ResponseBean taBuildingBlockList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
41 
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
43 
+    @RequestMapping(value="/admin/taBuildingBlock",method= RequestMethod.GET)
44 
+    public ResponseBean taBuildingBlockList(@RequestParam(value ="buildingId",required = true) String buildingId,
45 
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46 
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47 
+                                            HttpServletRequest request){
42 48 
         ResponseBean responseBean = new ResponseBean();
43 49 
         try {
44 50 
             //使用分页插件
45 51 
 		    IPage<TaBuildingBlock> pg = new Page<>(pageNum, pageSize);
46 52 
             QueryWrapper<TaBuildingBlock> queryWrapper = new QueryWrapper<>();
53 
+            queryWrapper.eq("org_id",getOrgId(request));
54 
+            queryWrapper.eq("building_id",buildingId);
55 
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
47 56 
             queryWrapper.orderByDesc("create_date");
48 57
49 58 
             IPage<TaBuildingBlock> result = iTaBuildingBlockService.page(pg, queryWrapper);

+ 15
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingFloorController.java Näytä tiedosto 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 
 import com.huiju.estateagents.base.BaseController;
7 7 
 import com.huiju.estateagents.base.ResponseBean;
8 
+import com.huiju.estateagents.common.CommConstant;
8 9 
 import com.huiju.estateagents.entity.TaBuildingFloor;
9 10 
 import com.huiju.estateagents.service.ITaBuildingFloorService;
10 11 
 import org.slf4j.Logger;
 
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
12 13 
 import org.springframework.beans.factory.annotation.Autowired;
13 14 
 import org.springframework.web.bind.annotation.*;
14 15
16 
+import javax.servlet.http.HttpServletRequest;
17 
+
15 18 
 /**
16 19 
  * <p>
17 20 
     * 楼层表  前端控制器
 
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
21 24 
  * @since 2020-02-10
22 25 
  */
23 26 
 @RestController
24 
-@RequestMapping("/")
27 
+@RequestMapping("/api")
25 28 
 public class TaBuildingFloorController extends BaseController {
26 29
27 30 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingFloorController.class);
 
@@ -36,14 +39,22 @@ public class TaBuildingFloorController extends BaseController {
36 39 
      * @param pageSize
37 40 
      * @return
38 41 
      */
39 
-    @RequestMapping(value="/taBuildingFloor",method= RequestMethod.GET)
40 
-    public ResponseBean taBuildingFloorList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
41 
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
42 
+    @RequestMapping(value="/admin/taBuildingFloor",method= RequestMethod.GET)
43 
+    public ResponseBean taBuildingFloorList(@RequestParam(value = "buildingId") String buildingId,
44 
+                                            @RequestParam(value = "blockId",required = false) Integer blockId,
45 
+                                            @RequestParam(value = "unitid",required = false) Integer unitId,
46 
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47 
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
42 48 
         ResponseBean responseBean = new ResponseBean();
43 49 
         try {
44 50 
             //使用分页插件
45 51 
 		    IPage<TaBuildingFloor> pg = new Page<>(pageNum, pageSize);
46 52 
             QueryWrapper<TaBuildingFloor> queryWrapper = new QueryWrapper<>();
53 
+            queryWrapper.eq("org_id",getOrgId(request));
54 
+            queryWrapper.eq("building_id",buildingId);
55 
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
56 
+            queryWrapper.eq(null != blockId,"block_id",blockId);
57 
+            queryWrapper.eq(null != unitId,"unit_id",unitId);
47 58 
             queryWrapper.orderByDesc("create_date");
48 59
49 60 
             IPage<TaBuildingFloor> result = iTaBuildingFloorService.page(pg, queryWrapper);

+ 14
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingUnitController.java Näytä tiedosto 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 
 import com.huiju.estateagents.base.BaseController;
7 7 
 import com.huiju.estateagents.base.ResponseBean;
8 
+import com.huiju.estateagents.common.CommConstant;
8 9 
 import com.huiju.estateagents.entity.TaBuildingUnit;
9 10 
 import com.huiju.estateagents.service.ITaBuildingUnitService;
10 11 
 import org.slf4j.Logger;
 
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
12 13 
 import org.springframework.beans.factory.annotation.Autowired;
13 14 
 import org.springframework.web.bind.annotation.*;
14 15
16 
+import javax.servlet.http.HttpServletRequest;
17 
+
15 18 
 /**
16 19 
  * <p>
17 20 
     * 单元表  前端控制器
 
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
21 24 
  * @since 2020-02-10
22 25 
  */
23 26 
 @RestController
24 
-@RequestMapping("/")
27 
+@RequestMapping("/api")
25 28 
 public class TaBuildingUnitController extends BaseController {
26 29
27 30 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingUnitController.class);
 
@@ -36,14 +39,21 @@ public class TaBuildingUnitController extends BaseController {
36 39 
      * @param pageSize
37 40 
      * @return
38 41 
      */
39 
-    @RequestMapping(value="/taBuildingUnit",method= RequestMethod.GET)
40 
-    public ResponseBean taBuildingUnitList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
41 
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
42 
+    @RequestMapping(value="/admin/taBuildingUnit",method= RequestMethod.GET)
43 
+    public ResponseBean taBuildingUnitList(@RequestParam(value = "buildingId") String buildingId,
44 
+                                           @RequestParam(value = "blockId", required = false) Integer blockId,
45 
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46 
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47 
+                                           HttpServletRequest request){
42 48 
         ResponseBean responseBean = new ResponseBean();
43 49 
         try {
44 50 
             //使用分页插件
45 51 
 		    IPage<TaBuildingUnit> pg = new Page<>(pageNum, pageSize);
46 52 
             QueryWrapper<TaBuildingUnit> queryWrapper = new QueryWrapper<>();
53 
+            queryWrapper.eq("org_id",getOrgId(request));
54 
+            queryWrapper.eq("building_id",buildingId);
55 
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
56 
+            queryWrapper.eq(null != blockId,"block_id",blockId);
47 57 
             queryWrapper.orderByDesc("create_date");
48 58
49 59 
             IPage<TaBuildingUnit> result = iTaBuildingUnitService.page(pg, queryWrapper);