Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -121,6 +121,7 @@ public class TaBuildingDynamicController extends BaseController {
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
         dynamic.setStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
+        dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
         iBuildingDynamicService.save(dynamic);
         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/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;
 
 /**
@@ -293,4 +295,57 @@ 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/{phone}")
+    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
+                                             @RequestParam(defaultValue = "10") int pageSize,@PathVariable String phone){
+
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            String buidling = "";
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,phone,buidling);
+            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/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/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<TaPerson> 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/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/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) {
         // 先查询是否存在用户
@@ -645,4 +653,41 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public String getPersonIdByCustomerId(String customerId){
         return taRecommendCustomerMapper.getCustomerPersonId(customerId);
     }
+
+    @Override
+    public IPage<TaPerson> 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());
+        }
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaPerson> persons = new QueryWrapper<>();
+        persons.in("personId",personIds);
+        return taPersonMapper.selectPage(page,persons);
+
+    }
+
+    @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/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/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>