lilonglong/magic-api-gitee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复无法上传单个分组的问题

Browse Source
This commit is contained in:
mxd 2022-03-05 22:08:09 +08:00
parent 3b417228f8
commit 8e00c3d382
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicResourceService.java
View File

@ -239,7 +239,7 @@ public class DefaultMagicResourceService implements MagicResourceService, JsonCo
groupResource.mkdir();
} else {
Group oldGroup = groupCache.get(group.getId());
if(storage.requirePath() && !Objects.equals(oldGroup.getPath(), group.getPath())){
if (storage.requirePath() && !Objects.equals(oldGroup.getPath(), group.getPath())) {
TreeNode<Group> treeNode = tree(group.getType());
String oldPath = oldGroup.getPath();
oldGroup.setPath(group.getPath());
@ -740,7 +740,15 @@ public class DefaultMagicResourceService implements MagicResourceService, JsonCo
}
private void readAllResource(Resource root, Set<Group> groups, Set<MagicEntity> entities, boolean checked) {
readAllResource(root, null, groups, entities, null, "/", checked);
Resource resource = root.getResource(Constants.GROUP_METABASE);
MagicResourceStorage<? extends MagicEntity> storage = null;
if (resource.exists()) {
Group group = JsonUtils.readValue(resource.read(), Group.class);
group.setType(mappingV1Type(group.getType()));
storage = storages.get(group.getType());
notNull(storage, NOT_SUPPORTED_GROUP_TYPE);
}
readAllResource(root, storage, groups, entities, null, "/", checked);
}
private void readAllResource(Resource root, MagicResourceStorage<? extends MagicEntity> storage, Set<Group> groups, Set<MagicEntity> entities, Set<String> mappingKeys, String path, boolean checked) {