lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-09 09:24:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化维度类型

Browse Source
This commit is contained in:
zhou-hao
2019-10-24 19:23:40 +08:00
parent 20f8a1e345
commit 22a091cfac
2 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultDimensionService.java
View File

@@ -44,7 +44,6 @@ public class DefaultDimensionService
return entity.getChildren();
}
@Override
public Flux<DimensionType> getAllType() {
return dimensionTypeRepository
@@ -55,13 +54,14 @@ public class DefaultDimensionService
@Override
public Flux<Dimension> getDimensionByUserId(String userId) {
return createQuery().fetch()
.map(DynamicDimensionType::of)
return getAllType()
.collect(Collectors.toMap(DimensionType::getId, Function.identity()))
.flatMapMany(typeGrouping -> dimensionUserRepository.createQuery()
.where(DimensionUserEntity::getUserId, userId)
.fetch()
.map(entity -> DynamicDimension.of(entity, typeGrouping.get(entity.getDimensionId()))));
.flatMapMany(typeGrouping ->
dimensionUserRepository
.createQuery()
.where(DimensionUserEntity::getUserId, userId)
.fetch()
.map(entity -> DynamicDimension.of(entity, typeGrouping.get(entity.getDimensionId()))));
}

28
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DynamicDimensionType.java
View File

@@ -1,28 +0,0 @@
package org.hswebframework.web.system.authorization.defaults.service;
import lombok.Getter;
import lombok.Setter;
import org.hswebframework.web.authorization.DimensionType;
import org.hswebframework.web.system.authorization.api.entity.DimensionEntity;
@Getter
@Setter
public class DynamicDimensionType implements DimensionType {
private String id;
private String name;
private String parentId;
private String describe;
public static DimensionType of(DimensionEntity e) {
DynamicDimensionType type = new DynamicDimensionType();
type.id = e.getId();
type.parentId = e.getParentId();
type.name = e.getName();
type.describe = e.getDescribe();
return type;
}
}