suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 只保留一个OrgDimensionType (#643)

This commit is contained in:
PengyuDeng 2025-06-10 19:17:26 +08:00 committed by GitHub
parent 50b2ca9b44
commit 2e1907b74d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java
View File

@ -1,37 +0,0 @@
/*
* Copyright 2025 JetLinks https://www.jetlinks.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetlinks.community.auth.dimension;
import lombok.AllArgsConstructor;
import lombok.Generated;
import lombok.Getter;
import org.hswebframework.web.authorization.DimensionType;
/**
* @author wangzheng
* @since 1.0
*/
@AllArgsConstructor
@Getter
@Generated
public enum OrgDimensionType implements DimensionType {
org("org","组织"),
parentOrg("parentOrg","上级组织");
private final String id;
private final String name;
}

1
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java
View File

@ -25,6 +25,7 @@ import org.hswebframework.web.system.authorization.defaults.service.DefaultDimen
import org.hswebframework.web.system.authorization.defaults.service.terms.DimensionTerm;
import org.jetlinks.community.auth.entity.OrganizationEntity;
import org.jetlinks.community.auth.service.OrganizationService;
import org.jetlinks.community.authorize.OrgDimensionType;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;

2
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java
View File

@ -31,7 +31,7 @@ import org.hswebframework.web.crud.generator.Generators;
import org.hswebframework.web.validator.CreateGroup;
import org.jetlinks.community.PropertyConstants;
import org.jetlinks.community.auth.constants.AuthConstants;
import org.jetlinks.community.auth.dimension.OrgDimensionType;
import org.jetlinks.community.authorize.OrgDimensionType;
import org.jetlinks.core.things.ThingInfo;
import javax.persistence.Column;

2
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java
View File

@ -28,7 +28,7 @@ import org.hswebframework.web.authorization.DefaultDimensionType;
import org.hswebframework.web.authorization.Dimension;
import org.hswebframework.web.bean.FastBeanCopier;
import org.hswebframework.web.system.authorization.api.entity.UserEntity;
import org.jetlinks.community.auth.dimension.OrgDimensionType;
import org.jetlinks.community.authorize.OrgDimensionType;
import org.jetlinks.community.auth.enums.*;
import org.jetlinks.community.auth.service.info.UserLoginInfo;
import org.jetlinks.reactor.ql.utils.CastUtils;

2
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java
View File

@ -21,7 +21,7 @@ import org.hswebframework.ezorm.rdb.operator.builder.fragments.BatchSqlFragments
import org.hswebframework.ezorm.rdb.operator.builder.fragments.SqlFragments;
import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.AbstractTermFragmentBuilder;
import org.hswebframework.ezorm.rdb.utils.SqlUtils;
import org.jetlinks.community.auth.dimension.OrgDimensionType;
import org.jetlinks.community.authorize.OrgDimensionType;
import org.springframework.stereotype.Component;
import java.util.List;

1
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/utils/DimensionUserBindUtils.java
View File

@ -20,6 +20,7 @@ import org.hswebframework.ezorm.rdb.mapping.ReactiveDelete;
import org.hswebframework.web.authorization.DefaultDimensionType;
import org.hswebframework.web.system.authorization.api.entity.DimensionUserEntity;
import org.hswebframework.web.system.authorization.defaults.service.DefaultDimensionUserService;
import org.jetlinks.community.authorize.OrgDimensionType;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;