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

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

@@ -65,8 +65,11 @@ public class StatisticalController {
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
-                                           @RequestParam(value = "buildingId", required = false) String buildingId) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageSize, startDate, endDate, buildingId);
+                                           @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           @RequestParam(value = "eventType", required = false) String eventType,
+                                           @RequestParam(value = "event", required = false) String event,
+                                           @RequestParam(value = "activity", required = false) String activity) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageSize, startDate, endDate, buildingId, eventType, event, activity);
     }
 
     /**

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

@@ -81,6 +81,22 @@ public class TaPersonVisitRecord implements Serializable {
 
     private String targetId;
 
+    /**
+     * 用户名称
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 事件名称
+     */
+    @TableField(exist = false)
+    private String eventName;
 
+    /**
+     * 访问次数
+     */
+    @TableField(exist = false)
+    private Integer accessCount;
 
 }

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

@@ -86,7 +86,13 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("buildingId") String buildingId);
+    List<PersonPO> selectUserBehavior(@Param("personType") String personType,
+                                      @Param("startDate")LocalDate startDate,
+                                      @Param("endDate")LocalDate endDate,
+                                      @Param("buildingId") String buildingId,
+                                      @Param("eventType") String eventType,
+                                      @Param("event") String event,
+                                      @Param("activity") String activity);
 
     /**
      * 活跃用户数 / 最近新增的用户数

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

@@ -30,7 +30,11 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param page
      * @return
      */
-    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page, String buildingId);
+    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page,
+                                         @Param("buildingId") String buildingId,
+                                         @Param("eventType") String eventType,
+                                         @Param("event") String event,
+                                         @Param("activity") String activity);
 
 
     /**

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

@@ -69,7 +69,14 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate, String buildingId);
+    ResponseBean selectUserBehavior(Integer pageNum,
+                                    Integer pageSize,
+                                    LocalDate startDate,
+                                    LocalDate endDate,
+                                    String buildingId,
+                                    String eventType,
+                                    String event,
+                                    String activity);
 
     /**
      * 行为分析的 具体数据列表

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

@@ -61,7 +61,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
 
         // 用户活跃数
         List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
@@ -163,14 +163,21 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate, String buildingId) {
+    public ResponseBean selectUserBehavior(Integer pageNum,
+                                           Integer pageSize,
+                                           LocalDate startDate,
+                                           LocalDate endDate,
+                                           String buildingId,
+                                           String eventType,
+                                           String event,
+                                           String activity) {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
-        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId, eventType, event, activity);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);

src/main/resources/mapper/TaPersonMapper.xml

@@ -201,6 +201,16 @@ FROM
         <if test="buildingId != null and buildingId != ''">
             and tpvr.building_id = #{buildingId}
         </if>
+        <if test="eventType != null and eventType != ''">
+            and tpvr.event_type = #{eventType}
+        </if>
+        <if test="event != null and event != ''">
+            and tpvr.event = #{event}
+        </if>
+        <if test="activity != null and activity != ''">
+            and tpvr.activity = #{activity}
+        </if>
+
         GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
         order by temp_date.date asc

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -6,19 +6,31 @@
         where person_id = #{personId}
     </select>
 
-    <select id="selectAll">
+    <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
             tpvr.*,
-            tp.name,
+            tp.name as userName,
+            tbe.event_name as eventName,
             COUNT(1) as accessCount
         FROM
             ta_person_visit_record tpvr
             LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
-            <where>
+            LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
+            <trim prefix="where" prefixOverrides="and | or">
                 <if test="buildingId != null and buildingId != ''">
-                    tpvr.building_id = #{buildingId}
+                    and tpvr.building_id = #{buildingId}
                 </if>
-            </where>
+                <if test="eventType != null and eventType != ''">
+                    and tpvr.event_type = #{eventType}
+                </if>
+                <if test="event != null and event != ''">
+                    and tpvr.event = #{event}
+                </if>
+                <if test="activity != null and activity != ''">
+                    and tpvr.activity = #{activity}
+                </if>
+            </trim>
+
         GROUP BY tpvr.person_id, tpvr.event
     </select>