From 1c76df184b6566f809406da10335fa3cb4e9ed3a Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Sun, 29 Sep 2024 14:59:42 +0800 Subject: [PATCH] clear test --- .../com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java | 2 +- .../src/main/java/com/ruoyi/platform/utils/ConvertUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index dc07f176..477e7ccb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -188,7 +188,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { //部分信息在前面的版本里面,从那边取过来 Map stringObjectMap = YamlUtils.loadYamlFile(localPath + "/" + "dataset.yaml"); - NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject2(stringObjectMap, NewDatasetVo.class); + NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class); //检查是否存在本地重名分支,有的话干掉 dvcUtils.deleteLocalBranch(localPath, branchName); // 创建本地分支 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java index 0a4936bb..a4195a17 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java @@ -113,7 +113,7 @@ public class ConvertUtil { if (propertyType.isAssignableFrom(LinkedHashMap.class)) { // 如果属性类型是 HashMap,则递归转换 Map mapValue = (Map) value; - Object convertedValue = convertMapToObject(mapValue, propertyType); + Object convertedValue = convertMapToObject2(mapValue, propertyType); PropertyUtils.setProperty(targetObject, camelCaseKey, convertedValue); } else if (!(value instanceof LinkedHashMap)) { PropertyUtils.setProperty(targetObject, camelCaseKey, value);