合并

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

@@ -2,14 +2,21 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +33,12 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaBuildingService taBuildingService;
 
+    @Autowired
+    ITaSaveService iTaSaveService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     /**
      * 楼盘详情
      * @param id
@@ -142,9 +155,22 @@ public class TaBuildingController extends BaseController {
     public ResponseBean getWxBuildingList(
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
-            String name
+            @RequestParam(defaultValue = "false") Boolean mine,
+            String name,
+            HttpServletRequest request
     ){
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name);
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
+        }
+
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets);
     }
 
     /**

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

@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -26,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +48,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -79,9 +85,21 @@ public class TaBuildingDynamicController extends BaseController {
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean mine,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        ResponseBean  responseBean = new ResponseBean();
+        if(mine){
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+        }else {
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        }
+
         return responseBean;
     }
 

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

@@ -0,0 +1,187 @@
+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.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaCustomerMessageService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 用户留言表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCustomerMessageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerMessageController.class);
+
+    @Autowired
+    public ITaCustomerMessageService iTaCustomerMessageService;
+
+    @Autowired
+    private ITaPersonService taPersonService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
+    public ResponseBean taCustomerMessageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerMessageService.save(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerMessage/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerMessageDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerMessageService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerMessage taCustomerMessage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerMessageService.updateById(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerMessageGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerMessageService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 保存对象
+     * @param taCustomerMessage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerMessage",method= RequestMethod.POST)
+    public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
+            taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taCustomerMessage.setCreateDate(LocalDateTime.now());
+            taCustomerMessage.setPersonId(taPersons.getPersonId());
+            taCustomerMessage.setNickname(taPersons.getNickname());
+            if (iTaCustomerMessageService.save(taCustomerMessage)){
+                responseBean.addSuccess(taCustomerMessage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerMessageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -5,8 +5,14 @@ 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.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaNewsService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 资讯表  前端控制器
@@ -35,6 +44,12 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaNewsService iTaNewsService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
 
     /**
      * 分页查询列表
@@ -61,9 +76,23 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, null, null, null, null);
-        return responseBean;
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(defaultValue = "false") Boolean mine,
+                                     HttpServletRequest request
+    ){
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
+        }
+
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, targets);
+        return ResponseBean.success(results);
     }
 
     /**

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,13 +49,25 @@ public class TaPersonController extends BaseController {
     @GetMapping("/wx/cards")
     public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
                                     @RequestParam(defaultValue = "10") int pageSize,
-                                    @RequestParam(defaultValue = "false") boolean mine) {
+                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        if (mine){
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            return ResponseBean.success(result);
+        }else {
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
+            return ResponseBean.success(result);
+        }
+
 
-        IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
-        return ResponseBean.success(result);
     }
 
     /**
@@ -293,4 +307,62 @@ public class TaPersonController extends BaseController {
     boolean isEmpty(String str) {
         return null == str || "".equals(str.trim());
     }
+
+    /**
+//     * 获取收藏置业顾问列表
+//     * @param pageNumber
+//     * @param pageSize
+//     * @return
+//     */
+//    @GetMapping("/wx/savedPerson")
+//    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
+//                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
+//        String openid = JWTUtils.getSubject(request);
+//        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+//        if (null == taPersons || taPersons.size() != 1) {
+//            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//        TaPerson person = taPersons.get(0);
+//        if (pageNumber < 0 || pageSize < 0) {
+//            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//        try {
+//            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+//            return ResponseBean.success(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//    }
+    /**
+     * 获取我参加过的活动列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/joinedActivity/")
+    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
+                                             @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+    }
+
+
 }

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户留言表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 留言ID
+     */
+    @TableId(value = "message_id", type = IdType.AUTO)
+    private Integer messageId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 用户ID
+     */
+    private String personId;
+
+    /**
+     * 用户名
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 留言内容
+     */
+    private String message;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

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

@@ -153,6 +153,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private LocalDateTime visitTime;
 
+    @TableField(exist = false)
+    private Integer visitTimes;
+
     @TableField(exist = false)
     private TaPerson consultant;
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户留言表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Mapper
+public interface TaCustomerMessageMapper extends BaseMapper<TaCustomerMessage> {
+
+}

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

@@ -43,4 +43,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     String getConsultantByTel(@Param("tel")String tel);
 
+    List<Map<String,Object>> selectCardListofMine(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("personIds")List<String> personIds);
+
 }

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaSave;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSaveMapper extends BaseMapper<TaSave> {
 
+    List<String> getTargesOfPerson(@Param("personId") String personId, @Param("tagertType") String tagertType);
 }

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

@@ -4,6 +4,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 项目表 服务类
@@ -105,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+
+/**
+ * <p>
+ * 用户留言表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+public interface ITaCustomerMessageService extends IService<TaCustomerMessage> {
+
+}

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 
+import java.util.List;
+
 /**
  * <p>
  * 资讯表  服务类
@@ -67,4 +69,6 @@ public interface ITaNewsService extends IService<TaNews> {
      * @return
      */
     ResponseBean wxTaPvNum(Integer id);
+
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, List<String> targets);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -56,5 +57,9 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     String getPersonIdByCustomerId(String customerId);
 
+    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
+
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
+
 
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSave;
 
+import java.util.List;
+
 /**
  * <p>
  * 收藏表  服务类
@@ -19,4 +21,5 @@ public interface ITaSaveService extends IService<TaSave> {
 
     ResponseBean cancelLike(String openid, String typeOf, String like);
 
+    List<String> getTargesOfPerson(String personId, String tagertType);
 }

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

@@ -45,6 +45,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TaBuildingApartmentMapper taBuildingApartmentMapper;
 
+    @Autowired
+    TaSaveMapper taSaveMapper;
+
     @Autowired
     TaUvMapper taUvMapper;
 
@@ -308,13 +311,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
+        buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
+//        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");
 
         IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaCustomerMessage;
+import com.huiju.estateagents.mapper.TaCustomerMessageMapper;
+import com.huiju.estateagents.service.ITaCustomerMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户留言表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-30
+ */
+@Service
+public class TaCustomerMessageServiceImpl extends ServiceImpl<TaCustomerMessageMapper, TaCustomerMessage> implements ITaCustomerMessageService {
+
+}

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

@@ -69,14 +69,17 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
-        List<TaNews> records = taNewsIPage.getRecords();
+        injectType(taNewsIPage.getRecords());
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+
+    private void injectType(List<TaNews> records) {
         records.forEach(e -> {
             TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
             e.setNewsType(newsType);
         });
-
-        responseBean.addSuccess(taNewsIPage);
-        return responseBean;
     }
 
     @Override
@@ -183,4 +186,19 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         responseBean.addSuccess((Object)"");
         return responseBean;
     }
+
+    @Override
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, List<String> targets) {
+        IPage<TaNews> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        injectType(taNewsIPage.getRecords());
+
+        return page;
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -67,6 +66,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
 
+    @Autowired
+    private TaSaveMapper taSaveMapper;
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
         // 先查询是否存在用户
@@ -560,6 +568,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public void addConsultantBuildings(String personId, String paramStr) {
         JSONObject params = JSONObject.parseObject(paramStr);
         String building = params.getString("buildings");
+        if (StringUtils.isEmpty(building)) {
+            return;
+        }
+
 //        JSONArray buildings = params.getJSONArray("buildings");
 
 //        if (null != buildings && !buildings.isEmpty()) {
@@ -645,4 +657,43 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public String getPersonIdByCustomerId(String customerId){
         return taRecommendCustomerMapper.getCustomerPersonId(customerId);
     }
+
+    @Override
+    public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
+        QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
+        savePerson.eq("person_id",personId);
+        savePerson.eq("target_type",CommConstant.FAVOR_CONSULTANT);
+        List<TaSave> savedPerson = taSaveMapper.selectList(savePerson);
+        List<String> personIds = new ArrayList<>();
+        for(int i =0;i<savedPerson.size();i++){
+            personIds.add(savedPerson.get(i).getSavedTarget());
+        }
+        Page<Map<String, Object>> page = new Page<>();
+        page.setSize(pageSize);
+        page.setPages(pageNumber);
+        page.setCurrent(pageNumber);
+        page.setRecords(taPersonMapper.selectCardListofMine(page,CommConstant.PERSON_REALTY_CONSULTANT,CommConstant.STATUS_NORMAL,personIds));
+        return page;
+
+    }
+
+    @Override
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
+        activityDynamicEnlistQueryWrapper.eq("phone",phone);
+        if(!StringUtils.isEmpty(building)){
+            activityDynamicEnlistQueryWrapper.eq("building_id",building);
+        }
+        List<TaActivityDynamicEnlist> activityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(activityDynamicEnlistQueryWrapper);
+        List<String>activityIds = new ArrayList<>();
+        for (int i=0;i<activityDynamicEnlists.size();i++){
+            activityIds.add(activityDynamicEnlists.get(i).getDynamicId());
+        }
+        IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaBuildingDynamic> empty = new QueryWrapper<>();
+        empty.orderBy(true,false,"start_date");
+        return taBuildingDynamicMapper.selectPage(page,empty);
+
+
+    }
 }

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

@@ -263,6 +263,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());

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

@@ -134,6 +134,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         return ResponseBean.success("");
     }
 
+    @Override
+    public List<String> getTargesOfPerson(String personId, String tagertType) {
+        return taSaveMapper.getTargesOfPerson(personId, tagertType);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }

src/main/resources/mapper/TaCustomerMessageMapper.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.huiju.estateagents.mapper.TaCustomerMessageMapper">
+
+</mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -113,4 +113,29 @@ FROM
     <select id="getConsultantByTel" resultType="java.lang.String">
         select person_id from ta_person where tel = #{tel}
     </select>
+
+    <select id="selectCardListofMine" resultType="java.util.HashMap">
+        SELECT
+        t.person_id AS id,
+        t.name,
+        t.company,
+        t.department,
+        t.post,
+        t.tel AS phone,
+        t.avatarurl AS avatar,
+        t.photo
+        FROM
+        ta_person t
+        WHERE
+        t.person_type = #{personType}
+        AND t.status = #{status}
+        <if test="personIds != null">
+            and t.person_id in
+            <foreach collection="personIds" item="personIds" index="index" open="(" close=")" separator=",">
+                #{ordersId}
+            </foreach>
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonVisitRecordMapper">
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from ta_person_visit_record
-        where person_id = #{personIds}
+        where person_id = #{personId}
     </select>
 
 </mapper>

src/main/resources/mapper/TaSaveMapper.xml

@@ -0,0 +1,13 @@
+<?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.huiju.estateagents.mapper.TaSaveMapper">
+    <select id="getTargesOfPerson" resultType="string">
+        SELECT
+            t.saved_target
+        FROM
+            ta_save t
+        WHERE
+            t.person_id = #{personId}
+        AND t.tagert_type = #{tagertType}
+    </select>
+</mapper>