傅行帆 5 年 前
コミット
3fc50e99f0

+ 3
- 0
src/main/java/com/huiju/estateagents/entity/TdWxDict.java ファイルの表示

@@ -1,6 +1,8 @@
1 1
 package com.huiju.estateagents.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
3 4
 import com.baomidou.mybatisplus.annotation.TableField;
5
+import com.baomidou.mybatisplus.annotation.TableId;
4 6
 import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
5 7
 import lombok.Data;
6 8
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class TdWxDict implements Serializable {
27 29
     /**
28 30
      * 场景值id
29 31
      */
32
+    @TableId(value = "scene_id", type = IdType.AUTO)
30 33
     private String sceneId;
31 34
 
32 35
     /**

+ 1
- 1
src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java ファイルの表示

@@ -46,7 +46,7 @@ public class CustomerStatisticTimeJob extends BaseController {
46 46
      *
47 47
      * 开启定时任务,每天23:50执行
48 48
      */
49
-    @Scheduled(cron = "59 50 23 * * ?")
49
+//    @Scheduled(cron = "59 50 23 * * ?")
50 50
 //    @Scheduled(cron = "* 0/1 * * * ?")
51 51
     private void configureTasks() {
52 52
         LocalDateTime nowDate = LocalDateTime.now();

+ 5
- 0
src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java ファイルの表示

@@ -52,6 +52,9 @@ public class JudglActivityTimeJob extends BaseController {
52 52
     @Autowired
53 53
     private ITaDrainageService iTaDrainageService;
54 54
 
55
+    @Autowired
56
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
57
+    
55 58
     /**
56 59
      * 开启定时任务,每天12:30执行
57 60
      */
@@ -90,6 +93,8 @@ public class JudglActivityTimeJob extends BaseController {
90 93
         //更新H5活动状态为已结束
91 94
         iTaDrainageService.updateDrainageToEnd();
92 95
 
96
+        //统计新增来源用户
97
+        iTaPersonFromRecordService.personFromStatistic();
93 98
     }
94 99
 
95 100
 }

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonFromRecordServiceImpl.java ファイルの表示

@@ -2,9 +2,12 @@ package com.huiju.estateagents.service.impl;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.estateagents.common.StringUtils;
5 6
 import com.huiju.estateagents.entity.TaPersonFromRecord;
6 7
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
8
+import com.huiju.estateagents.entity.TdWxDict;
7 9
 import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
10
+import com.huiju.estateagents.mapper.TdWxDictMapper;
8 11
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
9 12
 import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
10 13
 import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
@@ -31,6 +34,9 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
31 34
     @Autowired
32 35
     private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
33 36
 
37
+    @Autowired
38
+    private TdWxDictMapper tdWxDictMapper;
39
+
34 40
     /**
35 41
      * 通過買點表清洗數據
36 42
      * @param taPersonVisitRecord
@@ -46,6 +52,8 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
46 52
         taPersonFromRecord.setEvent(taPersonVisitRecord.getEvent());
47 53
         taPersonFromRecord.setEventType(taPersonVisitRecord.getEventType());
48 54
         taPersonFromRecord.setSceneId(taPersonVisitRecord.getSceneId());
55
+        TdWxDict tdWxDict = tdWxDictMapper.selectById(taPersonVisitRecord.getSceneId());
56
+        taPersonFromRecord.setSceneType(null == tdWxDict ? "" : tdWxDict.getSceneType());
49 57
         taPersonFromRecord.setSharePersonId(taPersonVisitRecord.getSharePersonId());
50 58
         taPersonFromRecord.setTargetId(taPersonVisitRecord.getTargetId());
51 59
         QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();