8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 11:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

版本列表增加排序

Browse Source
This commit is contained in:
zengqiao
2022-08-31 17:14:56 +08:00
parent 7be462599f
commit f005c6bc44
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/ClusterPhyService.java
View File

@@ -73,5 +73,5 @@ public interface ClusterPhyService {
* 获取系统已存在的kafka版本列表 * 获取系统已存在的kafka版本列表
* @return * @return
*/ */
Set<String> getClusterVersionSet(); List<String> getClusterVersionList();
} }

14
km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/impl/ClusterPhyServiceImpl.java
View File

@@ -24,8 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -205,9 +206,12 @@ public class ClusterPhyServiceImpl implements ClusterPhyService {
} }
@Override @Override
public Set<String> getClusterVersionSet() { public List<String> getClusterVersionList() {
List<ClusterPhy> clusterPhyList = listAllClusters(); List<ClusterPhy> clusterPhyList = this.listAllClusters();
Set<String> versionSet = clusterPhyList.stream().map(elem -> elem.getKafkaVersion()).collect(Collectors.toSet());
return versionSet; List<String> versionList = new ArrayList<>(clusterPhyList.stream().map(elem -> elem.getKafkaVersion()).collect(Collectors.toSet()));
Collections.sort(versionList);
return versionList;
} }
} }

6
km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/MultiClusterPhyController.java
View File

@@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Set; import java.util.List;
/** /**
@@ -49,7 +49,7 @@ public class MultiClusterPhyController {
@ApiOperation(value = "多物理集群-已存在kafka版本", notes = "") @ApiOperation(value = "多物理集群-已存在kafka版本", notes = "")
@GetMapping(value = "physical-clusters/exist-version") @GetMapping(value = "physical-clusters/exist-version")
public Result<Set<String>> getClusterPhysVersion() { public Result<List<String>> getClusterPhysVersion() {
return Result.buildSuc(clusterPhyService.getClusterVersionSet()); return Result.buildSuc(clusterPhyService.getClusterVersionList());
} }
} }