新需求

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

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 房源表  前端控制器
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaHousingResourcesController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaHousingResourcesController.class);
@@ -36,18 +38,15 @@ public class TaHousingResourcesController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taHousingResources",method= RequestMethod.GET)
-    public ResponseBean taHousingResourcesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taHousingResources",method= RequestMethod.GET)
+    public ResponseBean taHousingResourcesList(@RequestParam(value = "salesBatchId",required = true) Integer salesBatchId,
+                                               @RequestParam(value = "buildingId",required = true) String buildingId,
+                                               @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaHousingResources> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaHousingResources> result = iTaHousingResourcesService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId,pageNumber,pageSize,getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/entity/TaHousingResources.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -91,11 +92,23 @@ public class TaHousingResources implements Serializable {
      */
     private Integer heat;
 
+    /**
+     * 实际热度
+     */
+    @TableField(exist = false)
+    private Integer realHeat;
+
     /**
      * 户型id
      */
     private String apartmentId;
 
+    /**
+     * 户型名称
+     */
+    @TableField(exist = false)
+    private String apartmentName;
+
     /**
      * 状态
      */
@@ -116,5 +129,8 @@ public class TaHousingResources implements Serializable {
      */
     private String updateDate;
 
+    private Integer updateUser;
 
+    @TableField(exist = false)
+    private String updateName;
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaHousingResources;
 
 /**
@@ -13,4 +14,14 @@ import com.huiju.estateagents.entity.TaHousingResources;
  */
 public interface ITaHousingResourcesService extends IService<TaHousingResources> {
 
+    /**
+     * 分页获取房源详情数据
+     * @param salesBatchId
+     * @param buildingId
+     * @param pageNumber
+     * @param pageSize
+     * @param orgId
+     * @return
+     */
+    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -1,9 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingBlock;
 import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +24,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
 
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+    /**
+     * 分页获取房源详情数据
+     *
+     * @param salesBatchId
+     * @param buildingId
+     * @param pageNumber
+     * @param pageSize
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId) {
+        //使用分页插件
+        IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
+        //销售批次id
+        queryWrapper.eq("sales_batch_id",salesBatchId);
+        queryWrapper.eq("building_id",buildingId);
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaHousingResources> list = this.page(pg, queryWrapper);
+
+        return ResponseBean.success(list);
+    }
 }