Merge remote-tracking branch 'origin/dev-czh' into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -995,15 +995,27 @@ public class ModelsServiceImpl implements ModelsService {
 
                 if (map != null) {
                     List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
-                    if (topics != null && topics.size() > 0 && modelTopic.equals(topics.get(1).get("name"))) {
-                        String modeltag = (String) topics.get(2).get("name");
-                        String modeltype = (String) topics.get(3).get("name");
-                        modeltag = modeltag.substring("modeltag-".length());
-                        modeltype = modeltype.substring("modeltype-".length());
-                        if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modeltag)) {
+                    String modelTopicName = null;
+                    String modelTag = null;
+                    String modelType = null;
+                    for (Map<String, Object> topic : topics) {
+                        String topicName = (String) topic.get("name");
+                        if (modelTopic.equals(topicName)) {
+                            modelTopicName = (String) topic.get("name");
+                        }
+                        if (topicName.startsWith("modeltag-")) {
+                            modelTag = topicName.substring("modeltag-".length());
+                        }
+                        if (topicName.startsWith("modeltype-")) {
+                            modelType = topicName.substring("modeltype-".length());
+                        }
+                    }
+
+                    if (modelTopicName != null) {
+                        if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modelTag)) {
                             continue;
                         }
-                        if (StringUtils.isNotEmpty(modelTypeName) && !modelTypeName.toLowerCase().equals(modeltype)) {
+                        if (StringUtils.isNotEmpty(modelTypeName) && !modelTypeName.toLowerCase().equals(modelType)) {
                             continue;
                         }
                         newModelVo.setModelTag(modelTagName);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -132,7 +132,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         datasetVo.setIdentifier(repositoryName);
         datasetVo.setId(gitlinIid);
         datasetVo.setOwner((String) userInfo.get("login"));
-        datasetVo.setRelativePaths(relatePath+"/dataset");
+        datasetVo.setRelativePaths(relatePath + "/dataset");
 
         addDatasetSourceToDataVo(datasetVo);
 
@@ -211,7 +211,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         datasetVo.setDescription(newDatasetVo.getDescription());
         datasetVo.setDataTag(newDatasetVo.getDataTag());
         datasetVo.setDataType(newDatasetVo.getDataType());
-        datasetVo.setRelativePaths(relatePath+"/dataset");
+        datasetVo.setRelativePaths(relatePath + "/dataset");
 
         addDatasetSourceToDataVo(datasetVo);
 
@@ -447,15 +447,27 @@ public class NewDatasetServiceImpl implements NewDatasetService {
 
                 if (map != null) {
                     List<Map<String, Object>> topics = (List<Map<String, Object>>) map.get("topics");
-                    if (topics != null && topics.size() > 0 && datasetTopic.equals(topics.get(1).get("name"))) {
-                        String datasettag = (String) topics.get(2).get("name");
-                        String datasetype = (String) topics.get(3).get("name");
-                        datasettag = datasettag.substring("datatag-".length());
-                        datasetype = datasetype.substring("datatype-".length());
-                        if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasettag)) {
+                    String datasetTopicName = null;
+                    String datasetTag = null;
+                    String datasetType = null;
+                    for (Map<String, Object> topic : topics) {
+                        String topicName = (String) topic.get("name");
+                        if (datasetTopic.equals(topicName)) {
+                            datasetTopicName = (String) topic.get("name");
+                        }
+                        if (topicName.startsWith("datatag-")) {
+                            datasetTag = topicName.substring("datatag-".length());
+                        }
+                        if (topicName.startsWith("datatype-")) {
+                            datasetType = topicName.substring("datatype-".length());
+                        }
+                    }
+
+                    if (datasetTopicName != null) {
+                        if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasetTag)) {
                             continue;
                         }
-                        if (StringUtils.isNotEmpty(datasetTypeName) && !datasetTypeName.toLowerCase().equals(datasetype)) {
+                        if (StringUtils.isNotEmpty(datasetTypeName) && !datasetTypeName.toLowerCase().equals(datasetType)) {
                             continue;
                         }
                         newDatasetVo.setDataTag(datasetTagName);