傅行帆 5 years ago
parent
commit
f354993c45

+ 4
- 15
src/main/java/com/huiju/estateagents/controller/TaPersonFromRecordController.java View File

28
  * @since 2020-01-03
28
  * @since 2020-01-03
29
  */
29
  */
30
 @RestController
30
 @RestController
31
-@RequestMapping("/")
31
+@RequestMapping("/api")
32
 public class TaPersonFromRecordController extends BaseController {
32
 public class TaPersonFromRecordController extends BaseController {
33
 
33
 
34
     private final Logger logger = LoggerFactory.getLogger(TaPersonFromRecordController.class);
34
     private final Logger logger = LoggerFactory.getLogger(TaPersonFromRecordController.class);
45
      * @param pageSize
45
      * @param pageSize
46
      * @return
46
      * @return
47
      */
47
      */
48
-    @RequestMapping(value="/taPersonFromRecord",method= RequestMethod.GET)
48
+    @RequestMapping(value="/admin/taPersonFromRecord",method= RequestMethod.GET)
49
     public ResponseBean taPersonFromRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
49
     public ResponseBean taPersonFromRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
50
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
50
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
51
         ResponseBean responseBean = new ResponseBean();
51
         ResponseBean responseBean = new ResponseBean();
52
-        try {
53
-            //使用分页插件
54
-		    IPage<TaPersonFromRecord> pg = new Page<>(pageNum, pageSize);
55
-            QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
56
-            queryWrapper.orderByDesc("create_date");
57
-
58
-            IPage<TaPersonFromRecord> result = iTaPersonFromRecordService.page(pg, queryWrapper);
59
-            responseBean.addSuccess(result);
60
-        }catch (Exception e){
61
-            e.printStackTrace();
62
-            logger.error("taPersonFromRecordList -=- {}",e.toString());
63
-            responseBean.addError(e.getMessage());
64
-        }
52
+        iTaPersonFromRecordService.personFromStatistic();
53
+        responseBean.addSuccess("成功");
65
         return responseBean;
54
         return responseBean;
66
     }
55
     }
67
 
56
 

+ 5
- 5
src/main/java/com/huiju/estateagents/entity/TaShareRecord.java View File

93
 
93
 
94
     @TableField(exist = false)
94
     @TableField(exist = false)
95
     private String activityName;
95
     private String activityName;
96
-    
96
+
97
     @TableField(exist = false)
97
     @TableField(exist = false)
98
     private String mainImg;
98
     private String mainImg;
99
-    
99
+
100
     @TableField(exist = false)
100
     @TableField(exist = false)
101
     private Integer activityStatus;
101
     private Integer activityStatus;
102
-    
102
+
103
     @TableField(exist = false)
103
     @TableField(exist = false)
104
     private LocalDateTime endDate;
104
     private LocalDateTime endDate;
105
-    
105
+
106
     @TableField(exist = false)
106
     @TableField(exist = false)
107
     private Integer id;
107
     private Integer id;
108
-    
108
+
109
     /**
109
     /**
110
      * 是否发起者
110
      * 是否发起者
111
      */
111
      */

+ 2
- 1
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java View File

68
             "/webjars/springfox-swagger-ui",
68
             "/webjars/springfox-swagger-ui",
69
             "/webjars/springfox-swagger-ui/css/typography.css",
69
             "/webjars/springfox-swagger-ui/css/typography.css",
70
             "/clean/menurole",
70
             "/clean/menurole",
71
-            "/clean/buttonrole"
71
+            "/clean/buttonrole",
72
+            "/api/admin/taPersonFromRecord"
72
     };
73
     };
73
 
74
 
74
     /*
75
     /*

+ 1
- 1
src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java View File

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

+ 0
- 6
src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java View File

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