新需求

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

@@ -85,4 +85,9 @@ public class TaPersonFromRecord implements Serializable {
      * 行为
      */
     private String activity;
+
+    /**
+     * 微信来源类型
+     */
+    private String sceneType;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
+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;
@@ -36,6 +37,9 @@ public class CustomerStatisticTimeJob extends BaseController {
     @Autowired
     private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
 
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
+
     /**
      *
      * 盘客工具数据统计
@@ -43,36 +47,39 @@ public class CustomerStatisticTimeJob extends BaseController {
      * 开启定时任务，每天23:50执行
      */
     @Scheduled(cron = "59 50 23 * * ?")
-    //@Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
-    
+
         //每天的新增客户统计并入表
         customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
-        
+
         //每天的跟进客户统计并入表
         customerStatisticDailyService.followUpStatisticDaily(nowDate);
-        
+
         //每天的到访客户统计并入表
         customerStatisticDailyService.visiteStatisticDaily(nowDate);
-    
+
         //每天的新增客户性别统计并入表
         taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
-    
+
         //每天的跟进客户性别统计并入表
         taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
-    
+
         //每天的到访客户性别统计并入表
         taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
-    
+
         //每月的新增客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.newCustomerStatisticMonthly(nowDate);
-    
+
         //每月的跟进客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.followUpStatisticMonthly(nowDate);
-    
+
         //每月的到访客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.visiteStatisticMonthly(nowDate);
+
+        //统计新增来源用户
+        iTaPersonFromRecordService.personFromStatistic();
     }
 
 }

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

@@ -2,8 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 新增用户来源表  Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPersonFromRecordMapper extends BaseMapper<TaPersonFromRecord> {
 
+    List<TsPersonFromStatistic> getNowDataList();
 }

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

@@ -15,4 +15,9 @@ import com.huiju.estateagents.entity.TaPersonVisitRecord;
 public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord> {
 
     void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord);
+
+    /**
+     * 定时任务批量保存数据
+     */
+    void personFromStatistic();
 }

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

@@ -6,10 +6,13 @@ import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +28,9 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
     @Autowired
     private TaPersonFromRecordMapper taPersonFromRecordMapper;
 
+    @Autowired
+    private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
+
     /**
      * 通過買點表清洗數據
      * @param taPersonVisitRecord
@@ -53,4 +59,13 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
         }
         taPersonFromRecordMapper.insert(taPersonFromRecord);
     }
+
+    /**
+     * 定时任务批量保存数据
+     */
+    @Override
+    public void personFromStatistic() {
+        List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
+        tsPersonFromStatisticMapper.insertStatisticList(list);
+    }
 }

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

@@ -0,0 +1,143 @@
+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.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 用户来源统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@RestController
+@RequestMapping("/")
+public class TsPersonFromStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsPersonFromStatisticController.class);
+
+    @Autowired
+    public ITsPersonFromStatisticService iTsPersonFromStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsPersonFromStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsPersonFromStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsPersonFromStatistic> result = iTsPersonFromStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.POST)
+    public ResponseBean tsPersonFromStatisticAdd(@RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.save(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsPersonFromStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsPersonFromStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsPersonFromStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsPersonFromStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.updateById(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsPersonFromStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,62 @@
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsPersonFromStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "person_from_statistic_id", type = IdType.AUTO)
+    private Integer personFromStatisticId;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 来源数量
+     */
+    private Integer fromNum;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 注册数量
+     */
+    private Integer registeredNum;
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户来源统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Mapper
+public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStatistic> {
+
+    void insertStatisticList(List<TsPersonFromStatistic> list);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+
+/**
+ * <p>
+ * 用户来源统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+public interface ITsPersonFromStatisticService extends IService<TsPersonFromStatistic> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户来源统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Service
+public class TsPersonFromStatisticServiceImpl extends ServiceImpl<TsPersonFromStatisticMapper, TsPersonFromStatistic> implements ITsPersonFromStatisticService {
+
+}

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonFromRecordMapper">
 
+    <select id="getNowDataList" resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+            count( 1 ) AS from_num,
+            t.scene_type,
+            t.event_type,
+            t.org_id,
+            t.create_date,
+            sum( IF ( p.photo IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
+        FROM
+            ta_person_from_record t
+            LEFT JOIN ta_person p ON t.person_id = p.person_id
+        WHERE
+            t.is_first_time = 1
+            AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+        GROUP BY
+            t.scene_type,
+            t.event_type,
+            t.org_id
+    </select>
 </mapper>

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

@@ -0,0 +1,12 @@
+<?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.TsPersonFromStatisticMapper">
+
+    <insert id="insertStatisticList">
+        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum})
+        </foreach>
+    </insert>
+</mapper>