* 增加预选房源相关接口

src/main/java/com/huiju/estateagents/config/AccessConfig.java

@@ -20,7 +20,7 @@ public class AccessConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		// 自定义拦截器，添加拦截路径和排除拦截路径
-		registry.addInterceptor(accessInterceptor).addPathPatterns("/**");
+//		registry.addInterceptor(accessInterceptor).addPathPatterns("/**");
 	}
 	
 }

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

@@ -1,8 +1,5 @@
 package com.huiju.estateagents.controller;
 
-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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaHousingResources;
@@ -139,4 +136,63 @@ public class TaHousingResourcesController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取房源列表
+     *
+     * @param pageNum      页码
+     * @param pageSize     分页大小
+     * @param salesBatchId 销售批次ID
+     * @return
+     */
+    @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.POST)
+    public ResponseBean listHousingResources(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "salesBatchId") String salesBatchId,
+                                             String startPrice, String endPrice, String apartmentId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(pageNum, pageSize, salesBatchId, startPrice, endPrice, apartmentId));
+        } catch (Exception e) {
+            logger.error("listHousingResources -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取某销售批次下所有房源户型
+     *
+     * @param salesBatchId
+     * @return
+     */
+    @RequestMapping(value = "/wx/listBuildApartmentBySalesBatchId", method = RequestMethod.POST)
+    public ResponseBean listBuildApartmentBySalesBatchId(@RequestParam(value = "salesBatchId") String salesBatchId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaHousingResourcesService.listBuildApartmentBySalesBatchId(salesBatchId));
+        } catch (Exception e) {
+            logger.error("listBuildApartmentBySalesBatchId -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据房源ID获取房源详情
+     *
+     * @param houseId
+     * @return
+     */
+    @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.POST)
+    public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(houseId));
+        } catch (Exception e) {
+            logger.error("getHousingDetailById -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,8 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 预选记录表  前端控制器
-    * </p>
+ * 预选记录表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-10
@@ -32,25 +35,26 @@ public class TaPreselectionRecordController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPreselectionRecord",method= RequestMethod.GET)
-    public ResponseBean taPreselectionRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.GET)
+    public ResponseBean taPreselectionRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaPreselectionRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPreselectionRecord> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPreselectionRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPreselectionRecord> result = iTaPreselectionRecordService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionRecordList -=- {}",e.toString());
+            logger.error("taPreselectionRecordList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +62,43 @@ public class TaPreselectionRecordController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taPreselectionRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taPreselectionRecord",method= RequestMethod.POST)
-    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord){
+    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.POST)
+    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord) {
         ResponseBean responseBean = new ResponseBean();
+
+        logger.info("taPreselectionRecordAdd 接收参数，taPreselectionRecord：{}", JSONObject.toJSONString(taPreselectionRecord));
+
         try {
-            if (iTaPreselectionRecordService.save(taPreselectionRecord)){
+
+            // 校验参数
+            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) && StringUtils.isBlank(taPreselectionRecord.getPersonId()) &&
+                taPreselectionRecord.getOrgId() == null) {
+                logger.info("taPreselectionRecordAdd 参数错误");
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            // 校验用户是否已经预选房源
+            TaPreselectionRecord record = iTaPreselectionRecordService
+                    .checkPreselect(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
+            if (record != null) {
+                logger.info("taPreselectionRecordAdd 用户已经预选该房源");
+                responseBean.addError("您已经预选过该房源");
+                return responseBean;
+            }
+
+            if (iTaPreselectionRecordService.save(taPreselectionRecord)) {
                 responseBean.addSuccess(taPreselectionRecord);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionRecordAdd -=- {}",e.toString());
+            logger.error("taPreselectionRecordAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +106,22 @@ public class TaPreselectionRecordController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPreselectionRecord/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taPreselectionRecordDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taPreselectionRecord/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taPreselectionRecordDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaPreselectionRecordService.removeById(id)){
+            if (iTaPreselectionRecordService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionRecordDelete -=- {}",e.toString());
+            logger.error("taPreselectionRecordDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +129,24 @@ public class TaPreselectionRecordController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id                   实体ID
      * @param taPreselectionRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/taPreselectionRecord/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taPreselectionRecord/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionRecordUpdate(@PathVariable Integer id,
-                                                   @RequestBody TaPreselectionRecord taPreselectionRecord){
+                                                   @RequestBody TaPreselectionRecord taPreselectionRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaPreselectionRecordService.updateById(taPreselectionRecord)){
+            if (iTaPreselectionRecordService.updateById(taPreselectionRecord)) {
                 responseBean.addSuccess(taPreselectionRecord);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionRecordUpdate -=- {}",e.toString());
+            logger.error("taPreselectionRecordUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +154,78 @@ public class TaPreselectionRecordController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taPreselectionRecord/{id}",method= RequestMethod.GET)
-    public ResponseBean taPreselectionRecordGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taPreselectionRecord/{id}", method = RequestMethod.GET)
+    public ResponseBean taPreselectionRecordGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaPreselectionRecordService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionRecordDelete -=- {}",e.toString());
+            logger.error("taPreselectionRecordDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 取消房源预选
+     *
+     * @param personId 用户ID
+     * @return
+     */
+    @RequestMapping("/wx/taPreselectionRecordCancel")
+    public ResponseBean taPreselectionRecordCancel(@RequestParam("personId") String personId,
+                                                   @RequestParam("houseId") String houseId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId));
+        } catch (Exception e) {
+            logger.error("taPreselectionRecordCancel -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取当前用户预选记录
+     *
+     * @param pageNum  页码
+     * @param pageSize 分页大小
+     * @param personId 用户ID
+     * @return
+     */
+    @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.POST)
+    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam("personId") String personId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, personId));
+        } catch (Exception e) {
+            logger.error("listPreselectionRecord -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 校验用户是否已经预选该房源
+     *
+     * @param personId 用户ID
+     * @param houseId  房源ID
+     * @return
+     */
+    @RequestMapping(value = "/wx/checkPreselect", method = RequestMethod.POST)
+    public ResponseBean checkPreselect(@RequestParam("personId") String personId,
+                                       @RequestParam("houseId") String houseId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPreselectionRecordService.checkPreselect(personId, houseId));
+        } catch (Exception e) {
+            logger.error("checkPreselect -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -1,8 +1,15 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +20,52 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-02-10
  */
 @Mapper
+@Component
 public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources> {
 
+    /**
+     * 分页获取房源列表
+     *
+     * @param iPage
+     * @param salesBatchId
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @return
+     */
+    IPage<TaHousingResourcesPO> listHousingResources(IPage<TaHousingResourcesPO> iPage,
+                                                     @Param("salesBatchId") String salesBatchId,
+                                                     @Param("startPrice") String startPrice,
+                                                     @Param("endPrice") String endPrice,
+                                                     @Param("apartmentId") String apartmentId);
+
+    /**
+     * 获取某销售批次下所有房源户型
+     *
+     * @param salesBatchId
+     * @return
+     */
+    List<TaBuildingApartment> listBuildApartmentBySalesBatchId(@Param("salesBatchId") String salesBatchId);
+
+    /**
+     * 增加热度值
+     * @param houseId
+     * @return
+     */
+    Boolean updateForAddHeat(@Param("houseId") String houseId);
+
+    /**
+     * 减少热度值
+     * @param houseId
+     * @return
+     */
+    Boolean updateForSubtractHeat(@Param("houseId") String houseId);
+
+    /**
+     * 根据房源ID获取房源详情
+     *
+     * @param houseId
+     * @return
+     */
+    TaHousingResourcesPO getHousingDetailById(String houseId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPreselectionRecordMapper.java

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +17,25 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-02-10
  */
 @Mapper
+@Component
 public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRecord> {
 
+    /**
+     * 分页获取当前用户预选记录
+     *
+     * @param iPage
+     * @param personId
+     * @return
+     */
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage, @Param("personId") String personId);
+
+    /**
+     * 根据房源ID和用户ID获取预选记录
+     *
+     * @param personId
+     * @param houseId
+     * @return
+     */
+    TaPreselectionRecord getRecordByPersonIdAndHouseId(@Param("personId") String personId,
+                                                       @Param("houseId") String houseId);
 }

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.po;
+
+import com.huiju.estateagents.entity.TaHousingResources;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: gusy
+ * @Date: 2020/2/11 14:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaHousingResourcesPO extends TaHousingResources {
+    private Double insideArea;
+
+    private Double buildingArea;
+}

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.po;
+
+import com.huiju.estateagents.entity.TaPreselectionRecord;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: gusy
+ * @Date: 2020/2/11 15:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPreselectionRecordPO extends TaPreselectionRecord {
+
+    /**
+     * 楼栋名称
+     */
+    private String blockName;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 楼层名称
+     */
+    private String floorName;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 价格
+     */
+    private String price;
+}

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

@@ -1,8 +1,13 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -24,4 +29,32 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId);
+
+    /* 分页获取房源列表
+     *
+     * @param pageNum      页码
+     * @param pageSize     分页大小
+     * @param salesBatchId 销售批次ID
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @return
+     */
+    IPage<TaHousingResourcesPO> listHousingResources(Integer pageNum, Integer pageSize, String salesBatchId, String startPrice, String endPrice, String apartmentId);
+
+    /**
+     * 获取某销售批次下所有房源户型
+     *
+     * @param salesBatchId
+     * @return
+     */
+    List<TaBuildingApartment> listBuildApartmentBySalesBatchId(String salesBatchId);
+
+    /**
+     * 根据房源ID获取房源详情
+     *
+     * @param houseId
+     * @return
+     */
+    TaHousingResourcesPO getHousingDetailById(String houseId);
 }

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

@@ -1,7 +1,9 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.po.TaPreselectionRecordPO;
 
 /**
  * <p>
@@ -13,4 +15,40 @@ import com.huiju.estateagents.entity.TaPreselectionRecord;
  */
 public interface ITaPreselectionRecordService extends IService<TaPreselectionRecord> {
 
+    /**
+     * 分页获取当前用户预选记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param personId
+     * @return
+     */
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, String personId);
+
+    /**
+     * 添加预选记录预选
+     *
+     * @param taPreselectionRecord
+     * @return
+     */
+    Boolean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord);
+
+    /**
+     * 取消预选
+     *
+     * @param personId 用户ID
+     * @param houseId  房源ID
+     * @return
+     */
+    Boolean taPreselectionRecordCancel(String personId, String houseId);
+
+    /**
+     * 校验用户是否预选
+     *
+     * @param personId 用户ID
+     * @param houseId  房源ID
+     * @return
+     */
+    TaPreselectionRecord checkPreselect(String personId, String houseId);
+
 }

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

@@ -6,13 +6,19 @@ 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.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaBuildingBlock;
 import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 房源表  服务实现类
@@ -24,6 +30,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
 
+    private Logger logger = LoggerFactory.getLogger(TaHousingResourcesServiceImpl.class);
+
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
     /**
@@ -51,4 +59,50 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         return ResponseBean.success(list);
     }
+
+    /**
+     * 分页获取房源列表
+     *
+     * @param pageNum      页码
+     * @param pageSize     分页大小
+     * @param salesBatchId 销售批次ID
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @return
+     */
+    @Override
+    public IPage<TaHousingResourcesPO> listHousingResources(Integer pageNum, Integer pageSize, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
+        logger.info("listHousingResources 接收参数：pageNum：{},pageSize：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
+                pageNum, pageSize, salesBatchId, startPrice, endPrice, apartmentId);
+
+        IPage<TaHousingResourcesPO> iPage = new Page<>(pageNum, pageSize);
+        return taHousingResourcesMapper.listHousingResources(iPage, salesBatchId, startPrice, endPrice, apartmentId);
+    }
+
+    /**
+     * 获取某销售批次下所有房源户型
+     *
+     * @param salesBatchId
+     * @return
+     */
+    @Override
+    public List<TaBuildingApartment> listBuildApartmentBySalesBatchId(String salesBatchId) {
+        logger.info("listBuildApartmentBySalesBatchId 接收参数：salesBatchId：{}", salesBatchId);
+
+        return taHousingResourcesMapper.listBuildApartmentBySalesBatchId(salesBatchId);
+    }
+
+    /**
+     * 根据房源ID获取房源详情
+     *
+     * @param houseId
+     * @return
+     */
+    @Override
+    public TaHousingResourcesPO getHousingDetailById(String houseId) {
+        logger.info("getHousingDetailById 接收参数：houseId：{}", houseId);
+
+        return taHousingResourcesMapper.getHousingDetailById(houseId);
+    }
 }

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

@@ -1,10 +1,22 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+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.common.DateUtils;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
+import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,4 +29,56 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionRecordMapper, TaPreselectionRecord> implements ITaPreselectionRecordService {
 
+    private Logger logger = LoggerFactory.getLogger(TaPreselectionRecordServiceImpl.class);
+
+    @Autowired
+    private TaPreselectionRecordMapper taPreselectionRecordMapper;
+
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+
+    @Override
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, String personId) {
+        logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，personId：{}", pageNum, pageSize, personId);
+
+        IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
+        return taPreselectionRecordMapper.listPreselectionRecord(iPage, personId);
+    }
+
+    @Override
+    @Transactional
+    public Boolean taPreselectionRecordAdd(TaPreselectionRecord taPreselectionRecord) {
+        logger.info("listPreselectionRecord 接收参数：taPreselectionRecord:{}", JSONObject.toJSONString(taPreselectionRecord));
+
+        // 添加预选记录
+        taPreselectionRecord.setStatus(1);
+        taPreselectionRecord.setCreateDate(LocalDateTime.now());
+        save(taPreselectionRecord);
+
+        // 更新房源表热度
+        return taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
+    }
+
+    @Override
+    @Transactional
+    public Boolean taPreselectionRecordCancel(String personId, String houseId) {
+        logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
+
+        // 更新预选记录
+        TaPreselectionRecord record = new TaPreselectionRecord();
+        record.setPreselectionRecordId(Integer.parseInt(personId));
+        record.setStatus(0);
+        record.setUpdateDate(DateUtils.today());
+        updateById(record);
+
+        // 更新房源表热度
+        return taHousingResourcesMapper.updateForSubtractHeat(houseId);
+    }
+
+    @Override
+    public TaPreselectionRecord checkPreselect(String personId, String houseId) {
+        logger.info("checkPreselect 接收参数：personId：{}，houseId：{}", personId, houseId);
+
+        return taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+    }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -2,4 +2,102 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaHousingResourcesMapper">
 
+    <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+            t.house_id,
+            t.building_id,
+            t.block_id,
+            t.block_name,
+            t.sales_batch_id,
+            t.unit_id,
+            t.unit_name,
+            t.floor_id,
+            t.floor_name,
+            t.room_id,
+            t.room_name,
+            t.price,
+            t.heat,
+            t.apartment_id,
+            t.`status`,
+            t.org_id,
+            t2.inside_area,
+            t2.building_area
+        FROM
+            ta_housing_resources t,
+            ta_building_apartment t2
+        WHERE
+            t.sales_batch_id = #{salesBatchId}
+            <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
+              AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+            </if>
+            <if test="apartmentId != null and apartmentId != ''">
+              AND t.apartment_id = #{apartmentId}
+            </if>
+            AND t.apartment_id = t2.apartment_id
+            AND t.`status` = 1
+            AND t2.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
+
+    <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
+        SELECT
+            t3.apartment_id,
+            t3.apartment_name,
+            t3.apartment_type,
+            t3.inside_area,
+            t3.building_area
+        FROM
+            ( SELECT t.sales_batch_id, t.apartment_id FROM ta_housing_resources t WHERE t.sales_batch_id = #{salesBatchId} GROUP BY t.apartment_id ) t2
+            LEFT JOIN ta_building_apartment t3 ON t2.apartment_id = t3.apartment_id
+        ORDER BY
+	      t3.apartment_name
+    </select>
+
+    <update id="updateForAddHeat" parameterType="java.lang.String">
+        UPDATE ta_housing_resources t
+        SET t.heat = t.heat + 1
+        WHERE
+            t.house_id = #{houseId}
+            AND t.heat >= 0
+    </update>
+
+    <update id="updateForSubtractHeat" parameterType="java.lang.String">
+        UPDATE ta_housing_resources t
+        SET t.heat = t.heat - 1
+        WHERE
+            t.house_id = #{houseId}
+            AND t.heat > 0
+    </update>
+
+    <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+            t.house_id,
+            t.building_id,
+            t.block_id,
+            t.block_name,
+            t.sales_batch_id,
+            t.unit_id,
+            t.unit_name,
+            t.floor_id,
+            t.floor_name,
+            t.room_id,
+            t.room_name,
+            t.price,
+            t.heat,
+            t.apartment_id,
+            t.`status`,
+            t.org_id,
+            t2.inside_area,
+            t2.building_area
+        FROM
+            ta_housing_resources t,
+            ta_building_apartment t2
+        WHERE
+            t.house_id = #{houseId}
+            AND t.apartment_id = t2.apartment_id
+            AND t.`status` = 1
+            AND t2.`status` = 1
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -2,4 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPreselectionRecordMapper">
 
+    <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
+        SELECT
+            t.*,
+            t2.block_name,
+            t2.unit_name,
+            t2.floor_name,
+            t2.room_name,
+            t2.price
+        FROM
+            ta_preselection_record t ,
+            ta_housing_resources t2
+        WHERE
+            t.person_id = #{persionId}
+            and t.house_id = t2.house_id
+        ORDER BY
+            t.create_date DESC;
+    </select>
+
+    <select id="getRecordByPersonIdAndHouseId" resultType="">
+        SELECT
+            t.*
+        FROM
+            ta_preselection_record t
+        WHERE
+            t.person_id = #{personId}
+            AND t.house_id = #{houseId}
+    </select>
+
 </mapper>