fix: 修复同步bug

shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java

@@ -58,22 +58,22 @@ public class AttDpdsBase extends BaseEntity
     /** 出险数量 */
     @Excel(name = "出险数量")
     @ApiModelProperty("出险数量")
-    private String dangNum;
+    private Integer dangNum;
 
     /** $column.columnComment */
     @Excel(name = "出险数量")
     @ApiModelProperty("出险数量")
-    private String dpdsStarNum;
+    private Integer dpdsStarNum;
 
     /** 桩号 */
     @Excel(name = "桩号")
     @ApiModelProperty("桩号")
-    private String dpdsEndNum;
+    private Integer dpdsEndNum;
 
     /** 长度 */
     @Excel(name = "长度")
     @ApiModelProperty("长度")
-    private String dpdsLen;
+    private Integer dpdsLen;
 
     /** $column.columnComment */
     @Excel(name = "长度")

shuili-system/src/main/java/com/kms/yxgh/common/controller/JobController.java

@@ -20,7 +20,7 @@ public class JobController {
     /**
      * 同步基础数据
      */
-    @GetMapping("/")
+    @GetMapping("/base")
     public void syncBasicData() {
         CompletableFuture.runAsync(dataSyncJob::run);
     }

shuili-system/src/main/java/com/kms/yxgh/common/job/DataSyncJob.java

@@ -22,9 +22,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -66,12 +64,8 @@ public class DataSyncJob {
             for (RelCacheEnum relCacheEnum : RelCacheEnum.values()) {
                 relCache(relCacheEnum);
             }
-            List<Future<Void>> allFuture = new ArrayList<>();
             for (DataSyncBasicEnum dataSyncStatusEnum : DataSyncBasicEnum.values()) {
-                allFuture.add(CompletableFuture.runAsync(() -> syncData(dataSyncStatusEnum), syncDataPool));
+                syncData(dataSyncStatusEnum);
-            }
-            if (!allFuture.isEmpty()) {
-                CompletableFuture.allOf(allFuture.toArray(new CompletableFuture[0])).join();
             }
         }
     }
@@ -244,6 +238,11 @@ public class DataSyncJob {
         }
     }
 
+    public static void main(String[] args) {
+        String a = "";
+        System.out.printf("" + Optional.ofNullable(a).filter(StringUtils::isNotBlank).map(Integer::valueOf).orElse(2));
+    }
+
     private BigDecimal convertToBigDecimal(JSONObject obj, String fieldName) {
         try {
             return StringUtils.isNotBlank(obj.getString(fieldName)) ? new BigDecimal(obj.getString(fieldName)) : new BigDecimal(0);