optimize-same-web-code (DataLinkDC#2393)

zenggl · Oct 17, 2023 · cd7470a · cd7470a
1 parent dc81815
commit cd7470a
Show file tree

Hide file tree

Showing 11 changed files with 711 additions and 673 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/JobDataDto.java b/dinky-admin/src/main/java/org/dinky/data/dto/JobDataDto.java
@@ -33,6 +33,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import cn.hutool.core.lang.Opt;
 import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -115,17 +116,19 @@ public JobHistory toJobHistory() {
     }
 
     public static JobDataDto fromJobHistory(JobHistory jobHistory) {
-        return JobDataDto.builder()
-                .id(jobHistory.getId())
-                .tenantId(jobHistory.getTenantId())
-                .job(jobHistory.getJobJson())
-                .exceptions(jobHistory.getExceptionsJson())
-                .checkpoints(jobHistory.getCheckpointsJson())
-                .checkpointsConfig(jobHistory.getCheckpointsConfigJson())
-                .config(jobHistory.getConfigJson())
-                .jar(JsonUtils.parseToJsonNode(jobHistory.getJarJson()))
-                .cluster(jobHistory.getClusterJson())
-                .clusterConfiguration(jobHistory.getClusterConfigurationJson())
-                .build();
+        return Opt.ofNullable(jobHistory)
+                .map(x -> JobDataDto.builder()
+                        .id(jobHistory.getId())
+                        .tenantId(jobHistory.getTenantId())
+                        .job(jobHistory.getJobJson())
+                        .exceptions(jobHistory.getExceptionsJson())
+                        .checkpoints(jobHistory.getCheckpointsJson())
+                        .checkpointsConfig(jobHistory.getCheckpointsConfigJson())
+                        .config(jobHistory.getConfigJson())
+                        .jar(JsonUtils.parseToJsonNode(jobHistory.getJarJson()))
+                        .cluster(jobHistory.getClusterJson())
+                        .clusterConfiguration(jobHistory.getClusterConfigurationJson())
+                        .build())
+                .orElse(null);
     }
 }