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

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

@@ -455,8 +455,6 @@ public class ExperimentServiceImpl implements ExperimentService {
      * 存储数据集元数据到临时表
      */
     private void insertDatasetTempStorage(Map<String, Object> datasetDependendcy, Map<String, Object> trainInfo, Integer experimentId, Integer experimentInsId, String experimentName) {
-        DatasetTempStorage datasetTempStorage = new DatasetTempStorage();
-
         Iterator<Map.Entry<String, Object>> dependendcyIterator = datasetDependendcy.entrySet().iterator();
         Map<String, Object> datasetExport = (Map<String, Object>) trainInfo.get("dataset_export");
         Map<String, Object> datasetPreprocess = (Map<String, Object>) trainInfo.get("general-data-process");
@@ -478,18 +476,25 @@ public class ExperimentServiceImpl implements ExperimentService {
             sourceParams.put("experiment_id", experimentId);
             sourceParams.put("train_name", sourceTaskId);
             sourceParams.put("preprocess_code", projectMap);
-            List<Map> datasets = (List<Map>) datasetPreprocessMap.get("datasets");
-            if (datasets != null) {
-                for (Map<String, Object> dataset : datasets) {
-                    datasetTempStorage.setName((String) dataset.get("dataset_identifier"));
-                    datasetTempStorage.setVersion((String) dataset.get("dataset_version"));
-                    datasetTempStorage.setSource(JacksonUtil.toJSONString(sourceParams));
-                    datasetTempStorage.setState(1);
-                    datasetTempStorageService.insert(datasetTempStorage);
-                }
-            }
 
+            if (target != null && target.size() > 0){
+                for (Map<String, Object> targetMap : target){
+                    String targetTaskId = (String)targetMap.get("task_id");
+                    Map<String, Object>  datasetExportMap =  (Map<String, Object>)datasetExport.get(targetTaskId);
+                    List<Map> datasets = (List<Map>) datasetExportMap.get("datasets");
+                    if (datasets != null) {
+                        for (Map<String, Object> dataset : datasets) {
+                            DatasetTempStorage datasetTempStorage = new DatasetTempStorage();
+                            datasetTempStorage.setName((String) dataset.get("dataset_identifier"));
+                            datasetTempStorage.setVersion((String) dataset.get("dataset_version"));
+                            datasetTempStorage.setSource(JacksonUtil.toJSONString(sourceParams));
+                            datasetTempStorage.setState(1);
+                            datasetTempStorageService.insert(datasetTempStorage);
+                        }
+                    }
 
+                }
+            }
         }
 
     }

ruoyi-modules/management-platform/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: management-platform
   profiles:
     # 环境配置
-    active: dev
+    active: dev1
   cloud:
     nacos:
       discovery: