From 2e1907b74d13d73666f8431d52852d9429e6e8f8 Mon Sep 17 00:00:00 2001 From: PengyuDeng <89559616+PengyuDeng@users.noreply.github.com> Date: Tue, 10 Jun 2025 19:17:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8F=AA=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=80=E4=B8=AAOrgDimensionType=20(#643)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/dimension/OrgDimensionType.java | 37 ------------------- .../OrganizationDimensionProvider.java | 1 + .../auth/entity/OrganizationEntity.java | 2 +- .../community/auth/entity/UserDetail.java | 2 +- .../service/terms/OrgUserTermBuilder.java | 2 +- .../auth/utils/DimensionUserBindUtils.java | 1 + 6 files changed, 5 insertions(+), 40 deletions(-) delete mode 100755 jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java deleted file mode 100755 index 6f8c596e..00000000 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java +++ /dev/null @@ -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; - -} diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java index ad17d7f1..1ab78a2f 100644 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java @@ -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; diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java index 2c0307c6..9ea14f39 100644 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java @@ -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; diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java index 0aaf0368..c5608d15 100644 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java @@ -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; diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java index 53e67feb..e0624222 100644 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java @@ -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; diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/utils/DimensionUserBindUtils.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/utils/DimensionUserBindUtils.java index b1faa0e8..ae12c87d 100644 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/utils/DimensionUserBindUtils.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/utils/DimensionUserBindUtils.java @@ -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;