Browse Source

clear test

dev-lhz
fanshuai 1 year ago
parent
commit
1c76df184b
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
  2. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -188,7 +188,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {

//部分信息在前面的版本里面,从那边取过来
Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPath + "/" + "dataset.yaml");
NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject2(stringObjectMap, NewDatasetVo.class);
NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class);
//检查是否存在本地重名分支,有的话干掉
dvcUtils.deleteLocalBranch(localPath, branchName);
// 创建本地分支


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/ConvertUtil.java View File

@@ -113,7 +113,7 @@ public class ConvertUtil {
if (propertyType.isAssignableFrom(LinkedHashMap.class)) {
// 如果属性类型是 HashMap,则递归转换
Map<String, Object> mapValue = (Map<String, Object>) 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);


Loading…
Cancel
Save