Kaynağa Gözat

feat: 修改任务执行时间

weijianghai 1 yıl önce
ebeveyn
işleme
54496b60ac

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarBaoXianJob.java

@@ -57,7 +57,7 @@ public class CarBaoXianJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 10 6 12 * ?")
+    @Scheduled(cron = "0 10 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarBaoXianSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarDaWeiXiuJob.java

@@ -57,7 +57,7 @@ public class CarDaWeiXiuJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 12 6 12 * ?")
+    @Scheduled(cron = "0 12 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarDaWeiXiuSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarLuQiaoJob.java

@@ -57,7 +57,7 @@ public class CarLuQiaoJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 14 6 12 * ?")
+    @Scheduled(cron = "0 14 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarLuQiaoSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarNianJianFeiJob.java

@@ -57,7 +57,7 @@ public class CarNianJianFeiJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 16 6 12 * ?")
+    @Scheduled(cron = "0 16 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarNianJianFeiSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarQiTaJob.java

@@ -57,7 +57,7 @@ public class CarQiTaJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 18 6 12 * ?")
+    @Scheduled(cron = "0 18 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarQiTaSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarRanYouJob.java

@@ -57,7 +57,7 @@ public class CarRanYouJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 20 6 12 * ?")
+    @Scheduled(cron = "0 20 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarRanYouSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/chengben/CarWeiXiuJob.java

@@ -57,7 +57,7 @@ public class CarWeiXiuJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 22 6 12 * ?")
+    @Scheduled(cron = "0 22 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarWeiXiuSourcePath());

+ 0 - 3
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/CarLiChengMonthJob.java

@@ -266,9 +266,6 @@ public class CarLiChengMonthJob {
             if ("1".equals(baoFei)) {
                 map.put("che_pai_hao", rawChePaiHao);
             }
-            String cheLiangLeiXing = map.get("che_liang_lei_xing");
-            cheLiangLeiXing = carService.getCheLiangLeiXing(cheLiangLeiXing);
-            map.put("che_liang_lei_xing", cheLiangLeiXing);
             map.put("source", path.getFileName().toString());
         }
         // 去重

+ 0 - 3
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/CarYueJieJob.java

@@ -253,9 +253,6 @@ public class CarYueJieJob {
             map.put("district", district);
             String baoFei = carService.baoFei(rawChePaiHao);
             map.put("bao_fei", baoFei);
-            String cheLiangLeiXing = map.get("che_liang_lei_xing");
-            cheLiangLeiXing = carService.getCheLiangLeiXing(cheLiangLeiXing);
-            map.put("che_liang_lei_xing", cheLiangLeiXing);
             map.put("source", path.getFileName().toString());
         }
         // 去重

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/shujucangku/CarFeeBsJob.java

@@ -43,7 +43,7 @@ public class CarFeeBsJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 28 6 12 * ?")
+    @Scheduled(cron = "0 28 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarFeeBsSourcePath());

+ 1 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/shujucangku/CarFeeHbJob.java

@@ -43,7 +43,7 @@ public class CarFeeHbJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 26 6 12 * ?")
+    @Scheduled(cron = "0 26 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarFeeHbSourcePath());

+ 23 - 5
src/main/java/com/nokia/finance/tasks/jobs/house/chengben/HouseBuildingRepairMonthJob.java

@@ -3,6 +3,8 @@ package com.nokia.finance.tasks.jobs.house.chengben;
 import com.nokia.finance.tasks.common.exception.MyRuntimeException;
 import com.nokia.finance.tasks.common.utils.psql.PsqlUtil;
 import com.nokia.finance.tasks.config.JobConfig;
+import com.nokia.finance.tasks.dao.gdc.house.HouseGdcProcedureDao;
+import com.nokia.finance.tasks.dao.house.HouseProcedureDao;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
@@ -37,15 +39,20 @@ import java.util.stream.Stream;
 @Service
 public class HouseBuildingRepairMonthJob {
     private final JobConfig jobConfig;
+    private final HouseProcedureDao houseProcedureDao;
+    private final HouseGdcProcedureDao houseGdcProcedureDao;
 
-    public HouseBuildingRepairMonthJob(JobConfig jobConfig) {
+    public HouseBuildingRepairMonthJob(JobConfig jobConfig, HouseProcedureDao houseProcedureDao,
+                                       HouseGdcProcedureDao houseGdcProcedureDao) {
         this.jobConfig = jobConfig;
+        this.houseProcedureDao = houseProcedureDao;
+        this.houseGdcProcedureDao = houseGdcProcedureDao;
     }
 
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 24 6 12 * ?")
+    @Scheduled(cron = "0 24 6 9 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getHouseBuildingRepairMonthSourcePath());
@@ -84,6 +91,7 @@ public class HouseBuildingRepairMonthJob {
         Path csvPath = toCsv(path, distinctList);
         copyCsv(csvPath);
         move(path);
+        procedure();
     }
 
     /**
@@ -199,10 +207,20 @@ public class HouseBuildingRepairMonthJob {
      * @param path 源文件路径
      */
     public void move(Path path) throws Exception {
-        Files.move(Paths.get(path + ".MD5"),
-                Paths.get(jobConfig.getHouseBuildingRepairMonthHistoryPath(), path.getFileName().toString() + ".MD5"),
-                StandardCopyOption.REPLACE_EXISTING);
+        if (Files.exists(Paths.get(path + ".MD5"))) {
+            Files.move(Paths.get(path + ".MD5"),
+                    Paths.get(jobConfig.getHouseBuildingRepairMonthHistoryPath(), path.getFileName().toString() + ".MD5"),
+                    StandardCopyOption.REPLACE_EXISTING);
+        }
         Files.move(path, Paths.get(jobConfig.getHouseBuildingRepairMonthHistoryPath(), path.getFileName().toString()),
                 StandardCopyOption.REPLACE_EXISTING);
     }
+
+    /**
+     * 更新表
+     */
+    public void procedure() {
+        log.info("update house.building_month");
+        houseProcedureDao.updateBuildingRepairMonth();
+    }
 }