feature(web): 增加flink job id和alias输入框的联动

This commit is contained in:
2023-12-01 15:47:09 +08:00
parent 7d6a4e2cce
commit a78ed8520d
8 changed files with 125 additions and 42 deletions

View File

@@ -8,9 +8,8 @@ import com.eshore.odcp.hudi.connector.entity.SyncState;
import com.eshore.odcp.hudi.connector.entity.TableMeta;
import com.eshore.odcp.hudi.connector.utils.NameHelper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.lanyuanxiaoyao.service.configuration.ExecutorProvider;
import com.lanyuanxiaoyao.service.configuration.entity.Item;
import com.lanyuanxiaoyao.service.configuration.entity.PageResponse;
import com.lanyuanxiaoyao.service.configuration.entity.info.CompactionMetrics;
import com.lanyuanxiaoyao.service.configuration.entity.info.JobIdAndAlias;
@@ -24,9 +23,7 @@ import com.lanyuanxiaoyao.service.web.entity.CompactionMetricsVO;
import com.lanyuanxiaoyao.service.web.entity.FlinkJobVO;
import com.lanyuanxiaoyao.service.web.entity.SyncStateVO;
import com.lanyuanxiaoyao.service.web.entity.TableVO;
import java.time.Duration;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -197,42 +194,30 @@ public class TableController extends BaseController {
@SuppressWarnings("DataFlowIssue")
@GetMapping("all_flink_job_id")
public AmisCrudResponse allFlinkJobId(
@RequestParam(value = "key", required = false) String key,
@RequestParam(value = "alias", required = false) String alias
) {
if (StrUtil.isBlank(key)) {
return AmisResponse.responseCrudData(Lists.immutable.empty());
}
public AmisResponse<ImmutableList<Item>> allFlinkJobId(@RequestParam(value = "alias", required = false) String alias) {
if (StrUtil.isBlank(alias)) {
return AmisResponse.responseCrudData(infoService.allFlinkJobId(key).collect(Objects::toString));
return AmisResponse.responseSuccess(infoService.allFlinkJobId().collect(Item::new));
} else {
return AmisResponse.responseCrudData(infoService.allFlinkJobId(key, alias).collect(Objects::toString));
return AmisResponse.responseSuccess(infoService.allFlinkJobIdByAlias(alias).collect(Item::new));
}
}
@SuppressWarnings("DataFlowIssue")
@GetMapping("all_alias")
public AmisCrudResponse allAlias(
@RequestParam(value = "key", required = false) String key,
@RequestParam(value = "flink_job_id", required = false) String flinkJobId
) {
if (StrUtil.isBlank(key) && StrUtil.isBlank(flinkJobId)) {
return AmisResponse.responseCrudData(Lists.immutable.empty());
}
public AmisResponse<ImmutableList<Item>> allAlias(@RequestParam(value = "flink_job_id", required = false) String flinkJobId) {
if (StrUtil.isBlank(flinkJobId)) {
return AmisResponse.responseCrudData(infoService.allAlias(key));
return AmisResponse.responseSuccess(infoService.allAlias().collect(Item::new));
} else {
return AmisResponse.responseCrudData(infoService.allAlias(key, flinkJobId));
return AmisResponse.responseSuccess(infoService.allAliasByFlinkJobId(flinkJobId).collect(Item::new));
}
}
@SuppressWarnings("DataFlowIssue")
@GetMapping("all_hdfs")
public AmisCrudResponse allHdfs(@RequestParam(value = "key", required = false) String key) {
public AmisResponse<ImmutableList<Item>> allHdfs(@RequestParam(value = "key", required = false) String key) {
if (StrUtil.isBlank(key)) {
return AmisResponse.responseCrudData(Lists.immutable.empty());
return AmisResponse.responseSuccess(infoService.allHdfs().collect(Item::new));
}
return AmisResponse.responseCrudData(infoService.allHdfs(key));
return AmisResponse.responseSuccess(infoService.allHdfs(key).collect(Item::new));
}
}