访客记录

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();
@@ -225,4 +226,44 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
+    /**
+     * 个人中心访客记录分页查询
+     * @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){
+            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

@@ -114,4 +114,15 @@ public class TaPersonVisitRecord implements Serializable {
     @TableField(exist = false)
     private String activityName;
 
+    /**
+     * 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;
@@ -63,4 +62,8 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @return
      */
 	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg,@Param("personId") String personId);
+
+    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/TaPersonVisitRecordServiceImpl.java

@@ -1,7 +1,10 @@
 package com.huiju.estateagents.service.impl;
 
+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.entity.HelpActivity;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
@@ -99,6 +102,50 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		result.setRecords(records);
 		return result;
 	}
+
+	/**
+	 * 分页获取个人中心访客记录
+	 *
+	 * @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

@@ -69,5 +69,34 @@
     <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>
 
 </mapper>