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

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java
#	src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java
#	src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java
#	src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -505,4 +505,9 @@ public class CommConstant {
      * 高德地图key
      */
     public static final String AMAP_KEY = "14f05ce59c26364fd0674014dc0d8b1b";
+
+    /**
+     * 埋点类型h5
+     */
+    public static final String EVENT_H5 = "h5";
 }

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

@@ -87,6 +87,7 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
+        taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
         Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
         if(eventProperties<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
@@ -203,7 +204,7 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-    
+
     /**
      * 盘客工具分页获取访问记录
      * @param pageNumber
@@ -233,15 +234,56 @@ public class TaPersonVisitRecordController extends BaseController {
                                                 @RequestParam(value ="drainageId",required = false) Integer drainageId,
                                                 @RequestParam(value ="shareName",required = false) String shareName,
                                                 @RequestParam(value ="shareTel",required = false) String shareTel,
-                                                HttpServletRequest request){
-
+                                                HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel);
+            responseBean.addSuccess(result);
+            return responseBean;
+        } catch (Exception e) {
+            logger.error("drainageVisitRecord -=- {}", e.toString());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 个人中心访客记录分页查询
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
+    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
             return ResponseBean.success(result);
         }catch (Exception e){
-            logger.error("drainageVisitRecord -=- {}",e.toString());
+            e.printStackTrace();
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 个人中心访客记录单个人员的所有活动
+     * @return
+     */
+    @RequestMapping(value="/wx/visitRecord/activity",method= RequestMethod.GET)
+    public ResponseBean wxVisitRecordList(@RequestParam(value = "userId") Integer userId,
+                                          @RequestParam(value = "personId") String personId,
+                                          HttpServletRequest request){
+        try {
+            List<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(userId,personId,getOrgId(request));
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }

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

@@ -137,4 +137,15 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String shareTel;
+
+    /** 1是我的客户
+     */
+    @TableField(exist = false)
+    private Integer myCustomer;
+
+    /**
+     * 活动创建时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime createDate;
 }

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

@@ -3,7 +3,6 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -71,4 +70,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @return
      */
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel);
+    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType);
+
+    List<TaPersonVisitRecord> getWxVisitRecordActivityList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventH5") String eventH5);
 }

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务类
@@ -22,6 +24,25 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @return
 	 */
 	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId);
+
+	/**
+	 * 分页获取个人中心访客记录
+	 * @param pg
+	 * @param userId
+	 * @param orgId
+	 * @return
+	 */
+    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
+
+	/**
+	 * 获取这个人的活动数据列表
+	 * @param userId
+	 * @param personId
+	 * @param orgId
+	 * @return
+	 */
+	List<TaPersonVisitRecord> getWxVisitRecordActivityList(Integer userId, String personId, Integer orgId);
+
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
 

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

@@ -85,23 +85,25 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
         List<Map<String, Object>> friendList = new ArrayList<>();
         if (null != result && result.size() > 0) {
             for (TaChat taChat: result) {
-                boolean isSend = taChat.getSendPerson().equals(personId) ? true : false;
-                String chatWith = isSend ? taChat.getReceivePerson() : taChat.getSendPerson();
-                String name = isSend ? taChat.getReceiveName() : taChat.getSendName();
-                String chatAvatar = isSend ? taChat.getReceiveAvatar() : taChat.getSendAvatar();
-                Integer unReadNum = taChatMapper.getUnReadMessage(personId, chatWith);
-
-                Map<String, Object> friend = new HashMap<>();
-                friend.put("friendId", chatWith);
-                friend.put("name", name);
-                friend.put("avatar", chatAvatar);
-                friend.put("messageType", taChat.getMessageType());
-                friend.put("message", taChat.getMessage());
-                friend.put("createDate", taChat.getCreateDate());
-                friend.put("unReadNum", unReadNum);
-                friend.put("isSend", isSend);
-
-                friendList.add(friend);
+                if (null != taChat.getSendPerson() && null != taChat.getSendAvatar() && null != taChat.getSendName() && null != taChat.getReceivePerson()){
+                    boolean isSend = taChat.getSendPerson().equals(personId) ? true : false;
+                    String chatWith = isSend ? taChat.getReceivePerson() : taChat.getSendPerson();
+                    String name = isSend ? taChat.getReceiveName() : taChat.getSendName();
+                    String chatAvatar = isSend ? taChat.getReceiveAvatar() : taChat.getSendAvatar();
+                    Integer unReadNum = taChatMapper.getUnReadMessage(personId, chatWith);
+
+                    Map<String, Object> friend = new HashMap<>();
+                    friend.put("friendId", chatWith);
+                    friend.put("name", name);
+                    friend.put("avatar", chatAvatar);
+                    friend.put("messageType", taChat.getMessageType());
+                    friend.put("message", taChat.getMessage());
+                    friend.put("createDate", taChat.getCreateDate());
+                    friend.put("unReadNum", unReadNum);
+                    friend.put("isSend", isSend);
+
+                    friendList.add(friend);
+                }
             }
         }
 

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

@@ -5,6 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+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.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
@@ -60,7 +67,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaPersonMapper taPersonMapper;
 
-	
+	private TaDrainageMapper taDrainageMapper;
+
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -95,7 +103,6 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				if (null != helpActivity){
 					e.setActivityName(helpActivity.getTitle());
 				}
-				
 			}
 			//获取咨询标题
 			if ("news".equals(e.getEventType()) && null != e.getTargetId()){
@@ -103,7 +110,13 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				if (null != taNews){
 					e.setActivityName(taNews.getNewsName());
 				}
-				
+			}
+			//获取H5活动标题
+			if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+				TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
+				if (null != taDrainage){
+					e.setActivityName(taDrainage.getName());
+				}
 			}
 		});
 		result.setRecords(records);
@@ -130,6 +143,49 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
 		return taPersonVisitRecordIPage;
 	}
+	/**
+	 * 分页获取个人中心访客记录
+	 *
+	 * @param pg
+	 * @param userId
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
+		//获取我的访问客户列表
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5);
+		List<TaPersonVisitRecord> records = result.getRecords();
+		//判断是否我的客户状态
+		records.forEach(e -> {
+			String data = e.getData();
+			JSONObject dataJson = JSONObject.parseObject(data);
+			String realtyConsultant = dataJson.getString("consultant");
+			QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper();
+			queryWrapper.eq("realty_consultant",realtyConsultant);
+			queryWrapper.eq("person_id",e.getPersonId());
+			TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+			if (null != taRecommendCustomer){
+				//1是我的客户
+				e.setMyCustomer(CommConstant.STATUS_NORMAL);
+			}
+		});
+		return null;
+	}
+
+	/**
+	 * 获取这个人的活动数据列表
+	 *
+	 * @param userId
+	 * @param personId
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public List<TaPersonVisitRecord> getWxVisitRecordActivityList(Integer userId, String personId, Integer orgId) {
+		return personVisitRecordMapper.getWxVisitRecordActivityList(userId,personId,orgId,CommConstant.EVENT_H5);
+	}
+
 //    @Autowired
 //    private TaPersonMapper taPersonMapper;
 //    @Autowired

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

@@ -519,11 +519,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             }else {
                 user = userService.getById(consultant.getUserId());
             }
-            List<String> projects = taPersonMapper.getUserProjects(user.getUserId());
-            if (projects.size()>0){
-                user.setProjects(projects);
+            if (null != user){
+                List<String> projects = taPersonMapper.getUserProjects(user.getUserId());
+                if (projects.size()>0){
+                    user.setProjects(projects);
+                }
+                taRecommendCustomer.setConsultant(user);
             }
-            taRecommendCustomer.setConsultant(user);
         }
         return taRecommendCustomer;
     }

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -90,6 +90,35 @@
     <select id="getFirstVisitTimeByPersonId" resultType="java.time.LocalDateTime">
         select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
     </select>
+    <select id="getWxVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            * ,
+	        p.`name` as user_name
+        FROM
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} ORDER BY visit_time DESC ) t
+            left JOIN ta_person p on t.person_id = p.person_id
+        GROUP BY
+            t.person_id
+        ORDER BY
+	        t.visit_time DESC
+    </select>
+    <select id="getWxVisitRecordActivityList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            d.name as activity_name,
+            d.create_date
+        FROM
+            ta_person_visit_record t
+            LEFT join ta_drainage d on t.target_id = d.drainage_id
+        WHERE
+            t.event_type = #{eventType}
+            AND t.consultant_id = #{userId}
+            AND t.person_id = #{personId}
+        GROUP BY
+            t.target_id
+        ORDER BY
+            t.visit_time DESC
+    </select>
 
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select