⚡ 优化代码

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/PermissionActionRepository.java

@@ -31,9 +31,9 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
  * Created by support@topiam.cn on  2021/11/22 23:06
  */
 @Repository
-public interface AppPermissionActionRepository extends
+public interface PermissionActionRepository extends
-                                               LogicDeleteRepository<PermissionActionEntity, Long>,
+                                            LogicDeleteRepository<PermissionActionEntity, Long>,
-                                               QuerydslPredicateExecutor<PermissionActionEntity> {
+                                            QuerydslPredicateExecutor<PermissionActionEntity> {
     /**
      * findAllByResource
      *

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/PermissionPolicyRepository.java

@@ -36,9 +36,9 @@ import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOF
  * Created by support@topiam.cn on  2021/11/4 22:44
  */
 @Repository
-public interface AppPermissionPolicyRepository extends AppPermissionPolicyRepositoryCustomized,
+public interface PermissionPolicyRepository extends PermissionPolicyRepositoryCustomized,
-                                               LogicDeleteRepository<PermissionPolicyEntity, Long>,
+                                            LogicDeleteRepository<PermissionPolicyEntity, Long>,
-                                               QuerydslPredicateExecutor<PermissionPolicyEntity> {
+                                            QuerydslPredicateExecutor<PermissionPolicyEntity> {
     /**
      * 按主体 ID 删除所有
      *

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/PermissionPolicyRepositoryCustomized.java

@@ -27,7 +27,7 @@ import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
  * @author TopIAM
  * Created by support@topiam.cn on  2021/11/4 22:44
  */
-public interface AppPermissionPolicyRepositoryCustomized {
+public interface PermissionPolicyRepositoryCustomized {
     /**
      * 分页查询权限策略
      *

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/PermissionResourceRepository.java

@@ -37,9 +37,9 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
  * Created by support@topiam.cn on  2020-08-10
  */
 @Repository
-public interface AppPermissionResourceRepository extends
+public interface PermissionResourceRepository extends
-                                                 LogicDeleteRepository<PermissionResourceEntity, Long>,
+                                              LogicDeleteRepository<PermissionResourceEntity, Long>,
-                                                 QuerydslPredicateExecutor<PermissionResourceEntity> {
+                                              QuerydslPredicateExecutor<PermissionResourceEntity> {
 
     /**
      * findByIdContainsDeleted

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/PermissionRoleRepository.java

@@ -40,9 +40,8 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
  * Created by support@topiam.cn on  2020-08-10
  */
 @Repository
-public interface AppPermissionRoleRepository extends
+public interface PermissionRoleRepository extends LogicDeleteRepository<PermissionRoleEntity, Long>,
-                                             LogicDeleteRepository<PermissionRoleEntity, Long>,
+                                          QuerydslPredicateExecutor<PermissionRoleEntity> {
-                                             QuerydslPredicateExecutor<PermissionRoleEntity> {
     /**
      * 更新角色状态
      *

eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/impl/PermissionPolicyRepositoryCustomizedImpl.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package cn.topiam.employee.common.repository.app.impl;
+package cn.topiam.employee.common.repository.permission.impl;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ import com.google.common.collect.Lists;
 import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
 import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
 import cn.topiam.employee.common.repository.app.impl.mapper.AppPermissionPolicyPoMapper;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepositoryCustomized;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepositoryCustomized;
 
 import lombok.RequiredArgsConstructor;
 
@@ -41,8 +41,8 @@ import lombok.RequiredArgsConstructor;
  */
 @Repository
 @RequiredArgsConstructor
-public class AppPermissionPolicyRepositoryCustomizedImpl implements
+public class PermissionPolicyRepositoryCustomizedImpl implements
-                                                         AppPermissionPolicyRepositoryCustomized {
+                                                      PermissionPolicyRepositoryCustomized {
 
     private String leftJoin(String table, String condition) {
         return " LEFT JOIN " + table + " ON " + condition + " AND " + table + ".is_deleted = '0' ";

eiam-console/src/main/java/cn/topiam/employee/console/service/permission/impl/PermissionActionServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
 import com.querydsl.core.types.Predicate;
 
 import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
-import cn.topiam.employee.common.repository.permission.AppPermissionResourceRepository;
+import cn.topiam.employee.common.repository.permission.PermissionResourceRepository;
 import cn.topiam.employee.console.converter.permission.PermissionActionConverter;
 import cn.topiam.employee.console.pojo.query.permission.PermissionActionListQuery;
 import cn.topiam.employee.console.pojo.result.permission.PermissionActionListResult;
@@ -59,7 +59,7 @@ public class PermissionActionServiceImpl implements PermissionActionService {
         return permissionActionConverter.entityConvertToResourceActionListResult(list);
     }
 
-    private final AppPermissionResourceRepository permissionResourceRepository;
+    private final PermissionResourceRepository permissionResourceRepository;
 
-    private final PermissionActionConverter       permissionActionConverter;
+    private final PermissionActionConverter    permissionActionConverter;
 }

eiam-console/src/main/java/cn/topiam/employee/console/service/permission/impl/PermissionPolicyServiceImpl.java

@@ -25,7 +25,7 @@ import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
 import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
 import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
 import cn.topiam.employee.common.exception.app.AppPolicyNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
 import cn.topiam.employee.console.converter.permission.PermissionPolicyConverter;
 import cn.topiam.employee.console.pojo.result.permission.PermissionPolicyGetResult;
 import cn.topiam.employee.console.pojo.result.permission.PermissionPolicyListResult;
@@ -121,7 +121,7 @@ public class PermissionPolicyServiceImpl implements PermissionPolicyService {
         return null;
     }
 
-    private final PermissionPolicyConverter     permissionPolicyConverter;
+    private final PermissionPolicyConverter  permissionPolicyConverter;
 
-    private final AppPermissionPolicyRepository permissionPolicyRepository;
+    private final PermissionPolicyRepository permissionPolicyRepository;
 }

eiam-console/src/main/java/cn/topiam/employee/console/service/permission/impl/PermissionResourceServiceImpl.java

@@ -39,9 +39,9 @@ import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
 import cn.topiam.employee.common.entity.permission.QPermissionResourceEntity;
 import cn.topiam.employee.common.enums.CheckValidityType;
 import cn.topiam.employee.common.exception.app.AppResourceNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionActionRepository;
+import cn.topiam.employee.common.repository.permission.PermissionActionRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionResourceRepository;
+import cn.topiam.employee.common.repository.permission.PermissionResourceRepository;
 import cn.topiam.employee.console.converter.permission.PermissionResourceConverter;
 import cn.topiam.employee.console.pojo.query.permission.PermissionResourceListQuery;
 import cn.topiam.employee.console.pojo.result.permission.PermissionResourceGetResult;
@@ -267,15 +267,15 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
         resource.setActions(list);
     }
 
-    private final PermissionResourceConverter     permissionResourceConverter;
+    private final PermissionResourceConverter  permissionResourceConverter;
 
-    private final AppPermissionResourceRepository appResourceRepository;
+    private final PermissionResourceRepository appResourceRepository;
     /**
      * PolicyRepository
      */
-    private final AppPermissionPolicyRepository   permissionPolicyRepository;
+    private final PermissionPolicyRepository   permissionPolicyRepository;
     /**
      * ActionRepository
      */
-    private final AppPermissionActionRepository   permissionActionRepository;
+    private final PermissionActionRepository   permissionActionRepository;
 }

eiam-console/src/main/java/cn/topiam/employee/console/service/permission/impl/PermissionRoleServiceImpl.java

@@ -37,8 +37,8 @@ import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
 import cn.topiam.employee.common.entity.permission.QPermissionRoleEntity;
 import cn.topiam.employee.common.enums.CheckValidityType;
 import cn.topiam.employee.common.exception.app.AppRoleNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionRoleRepository;
+import cn.topiam.employee.common.repository.permission.PermissionRoleRepository;
 import cn.topiam.employee.console.converter.permission.PermissionRoleConverter;
 import cn.topiam.employee.console.pojo.query.permission.PermissionRoleListQuery;
 import cn.topiam.employee.console.pojo.result.permission.PermissionRoleListResult;
@@ -205,13 +205,13 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
     /**
      * 用户数据映射器
      */
-    private final PermissionRoleConverter       permissionRoleConverter;
+    private final PermissionRoleConverter    permissionRoleConverter;
     /**
      * RoleRepository
      */
-    private final AppPermissionRoleRepository   permissionRoleRepository;
+    private final PermissionRoleRepository   permissionRoleRepository;
     /**
      * PolicyRepository
      */
-    private final AppPermissionPolicyRepository permissionPolicyRepository;
+    private final PermissionPolicyRepository permissionPolicyRepository;
 }

eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/PermissionPolicyServiceImpl.java

@@ -25,7 +25,7 @@ import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
 import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
 import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
 import cn.topiam.employee.common.exception.app.AppPolicyNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
 import cn.topiam.employee.openapi.converter.permission.PermissionPolicyConverter;
 import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
 import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionPolicyCreateParam;
@@ -129,7 +129,7 @@ public class PermissionPolicyServiceImpl implements PermissionPolicyService {
         return null;
     }
 
-    private final PermissionPolicyConverter     permissionPolicyConverter;
+    private final PermissionPolicyConverter  permissionPolicyConverter;
 
-    private final AppPermissionPolicyRepository permissionPolicyRepository;
+    private final PermissionPolicyRepository permissionPolicyRepository;
 }

eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/PermissionResourceServiceImpl.java

@@ -36,9 +36,9 @@ import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
 import cn.topiam.employee.common.entity.permission.QPermissionResourceEntity;
 import cn.topiam.employee.common.enums.CheckValidityType;
 import cn.topiam.employee.common.exception.app.AppResourceNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionActionRepository;
+import cn.topiam.employee.common.repository.permission.PermissionActionRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionResourceRepository;
+import cn.topiam.employee.common.repository.permission.PermissionResourceRepository;
 import cn.topiam.employee.openapi.converter.permission.PermissionResourceConverter;
 import cn.topiam.employee.openapi.pojo.request.app.AppPermissionsActionParam;
 import cn.topiam.employee.openapi.pojo.request.app.query.AppResourceListQuery;
@@ -227,15 +227,15 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
         resource.setActions(list);
     }
 
-    private final PermissionResourceConverter     permissionResourceConverter;
+    private final PermissionResourceConverter  permissionResourceConverter;
 
-    private final AppPermissionResourceRepository appResourceRepository;
+    private final PermissionResourceRepository appResourceRepository;
     /**
      * PolicyRepository
      */
-    private final AppPermissionPolicyRepository   permissionPolicyRepository;
+    private final PermissionPolicyRepository   permissionPolicyRepository;
     /**
      * ActionRepository
      */
-    private final AppPermissionActionRepository   permissionActionRepository;
+    private final PermissionActionRepository   permissionActionRepository;
 }

eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/PermissionRoleServiceImpl.java

@@ -34,8 +34,8 @@ import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
 import cn.topiam.employee.common.entity.permission.QPermissionRoleEntity;
 import cn.topiam.employee.common.enums.CheckValidityType;
 import cn.topiam.employee.common.exception.app.AppRoleNotExistException;
-import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
+import cn.topiam.employee.common.repository.permission.PermissionPolicyRepository;
-import cn.topiam.employee.common.repository.permission.AppPermissionRoleRepository;
+import cn.topiam.employee.common.repository.permission.PermissionRoleRepository;
 import cn.topiam.employee.openapi.converter.permission.PermissionRoleConverter;
 import cn.topiam.employee.openapi.pojo.request.app.query.AppPermissionRoleListQuery;
 import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionRoleCreateParam;
@@ -196,13 +196,13 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
     /**
      * 用户数据映射器
      */
-    private final PermissionRoleConverter       permissionRoleConverter;
+    private final PermissionRoleConverter    permissionRoleConverter;
     /**
      * RoleRepository
      */
-    private final AppPermissionRoleRepository   permissionRoleRepository;
+    private final PermissionRoleRepository   permissionRoleRepository;
     /**
      * PolicyRepository
      */
-    private final AppPermissionPolicyRepository permissionPolicyRepository;
+    private final PermissionPolicyRepository permissionPolicyRepository;
 }