提交

whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java

@@ -14,8 +14,15 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * <p>
  * 活动表 前端控制器
@@ -37,16 +44,37 @@ public class ActivityController extends BaseController {
     @Autowired
     private IActivityEnrollService iActivityEnrollService;
 
+    /**
+     * 自定义方法绑定请求参数的Date类型
+     *
+     * @param request
+     * @param binder
+     * @throws Exception
+     */
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+
 
     @RequestMapping(value = "/activity/list", method = RequestMethod.GET)
     @ApiOperation(value = "活动列表", notes = "活动列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "name", value = "活动名称"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Date.class, name = "beginDate", value = "开始时间"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Date.class, name = "endDate", value = "结束时间")
     })
-    public ResponseBean getList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+    public ResponseBean getList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                @RequestParam(defaultValue = "10") Integer pageSize,
+                                @RequestParam(required = false) String name,
+                                @RequestParam(required = false) Date beginDate,
+                                @RequestParam(required = false) Date endDate) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iActivityService.getList(pageNum, pageSize);
+        responseBean = iActivityService.getList(pageNum, pageSize, name, beginDate, endDate);
         return responseBean;
     }
 
@@ -69,11 +97,42 @@ public class ActivityController extends BaseController {
     public ResponseBean add(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         Activity activity = JSONObject.parseObject(parameter, Activity.class);
+        activity.setStatus(0);
         activity.setActivityId(idGen.nextId()+"");
         iActivityService.save(activity);
         return responseBean;
     }
 
+    @RequestMapping(value = "/activity/send/{activityId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "活动发布", notes = "活动发布")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "activityId", value = "activityId活动编号")
+    })
+    public ResponseBean send(@PathVariable String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activityId);
+        Activity activity = iActivityService.getOne(activityQueryWrapper);
+        activity.setStatus(1);
+        iActivityService.update(activity, activityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/activity/cancel/{activityId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "活动取消发布", notes = "活动取消发布")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "activityId", value = "activityId活动编号")
+    })
+    public ResponseBean cancel(@PathVariable String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activityId);
+        Activity activity = iActivityService.getOne(activityQueryWrapper);
+        activity.setStatus(0);
+        iActivityService.update(activity, activityQueryWrapper);
+        return responseBean;
+    }
+
     @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
     @ApiOperation(value = "修改活动", notes = "修改活动")
     @ApiImplicitParams({

whole-estate/src/main/java/com/example/wholeestate/controller/AppointmentController.java

@@ -2,9 +2,14 @@ package com.example.wholeestate.controller;
 
 
 import com.example.wholeestate.common.base.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.service.IAppointmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -15,7 +20,24 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-03-21
  */
 @RestController
-@RequestMapping("/ta/appointment")
+@RequestMapping("/")
+@Api(value = "预约记录 API", description = "预约记录 API")
 public class AppointmentController extends BaseController {
 
+    @Autowired
+    private IAppointmentService iAppointmentService;
+
+    @RequestMapping(value = "/wx/appointment/{openid}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据openid 查询 预约记录", notes = "根据openid 查询 预约记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid")
+    })
+    public ResponseBean openidAppointementList(@PathVariable("openid") String openid, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iAppointmentService.getOpenidAppointmentList(openid, pageNum, pageSize);
+        return responseBean;
+    }
+
 }

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -6,14 +6,21 @@ import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.session.UserElement;
 import com.example.wholeestate.model.SysUser;
 import com.example.wholeestate.service.IBuildingService;
+import com.example.wholeestate.service.ITaCollectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * <p>
@@ -27,9 +34,27 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @Api(value = "楼盘API",description = "楼盘API")
 public class BuildingController extends BaseController {
-@Autowired
+
+    @Autowired
     private IBuildingService iBuildingService;
 
+    @Autowired
+    private ITaCollectionService iTaCollectionService;
+
+    /**
+     * 自定义方法绑定请求参数的Date类型
+     *
+     * @param request
+     * @param binder
+     * @throws Exception
+     */
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+
     @RequestMapping(value = "/buildingSelectId/{id}", method = RequestMethod.GET)
     @ApiOperation(value = "楼盘详情", notes = "楼盘详情")
     @ApiImplicitParams({
@@ -47,9 +72,10 @@ public class BuildingController extends BaseController {
             @ApiImplicitParam(paramType = "Query",dataType = "String",name = "code",value = "code:状态")
     })
     @RequestMapping(value = "/buildinglist", method = RequestMethod.GET)
-    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,
-                                        @RequestParam("name")String name,
-                                                @RequestParam("code")String code){
+    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,
+                                     @RequestParam("pageSize")Integer pageSize,
+                                     @RequestParam(value = "name", required = false)String name,
+                                     @RequestParam(value = "code", required = false)String code){
         ResponseBean  responseBean = iBuildingService.buildingList(pageNum,pageSize,name,code);
         return responseBean;
     }
@@ -107,6 +133,41 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/collection/{openid}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 openid 查询 收藏楼盘")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid")
+    })
+    public ResponseBean openidCollectionBuilding(@PathVariable("openid") String openid, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaCollectionService.openidCollectionBuilding(openid, pageNum, pageSize);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/collection/{openid}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "根据 openid 和 buildingId 删除收藏楼盘")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "buildingId", value = "buildingId楼盘编号"),
+    })
+    public ResponseBean deleteCollection(@PathVariable("openid") String openid, @RequestParam String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaCollectionService.deleteCollection(openid, buildingId);
+        return responseBean;
+    }
 
+    @RequestMapping(value = "/wx/collection/{openid}", method = RequestMethod.POST)
+    @ApiOperation(value = "根据 openid 和 buildingId 收藏楼盘")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "buildingId", value = "buildingId楼盘编号"),
+    })
+    public ResponseBean addCollection(@PathVariable("openid") String openid, @RequestParam String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaCollectionService.addCollection(openid, buildingId);
+        return responseBean;
+    }
 
 }

whole-estate/src/main/java/com/example/wholeestate/controller/TaCollectionController.java

@@ -0,0 +1,22 @@
+package com.example.wholeestate.controller;
+
+
+import com.example.wholeestate.common.base.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 收藏表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-21
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "收藏 API", description = "收藏 API")
+public class TaCollectionController extends BaseController {
+
+}

whole-estate/src/main/java/com/example/wholeestate/dao/ActivityEnrollMapper.java

@@ -28,7 +28,7 @@ public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
             "RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id " +
             "LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id " +
             "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
-            "WHERE tac.activity_id = #{activityId}")
+            "WHERE tac.activity_id = #{activityId} and tac.status > -1")
     IPage<Activity> selectPageActivityEnroll(Page page, @Param("activityId") String activityId);
 
     /**
@@ -41,7 +41,7 @@ public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
             "RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id " +
             "LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id " +
             "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
-            "WHERE tacus.openid = #{openid}")
+            "WHERE tacus.openid = #{openid} tac.status > -1")
     IPage<Activity> selectOpenidActivityEnroll(Page page, @Param("openid") String openid);
 
 }

whole-estate/src/main/java/com/example/wholeestate/dao/AppointmentMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.wholeestate.model.Appointment;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -20,6 +22,15 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
      * @return
      */
     IPage<Appendable> appendableList(Page<Appendable> page);
-    
+
+    @Select("SELECT " +
+            "taa.*, " +
+            "tab.building_name AS buildingName " +
+            "FROM " +
+            "ta_appointment taa " +
+            "LEFT JOIN ta_building tab ON taa.building_id = tab.building_id " +
+            "LEFT JOIN ta_customer tac ON taa.customer_id = tac.customer_id " +
+            "WHERE tac.openid = #{openid}")
+    IPage<Appointment> getOpenidAppendableList(Page<Appointment> page, @Param("openid") String openid);
 
 }

whole-estate/src/main/java/com/example/wholeestate/dao/TaCollectionMapper.java

@@ -0,0 +1,57 @@
+package com.example.wholeestate.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.wholeestate.model.Building;
+import com.example.wholeestate.model.TaCollection;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 收藏表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-21
+ */
+public interface TaCollectionMapper extends BaseMapper<TaCollection> {
+
+    /**
+     * 根据 openid 查询 收藏楼盘记录
+     * @param page
+     * @param openid
+     * @return
+     */
+    @Select("SELECT " +
+            "tab.* " +
+            "FROM " +
+            "ta_collection tac " +
+            "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
+            "LEFT JOIN ta_customer tacu ON tac.customer_id = tacu.customer_id " +
+            "WHERE tacu.openid = #{openid}")
+    IPage<Building> openidCollectionBuilding(Page<Building> page, @Param("openid") String openid);
+
+    /**
+     * 根据 openid 和 楼盘id 删除收藏列表
+     * @param openid
+     * @param buildingId
+     * @return
+     */
+    @Delete("DELETE FROM ta_collection where customer_id = (select customer_id FROM ta_customer where openid = #{openid}) and building_id = #{buildingId}")
+    int deleteCollection(@Param("openid") String openid, @Param("buildingId") String buildingId);
+
+
+    /**
+     * 根据 openid 和 楼盘id 查询楼盘记录
+     * @param openid
+     * @param buildingId
+     * @return
+     */
+    @Select("SELECT * FROM ta_collection where customer_id = (select customer_id FROM ta_customer where openid = #{openid}) and building_id = #{buildingId}")
+    TaCollection selectOpenidAndBuildingId(@Param("openid") String openid, @Param("buildingId") String buildingId);
+
+
+}

whole-estate/src/main/java/com/example/wholeestate/model/Appointment.java

@@ -1,5 +1,6 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -68,5 +69,10 @@ public class Appointment implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
 
 }

whole-estate/src/main/java/com/example/wholeestate/model/TaCollection.java

@@ -0,0 +1,43 @@
+package com.example.wholeestate.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收藏表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_collection")
+public class TaCollection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private String customerId;
+
+    /**
+     * 楼盘ID
+     */
+    private String buildingId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

whole-estate/src/main/java/com/example/wholeestate/service/IActivityService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.Activity;
 
+import java.util.Date;
+
 /**
  * <p>
  * 活动表 服务类
@@ -20,7 +22,7 @@ public interface IActivityService extends IService<Activity> {
      * @param pageSize
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String name, Date beginDate, Date endDate);
 
     /**
      * 根据 活动id 查询

whole-estate/src/main/java/com/example/wholeestate/service/IAppointmentService.java

@@ -1,6 +1,7 @@
 package com.example.wholeestate.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.Appointment;
 
 /**
@@ -13,4 +14,13 @@ import com.example.wholeestate.model.Appointment;
  */
 public interface IAppointmentService extends IService<Appointment> {
 
+    /**
+     * 根据 openid 查询 预约记录
+     * @param openid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getOpenidAppointmentList(String openid, Integer pageNum, Integer pageSize);
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/ITaCollectionService.java

@@ -0,0 +1,42 @@
+package com.example.wholeestate.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.model.TaCollection;
+
+/**
+ * <p>
+ * 收藏表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-21
+ */
+public interface ITaCollectionService extends IService<TaCollection> {
+
+    /**
+     * 根据 openid 查询 收藏楼盘记录
+     * @param openid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean openidCollectionBuilding(String openid, Integer pageNum, Integer pageSize);
+
+    /**
+     * 根据 openid 和 楼盘id 删除收藏列表
+     * @param openid
+     * @param buildingId
+     * @return
+     */
+    ResponseBean deleteCollection(String openid, String buildingId);
+
+    /**
+     * 根据 openid 和 楼盘id 添加收藏列表
+     * @param openid
+     * @param buildingId
+     * @return
+     */
+    ResponseBean addCollection(String openid, String buildingId);
+
+}

whole-estate/src/main/java/com/example/wholeestate/service/impl/ActivityServiceImpl.java

@@ -11,9 +11,12 @@ import com.example.wholeestate.dao.BuildingMapper;
 import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.Building;
 import com.example.wholeestate.service.IActivityService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  * 活动表 服务实现类
@@ -32,13 +35,17 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     private BuildingMapper buildingMapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String name, Date beginDate, Date endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         Page<Activity> page = new Page<>();
         page.setCurrent(pageNum == null ? 1 : pageNum);
         page.setSize(pageSize == null ? 10 : pageSize);
         QueryWrapper<Activity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", -1);
+        queryWrapper.like(StringUtils.isNotBlank(name),"title", name);
+        queryWrapper.ge(null != beginDate,"begin_date", beginDate);
+        queryWrapper.le(null != endDate,"end_date", endDate);
         IPage<Activity> activityIPage = activityMapper.selectPage(page, queryWrapper);
         responseBean.addSuccess(activityIPage);
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/service/impl/AppointmentServiceImpl.java

@@ -1,9 +1,13 @@
 package com.example.wholeestate.service.impl;
 
+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.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.dao.AppointmentMapper;
 import com.example.wholeestate.model.Appointment;
 import com.example.wholeestate.service.IAppointmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appointment> implements IAppointmentService {
 
+    @Autowired
+    private AppointmentMapper appointmentMapper;
+
+    @Override
+    public ResponseBean getOpenidAppointmentList(String openid, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<Appointment> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        IPage<Appointment> openidAppendableList = appointmentMapper.getOpenidAppendableList(page, openid);
+        responseBean.addSuccess(openidAppendableList);
+        return responseBean;
+    }
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/TaCollectionServiceImpl.java

@@ -0,0 +1,73 @@
+package com.example.wholeestate.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.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.dao.CustomerMapper;
+import com.example.wholeestate.dao.TaCollectionMapper;
+import com.example.wholeestate.model.Building;
+import com.example.wholeestate.model.Customer;
+import com.example.wholeestate.model.TaCollection;
+import com.example.wholeestate.service.ITaCollectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 收藏表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-21
+ */
+@Service
+public class TaCollectionServiceImpl extends ServiceImpl<TaCollectionMapper, TaCollection> implements ITaCollectionService {
+
+    @Autowired
+    private TaCollectionMapper taCollectionMapper;
+
+    @Autowired
+    private CustomerMapper customerMapper;
+
+    @Override
+    public ResponseBean openidCollectionBuilding(String openid, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<Building> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        IPage<Building> buildingIPage = taCollectionMapper.openidCollectionBuilding(page, openid);
+        responseBean.addSuccess(buildingIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean deleteCollection(String openid, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        taCollectionMapper.deleteCollection(openid, buildingId);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addCollection(String openid, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<Customer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("openid", openid);
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+
+        QueryWrapper<TaCollection> taCollectionQueryWrapper = new QueryWrapper<>();
+        taCollectionQueryWrapper.eq("customer_id", customer.getCustomerId());
+        taCollectionQueryWrapper.eq("building_id", buildingId);
+        TaCollection taCollection = taCollectionMapper.selectOne(taCollectionQueryWrapper);
+        if (null != taCollection) {
+            responseBean.addError("您已收藏过这个楼盘!");
+            return responseBean;
+        }
+
+
+        return responseBean;
+    }
+}

whole-estate/src/main/resources/application.yml

@@ -20,8 +20,6 @@ spring:
     restart:
       enabled: true #热部署生效
       additional-paths: src/main/java #设置重启的目录
-#  session:
-#    store-type: jdbc
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: com.example.wholeestate.model

whole-estate/src/main/resources/mapper/TaCollectionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.wholeestate.dao.TaCollectionMapper">
+
+</mapper>