Эх сурвалжийг харах

feat: 添加车辆类型特种车处理,修改任务执行时间

weijianghai 1 жил өмнө
parent
commit
9b37bb38bc

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarBaoXianJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 2 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarBaoXianSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarDaWeiXiuJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 4 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarDaWeiXiuSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarLuQiaoJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 6 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarLuQiaoSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarNianJianFeiJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 8 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarNianJianFeiSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarQiTaJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 10 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarQiTaSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarRanYouJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 12 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarRanYouSourcePath());

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

@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -54,7 +55,7 @@ public class CarWeiXiuJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 14 23 1 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCarWeiXiuSourcePath());

+ 2 - 2
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/ClbfJob.java

@@ -63,7 +63,7 @@ public class ClbfJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 0 23 1 * ?")
+    @Scheduled(cron = "0 52 23 1 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getClbfSourcePath());
@@ -159,7 +159,7 @@ public class ClbfJob {
                         case NUMERIC:
                             if (DateUtil.isCellDateFormatted(cell)) {
                                 cellValue = DateUtil.getLocalDateTime(cell.getNumericCellValue())
-                                        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"));
+                                        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                                 break;
                             }
                             cellValue = String.valueOf(cell.getNumericCellValue());

+ 5 - 2
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/CljbxxJob.java

@@ -68,7 +68,7 @@ public class CljbxxJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 30 23 * * ?")
+    @Scheduled(cron = "0 56 23 * * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getCljbxxSourcePath());
@@ -167,7 +167,7 @@ public class CljbxxJob {
                         case NUMERIC:
                             if (DateUtil.isCellDateFormatted(cell)) {
                                 cellValue = DateUtil.getLocalDateTime(cell.getNumericCellValue())
-                                        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"));
+                                        .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                                 break;
                             }
                             cellValue = String.valueOf(cell.getNumericCellValue());
@@ -269,6 +269,9 @@ public class CljbxxJob {
                 }
             }
             map.put("che_ling", cheLing);
+            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());
         }
         // 去重

+ 4 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/XslcytjJob.java

@@ -65,7 +65,7 @@ public class XslcytjJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 54 23 1 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getXslcytjSourcePath());
@@ -255,6 +255,9 @@ public class XslcytjJob {
             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());
         }
         // 去重

+ 4 - 1
src/main/java/com/nokia/finance/tasks/jobs/car/ruixing/YjbjrtjJob.java

@@ -63,7 +63,7 @@ public class YjbjrtjJob {
     /**
      * 执行任务
      */
-    @Scheduled(cron = "0 55 23 * * ?")
+    @Scheduled(cron = "0 58 23 * * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getYjbjrtjSourcePath());
@@ -239,6 +239,9 @@ public class YjbjrtjJob {
             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());
         }
         // 去重

+ 2 - 1
src/main/java/com/nokia/finance/tasks/jobs/house/chengben/HouseBuildingRepairMonthJob.java

@@ -8,6 +8,7 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -42,7 +43,7 @@ public class HouseBuildingRepairMonthJob {
     /**
      * 执行任务
      */
-//    @Scheduled(cron = "0 35 23 1 * ?")
+    @Scheduled(cron = "0 0 23 12 * ?")
     public void runJob() {
         // 数据目录
         Path dir = Paths.get(jobConfig.getHouseBuildingRepairMonthSourcePath());

+ 13 - 0
src/main/java/com/nokia/finance/tasks/service/car/CarService.java

@@ -121,6 +121,19 @@ public class CarService {
         return "省公司本部";
     }
 
+    /**
+     * 获取车辆类型
+     */
+    public String getCheLiangLeiXing(String cheLiangLeiXing) {
+        if (!StringUtils.hasText(cheLiangLeiXing)) {
+            return "";
+        }
+        if (cheLiangLeiXing.contains("特种车")) {
+            return "特种车";
+        }
+        return cheLiangLeiXing;
+    }
+
     /**
      * 获取而二级单位
      * @param unit 单位