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);
     }
 
     /**
@@ -75,7 +78,7 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectEventAll")
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
-                                              @RequestParam(required = false) Integer personId) {
+                                              @RequestParam(required = false) String personId) {
         return iStatisticalService.selectEventAll(event, personId);
     }
 

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

@@ -4,6 +4,7 @@ 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.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaEventProperties;
 import com.huiju.estateagents.service.ITaEventPropertiesService;
 import org.slf4j.Logger;
@@ -27,7 +28,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-08-06
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaEventPropertiesController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaEventPropertiesController.class);
@@ -42,14 +43,19 @@ public class TaEventPropertiesController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taEventProperties",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taEventProperties",method= RequestMethod.GET)
     public ResponseBean taEventPropertiesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @RequestParam(value ="eventType", required = false) String eventType,
+                                      @RequestParam(value ="buildingId",required = false) String buildingId
+    ){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaEventProperties> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
+            queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);

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

@@ -27,7 +27,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-08-06
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdBizEventController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdBizEventController.class);
@@ -42,7 +42,7 @@ public class TdBizEventController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdBizEvent",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();

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

@@ -27,7 +27,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-08-06
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdBizEventTypeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdBizEventTypeController.class);
@@ -42,7 +42,7 @@ public class TdBizEventTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdBizEventType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdBizEventType",method= RequestMethod.GET)
     public ResponseBean tdBizEventTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();

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/entity/TdBizEvent.java

@@ -54,9 +54,4 @@ public class TdBizEvent implements Serializable {
      */
     private LocalDateTime createDate;
 
-    private String typeId;
-
-    private String typeName;
-
-
 }

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -30,7 +31,13 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param page
      * @return
      */
-    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page, String buildingId);
+    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page,
+                                         @Param("startDate") LocalDate startDate,
+                                         @Param("endDate")LocalDate endDate,
+                                         @Param("buildingId") String buildingId,
+                                         @Param("eventType") String eventType,
+                                         @Param("event") String event,
+                                         @Param("activity") String activity);
 
 
     /**
@@ -40,7 +47,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      */
     @ResultType(TaPersonVisitRecord.class)
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
-    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") Integer personId);
+    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId);
 
 
 

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);
 
     /**
      * 行为分析的 具体数据列表
@@ -77,7 +84,7 @@ public interface IStatisticalService {
      * @param personId
      * @return
      */
-    ResponseBean selectEventAll(String event, Integer personId);
+    ResponseBean selectEventAll(String event, String personId);
 
     /**
      * 转换率 统计

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, startDate, endDate, buildingId, eventType, event, activity);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);
@@ -180,7 +187,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectEventAll(String event, Integer personId) {
+    public ResponseBean selectEventAll(String event, String personId) {
         ResponseBean responseBean = new ResponseBean();
 
         List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);

src/main/resources/mapper/TaPersonMapper.xml

@@ -149,13 +149,13 @@ FROM
               DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
               sequence a
-            WHERE
-                <if test="startDate == null or endDate == null">
-                    a.rownum <![CDATA[ <= ]]> 7
-                </if>
-                <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-                </if>
+
+              <trim prefix="where">
+                  <if test="startDate != null or endDate != null">
+                      a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                  </if>
+              </trim>
+
         ) AS temp_date
         LEFT JOIN (
             SELECT
@@ -180,30 +180,40 @@ FROM
         SELECT
           DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date, b.type_id, b.type_name
           from sequence a, td_biz_event_type b
-          where
-            <if test="startDate == null or endDate == null">
-                a.rownum <![CDATA[ <= ]]> 7
-            </if>
-            <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-            </if>
+
+            <trim prefix="where">
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+            </trim>
 
         ) AS temp_date
 
         LEFT JOIN (
-        SELECT
-        COUNT(1) as activityCount,
-        tpvr.event_type,
-        DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' ) as date
-        FROM
-        ta_person tp
-        INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-        where ifnull(tp.person_type, '') != #{personType}
-        <if test="buildingId != null and buildingId != ''">
-            and tpvr.building_id = #{buildingId}
-        </if>
-        GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
+            SELECT
+                COUNT(1) as activityCount,
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' ) as date
+            FROM
+              ta_person tp
+            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+            where ifnull(tp.person_type, '') != #{personType}
+            <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
     </select>
 
     <select id="selectActiveUserCount" resultType="map">
@@ -223,13 +233,13 @@ FROM
               </if>
             FROM
               sequence a
-            WHERE
-              <if test="startDate == null or endDate == null">
-                  a.rownum <![CDATA[ <= ]]> 7
-              </if>
-              <if test="startDate != null or endDate != null">
-                  a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-              </if>
+
+              <trim prefix="where">
+                  <if test="startDate != null or endDate != null">
+                      a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                  </if>
+              </trim>
+
         ) AS temp_date
         LEFT JOIN (
             SELECT
@@ -257,14 +267,13 @@ FROM
               DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
               sequence a
-            WHERE
 
-                <if test="startDate == null or endDate == null">
-                    a.rownum <![CDATA[ <= ]]> 7
-                </if>
-                <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-                </if>
+                <trim prefix="where">
+                    <if test="startDate != null or endDate != null">
+                        a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    </if>
+                </trim>
+
 
             ) AS temp_date
             LEFT JOIN (
@@ -289,14 +298,12 @@ FROM
              DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
               sequence a
-            WHERE
 
-                <if test="startDate == null or endDate == null">
-                    a.rownum <![CDATA[ <= ]]> 7
-                </if>
-                <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-                </if>
+                <trim prefix="where">
+                    <if test="startDate != null or endDate != null">
+                        a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    </if>
+                </trim>
 
         ) AS temp_date
         LEFT JOIN (
@@ -384,14 +391,12 @@ FROM
             sequence a
             ,
             td_person_from tempf
-            WHERE
 
-                <if test="startDate == null or endDate == null">
-                    a.rownum <![CDATA[ <= ]]> 7
-                </if>
-                <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-                </if>
+                <trim prefix="where">
+                    <if test="startDate != null or endDate != null">
+                        a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    </if>
+                </trim>
 
         ) AS temp_date
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -6,20 +6,45 @@
         where person_id = #{personId}
     </select>
 
-    <select id="selectAll">
+    <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            tpvr.*,
-            tp.name,
+            tpvr.record_id as recordId,
+            tpvr.person_id as personId,
+            tpvr.person_type as personType,
+            tpvr.building_id as buildingId,
+            tpvr.activity as activity,
+            tpvr.event as event,
+            tpvr.event_type as eventType,
+            tpvr.visit_duration as visitDuration,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as leaveTime,
+            ifnull(tp.name, tp.nickname) 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="startDate != null and endDate != null">
+                    and tpvr.visit_time between #{startDate} and #{endDate}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
-                    tpvr.building_id = #{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>
-            </where>
+                <if test="activity != null and activity != ''">
+                    and tpvr.activity = #{activity}
+                </if>
+            </trim>
+
         GROUP BY tpvr.person_id, tpvr.event
+        ORDER BY 	accessCount DESC,tpvr.visit_time DESC
     </select>
 
 </mapper>