首页用户行为调整

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -5,6 +5,7 @@ import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class CustomerStatisticTimeJob extends BaseController {
     @Autowired
     public ITaPersonFromRecordService iTaPersonFromRecordService;
 
+    @Autowired
+    private ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
     /**
      *
      * 盘客工具数据统计
@@ -80,6 +84,9 @@ public class CustomerStatisticTimeJob extends BaseController {
 
         //统计新增来源用户
         iTaPersonFromRecordService.personFromStatistic();
+
+        //统计用户行为数据
+        iTsUserBehaviorStatisticService.userBehaviorStatustic();
     }
 
 }

src/main/java/com/huiju/estateagents/statistic/controller/TsUserBehaviorStatisticController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.statistic.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.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+
+/**
+ * <p>
+    * 用户行为统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@RestController
+@RequestMapping("/api")
+public class TsUserBehaviorStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsUserBehaviorStatisticController.class);
+
+    @Autowired
+    public ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsUserBehaviorStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsUserBehaviorStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsUserBehaviorStatistic> result = iTsUserBehaviorStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.POST)
+    public ResponseBean tsUserBehaviorStatisticAdd(@RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.save(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsUserBehaviorStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsUserBehaviorStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsUserBehaviorStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.updateById(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsUserBehaviorStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 用户行为
+     * @return
+     */
+    @GetMapping(value = "/admin/tsUserBehavior")
+    public ResponseBean selectUserBehavior(
+                                           @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,
+                                           HttpServletRequest request) {
+        return iTsUserBehaviorStatisticService.selectUserBehavior(getOrgId(request), startDate, endDate, buildingId);
+    }
+}

src/main/java/com/huiju/estateagents/statistic/entity/TsUserBehaviorStatistic.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.statistic.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 2020-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsUserBehaviorStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户行为统计主键
+     */
+    @TableId(value = "behavior_id", type = IdType.AUTO)
+    private Integer behaviorId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 行为数量统计
+     */
+    private Integer behaviorNum;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户行为统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Mapper
+public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehaviorStatistic> {
+
+    List<TsUserBehaviorStatistic> seleUserBehaviorList();
+
+    int deleteByDate();
+
+    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITsUserBehaviorStatisticService.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 用户行为统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+public interface ITsUserBehaviorStatisticService extends IService<TsUserBehaviorStatistic> {
+
+    void userBehaviorStatustic();
+
+    /**
+     * 按日期获取统计列表
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -0,0 +1,66 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdBizEvent;
+import com.huiju.estateagents.entity.TdBizEventType;
+import com.huiju.estateagents.mapper.TdBizEventTypeMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.mapper.TsUserBehaviorStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户行为统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Service
+public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehaviorStatisticMapper, TsUserBehaviorStatistic> implements ITsUserBehaviorStatisticService {
+
+    @Autowired
+    private TsUserBehaviorStatisticMapper tsUserBehaviorStatisticMapper;
+
+    @Autowired
+    private TdBizEventTypeMapper tdBizEventTypeMapper;
+
+    @Override
+    public void userBehaviorStatustic() {
+        //查询当天信息
+        List<TsUserBehaviorStatistic> list = tsUserBehaviorStatisticMapper.seleUserBehaviorList();
+        //删除当天信息
+        tsUserBehaviorStatisticMapper.deleteByDate();
+        //批量插入信息
+        this.saveBatch(list);
+    }
+
+    /**
+     * 按日期获取统计列表
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserBehavior", tsUserBehaviorStatistics);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

src/main/resources/mapper/statistic/TsUserBehaviorStatisticMapper.xml

@@ -0,0 +1,95 @@
+<?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.statistic.mapper.TsUserBehaviorStatisticMapper">
+    <delete id="deleteByDate">
+        delete from ts_user_behavior_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+    </delete>
+
+    <select id="seleUserBehaviorList"
+            resultType="com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic">
+                SELECT
+            temp_date.date AS create_date,
+            temp_date.type_name AS event_name,
+            temp_date.type_id AS event_type,
+            temp.activityCount AS behavior_num,
+            temp.building_id,
+            temp.org_id
+        FROM
+            (
+        SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            b.type_id,
+            b.type_name,
+            a.rownum
+        FROM
+            sequence a,
+            td_biz_event_type b
+            ) AS temp_date
+            LEFT JOIN (
+        SELECT
+            COUNT( 1 ) AS activityCount,
+            tpvr.event_type,
+            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
+            tpvr.building_id,
+            tp.org_id
+        FROM
+            ta_person tp
+            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+        WHERE
+            tp.person_type IN ( 'customer', 'drift', 'estate agent' )
+        GROUP BY
+            tpvr.event_type,
+            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
+            tp.org_id,
+            tpvr.building_id
+            ) AS temp ON temp_date.date = temp.date
+            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
+    </select>
+    <select id="seleBehaviorListByDate"
+            resultType="com.huiju.estateagents.po.PersonPO">
+        SELECT
+            temp_date.date AS date,
+            temp_date.type_name AS activity,
+            temp.activityCount AS activityCount
+        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
+            <trim prefix="where">
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+            </trim>
+        ) AS temp_date
+        LEFT JOIN (
+            SELECT
+            tp.event_type,
+            tp.event_name as activity,
+            sum( tp.behavior_num )  as activityCount,
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' )  as date
+            FROM
+            ts_user_behavior_statistic tp
+            where tp.org_id = #{orgId}
+            <if test="startDate != null or endDate != null">
+                AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
+            </if>
+            <if test="startDate == null or endDate == null">
+                AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            <if test="buildingId != null and buildingId != ''">
+                and tp.building_id = #{buildingId}
+            </if>
+            GROUP BY
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
+            tp.event_type
+        ) AS temp ON temp_date.date = temp.date
+        AND temp_date.type_id = temp.event_type
+        ORDER BY
+        temp_date.date ASC
+    </select>
+</mapper>