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

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

@@ -986,34 +986,42 @@ public class ModelsServiceImpl implements ModelsService {
             String meta = modelDependency1Dao.getMeta(identifier, owner, (String) branch.get("name"));
             if (StringUtils.isNotEmpty(meta)) {
                 ModelMetaVo modelMetaVo = JSON.parseObject(meta, ModelMetaVo.class);
-                if (modelMetaVo.getParams() != null) {
-                    HashMap<String, Object> params = modelMetaVo.getParams();
-                    branch.put("params", params);
+                if (Constant.Source_Add.equals(modelMetaVo.getModelSource())) {
+                    branch.put("params", null);
+                    branch.put("params_names", new ArrayList<>());
+                    branch.put("metrics", null);
+                    branch.put("metrics_names", new ArrayList<>());
+                } else {
+                    if (modelMetaVo.getParams() != null) {
+                        HashMap<String, Object> params = modelMetaVo.getParams();
+                        branch.put("params", params);
 
-                    ArrayList<String> params_names = new ArrayList<>();
-                    for (String key : params.keySet()) {
-                        params_names.add(key);
-                    }
-                    branch.put("params_names", params_names);
-                }
-                if (modelMetaVo.getMetrics() != null) {
-                    HashMap<String, Object> metrics = modelMetaVo.getMetrics();
-                    if (Constant.Type_Train.equals(type)) {
-                        Map<String, Object> trainMetrics = (Map<String, Object>) metrics.get(Constant.Type_Train);
-                        ArrayList<String> metrics_names = new ArrayList<>();
-                        for (String key : trainMetrics.keySet()) {
-                            metrics_names.add(key);
+                        ArrayList<String> params_names = new ArrayList<>();
+                        for (String key : params.keySet()) {
+                            params_names.add(key);
                         }
-                        branch.put("metrics_names", metrics_names);
-                        branch.put("metrics",trainMetrics);
-                    } else {
-                        Map<String, Object> evaluateMetrics = (Map<String, Object>) metrics.get(Constant.Type_Evaluate);
-                        ArrayList<String> metrics_names = new ArrayList<>();
-                        for (String key : evaluateMetrics.keySet()) {
-                            metrics_names.add(key);
+                        branch.put("params_names", params_names);
+                    }
+                    if (modelMetaVo.getMetrics() != null) {
+                        HashMap<String, Object> metrics = modelMetaVo.getMetrics();
+                        if (Constant.Type_Train.equals(type)) {
+                            Map<String, Object> trainMetrics = (Map<String, Object>) metrics.get(Constant.Type_Train);
+                            branch.put("metrics", trainMetrics);
+
+                            ArrayList<String> metrics_names = new ArrayList<>();
+                            for (String key : trainMetrics.keySet()) {
+                                metrics_names.add(key);
+                            }
+                            branch.put("metrics_names", metrics_names);
+                        } else {
+                            Map<String, Object> evaluateMetrics = (Map<String, Object>) metrics.get(Constant.Type_Evaluate);
+                            ArrayList<String> metrics_names = new ArrayList<>();
+                            for (String key : evaluateMetrics.keySet()) {
+                                metrics_names.add(key);
+                            }
+                            branch.put("metrics_names", metrics_names);
+                            branch.put("metrics", evaluateMetrics);
                         }
-                        branch.put("metrics_names", metrics_names);
-                        branch.put("metrics",evaluateMetrics);
                     }
                 }
             }