蓝云各项目经营分析、催款函、账龄表同步接口和定时任务

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -137,14 +137,6 @@ public class TimerController {
         return McR.success();
     }
 
-    /**
-     * 各项目点月度经营分析插入数据库
-     */
-    @GetMapping("insertAnalysisList")
-    public void insertAnalysisList(){
-        log.info("开始调用各项目分析报表插入数据库接口");
-        timerService.insertAnalysisList();
-    }
 
     /**
      * 项目点档案点编辑保存后，更新是否补充字段为是
@@ -204,22 +196,23 @@ public class TimerController {
     private FService fService;
 
     /**
-     * 蓝云, 全量同步账龄表
+     * 蓝云, 全量同步账龄表、催款函、各项目点月度经营分析插入数据库
      */
     @PostMapping("syncAgingSchedule")
-    public McR syncAgingSchedule() {
-        log.info("全量同步账龄表");
-        fService.syncAgingSchedule();
+    public McR syncAgingSchedule(@RequestBody Map data) {
+        log.info("传入参数：{}",data);
+        String type = data.get("type").toString();
+        if ("0".equals(type)){
+            log.info("开始同步账龄表");
+            fService.syncAgingSchedule();
+        } else if ("1".equals(type)) {
+            log.info("同步催款函");
+            fService.syncCallLetters();
+        } else if ("2".equals(type)) {
+            log.info("开始调用各项目分析报表插入数据库接口");
+            timerService.insertAnalysisList();
+        }
         return McR.success();
     }
 
-    /**
-     * 蓝云, 同步催款函
-     */
-    @PostMapping("syncCallLetters")
-    public McR syncCallLetters() {
-        log.info("同步催款函");
-        fService.syncCallLetters();
-        return McR.success();
-    }
 }

mjava-lanyun/src/main/java/com/malk/lanyun/schedule/ScheduleTask.java

@@ -1,5 +1,6 @@
 package com.malk.lanyun.schedule;
 
+import com.malk.lanyun.service.FService;
 import com.malk.lanyun.service.SyncAssetsService;
 import com.malk.lanyun.service.TimerService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +27,10 @@ public class ScheduleTask {
 
     @Autowired
     private SyncAssetsService syncAssetsService;
+
+    @Autowired
+    private FService fService;
+
     /**
      * 每月1日凌晨1点自动执行
      */
@@ -88,7 +93,7 @@ public class ScheduleTask {
     /**
      * 每月最后一天跑批离职人员
      */
-    @Scheduled(cron = "0 03 23 28-31 * ?")
+    @Scheduled(cron = "0 30 23 28-31 * ?")
     void SynDingLeaveOffice(){
         // 获取当前日期
         LocalDate today = LocalDate.now();
@@ -107,8 +112,8 @@ public class ScheduleTask {
      */
     @Scheduled(cron = "0 30 12 * * 5")
     public void projectUnshippedTask() {
-        timerService.projectUnshipped();
         log.info("项目点档案本周出库情况执行时间 :" + new Date());
+        timerService.projectUnshipped();
     }
 
     /**
@@ -118,4 +123,22 @@ public class ScheduleTask {
     void monthPersonnelTask(){
         timerService.monthPersonnelMatters();
     }
+    /**
+     * 每月10号上午9点同步催款函
+     */
+    @Scheduled(cron = "0 0 9 10 * ?")
+    void syncCallLettersTask(){
+        log.info("开始同步催款函");
+        fService.syncCallLetters();
+    }
+
+    /**
+     * 每天晚上22点全量同步账龄表
+     */
+    @Scheduled(cron = "0 0 22 * * ?")
+    void syncAgingTask(){
+        log.info("全量同步账龄表");
+        fService.syncAgingSchedule();
+    }
+
 }