版本列表增加排序

Author: zengqiao

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

@@ -73,5 +73,5 @@ void modifyClusterPhyById(ClusterPhyPO clusterPhyPO, String operator) throws
      * 获取系统已存在的kafka版本列表
      * @return
      */
-    Set<String> getClusterVersionSet();
+    List<String> getClusterVersionList();
 }

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

@@ -24,8 +24,9 @@
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -205,9 +206,12 @@ public void modifyClusterPhyById(ClusterPhyPO clusterPhyPO, String operator) thr
     }
 
     @Override
-    public Set<String> getClusterVersionSet() {
-        List<ClusterPhy> clusterPhyList = listAllClusters();
-        Set<String> versionSet = clusterPhyList.stream().map(elem -> elem.getKafkaVersion()).collect(Collectors.toSet());
-        return versionSet;
+    public List<String> getClusterVersionList() {
+        List<ClusterPhy> clusterPhyList = this.listAllClusters();
+
+        List<String> versionList = new ArrayList<>(clusterPhyList.stream().map(elem -> elem.getKafkaVersion()).collect(Collectors.toSet()));
+        Collections.sort(versionList);
+
+        return versionList;
     }
 }

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

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