傅行帆 5 лет назад
Родитель
Сommit
52bed66480

+ 10
- 11
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Просмотреть файл

12
 import org.springframework.beans.factory.annotation.Autowired;
12
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.web.bind.annotation.*;
13
 import org.springframework.web.bind.annotation.*;
14
 
14
 
15
+import javax.servlet.http.HttpServletRequest;
16
+
15
 /**
17
 /**
16
  * <p>
18
  * <p>
17
     * 房源表  前端控制器
19
     * 房源表  前端控制器
21
  * @since 2020-02-10
23
  * @since 2020-02-10
22
  */
24
  */
23
 @RestController
25
 @RestController
24
-@RequestMapping("/")
26
+@RequestMapping("/api")
25
 public class TaHousingResourcesController extends BaseController {
27
 public class TaHousingResourcesController extends BaseController {
26
 
28
 
27
     private final Logger logger = LoggerFactory.getLogger(TaHousingResourcesController.class);
29
     private final Logger logger = LoggerFactory.getLogger(TaHousingResourcesController.class);
36
      * @param pageSize
38
      * @param pageSize
37
      * @return
39
      * @return
38
      */
40
      */
39
-    @RequestMapping(value="/taHousingResources",method= RequestMethod.GET)
40
-    public ResponseBean taHousingResourcesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
41
-                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
41
+    @RequestMapping(value="/admin/taHousingResources",method= RequestMethod.GET)
42
+    public ResponseBean taHousingResourcesList(@RequestParam(value = "salesBatchId",required = true) Integer salesBatchId,
43
+                                               @RequestParam(value = "buildingId",required = true) String buildingId,
44
+                                               @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
45
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
46
+                                               HttpServletRequest request){
42
         ResponseBean responseBean = new ResponseBean();
47
         ResponseBean responseBean = new ResponseBean();
43
         try {
48
         try {
44
-            //使用分页插件
45
-		    IPage<TaHousingResources> pg = new Page<>(pageNum, pageSize);
46
-            QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
47
-            queryWrapper.orderByDesc("create_date");
48
-
49
-            IPage<TaHousingResources> result = iTaHousingResourcesService.page(pg, queryWrapper);
50
-            responseBean.addSuccess(result);
49
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId,pageNumber,pageSize,getOrgId(request));
51
         }catch (Exception e){
50
         }catch (Exception e){
52
             e.printStackTrace();
51
             e.printStackTrace();
53
             logger.error("taHousingResourcesList -=- {}",e.toString());
52
             logger.error("taHousingResourcesList -=- {}",e.toString());

+ 16
- 0
src/main/java/com/huiju/estateagents/entity/TaHousingResources.java Просмотреть файл

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import lombok.Data;
6
 import lombok.Data;
6
 import lombok.EqualsAndHashCode;
7
 import lombok.EqualsAndHashCode;
91
      */
92
      */
92
     private Integer heat;
93
     private Integer heat;
93
 
94
 
95
+    /**
96
+     * 实际热度
97
+     */
98
+    @TableField(exist = false)
99
+    private Integer realHeat;
100
+
94
     /**
101
     /**
95
      * 户型id
102
      * 户型id
96
      */
103
      */
97
     private String apartmentId;
104
     private String apartmentId;
98
 
105
 
106
+    /**
107
+     * 户型名称
108
+     */
109
+    @TableField(exist = false)
110
+    private String apartmentName;
111
+
99
     /**
112
     /**
100
      * 状态
113
      * 状态
101
      */
114
      */
116
      */
129
      */
117
     private String updateDate;
130
     private String updateDate;
118
 
131
 
132
+    private Integer updateUser;
119
 
133
 
134
+    @TableField(exist = false)
135
+    private String updateName;
120
 }
136
 }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java Просмотреть файл

1
 package com.huiju.estateagents.service;
1
 package com.huiju.estateagents.service;
2
 
2
 
3
 import com.baomidou.mybatisplus.extension.service.IService;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.entity.TaHousingResources;
5
 import com.huiju.estateagents.entity.TaHousingResources;
5
 
6
 
6
 /**
7
 /**
13
  */
14
  */
14
 public interface ITaHousingResourcesService extends IService<TaHousingResources> {
15
 public interface ITaHousingResourcesService extends IService<TaHousingResources> {
15
 
16
 
17
+    /**
18
+     * 分页获取房源详情数据
19
+     * @param salesBatchId
20
+     * @param buildingId
21
+     * @param pageNumber
22
+     * @param pageSize
23
+     * @param orgId
24
+     * @return
25
+     */
26
+    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId);
16
 }
27
 }

+ 34
- 0
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Просмотреть файл

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.TaBuildingBlock;
4
 import com.huiju.estateagents.entity.TaHousingResources;
10
 import com.huiju.estateagents.entity.TaHousingResources;
5
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
11
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
6
 import com.huiju.estateagents.service.ITaHousingResourcesService;
12
 import com.huiju.estateagents.service.ITaHousingResourcesService;
13
+import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.stereotype.Service;
14
 import org.springframework.stereotype.Service;
8
 
15
 
9
 /**
16
 /**
17
 @Service
24
 @Service
18
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
25
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
19
 
26
 
27
+    @Autowired
28
+    private TaHousingResourcesMapper taHousingResourcesMapper;
29
+    /**
30
+     * 分页获取房源详情数据
31
+     *
32
+     * @param salesBatchId
33
+     * @param buildingId
34
+     * @param pageNumber
35
+     * @param pageSize
36
+     * @param orgId
37
+     * @return
38
+     */
39
+    @Override
40
+    public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId) {
41
+        //使用分页插件
42
+        IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
43
+        QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
44
+        //销售批次id
45
+        queryWrapper.eq("sales_batch_id",salesBatchId);
46
+        queryWrapper.eq("building_id",buildingId);
47
+        queryWrapper.eq("org_id",orgId);
48
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
49
+        queryWrapper.orderByDesc("create_date");
50
+        IPage<TaHousingResources> list = this.page(pg, queryWrapper);
51
+
52
+        return ResponseBean.success(list);
53
+    }
20
 }
54
 }