gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化代码

pull/54/head^2
smallbun 2023-09-18 23:40:33 +08:00
parent 16ddae29d3
commit 54ac2665ce
33 changed files with 541 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/AppPermissionActionEntity.java → eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/PermissionActionEntity.java
View File

@ -48,7 +48,7 @@ import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOF
@Table(name = "app_permission_action")
@SQLDelete(sql = "update app_permission_action set " + SOFT_DELETE_SET + " where id_ = ?")
@Where(clause = SOFT_DELETE_WHERE)
public class AppPermissionActionEntity extends LogicDeleteEntity<Long> {
public class PermissionActionEntity extends LogicDeleteEntity<Long> {
@Serial
private static final long serialVersionUID = -3954680915360748087L;
@ -75,5 +75,5 @@ public class AppPermissionActionEntity extends LogicDeleteEntity<Long> {
*/
@ManyToOne
@JoinColumn(name = "resource_id")
private AppPermissionResourceEntity resource;
private PermissionResourceEntity resource;
}

2
eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/AppPermissionPolicyEntity.java → eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/PermissionPolicyEntity.java
View File

@ -50,7 +50,7 @@ import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOF
@Table(name = "app_permission_policy")
@SQLDelete(sql = "update app_permission_policy set " + SOFT_DELETE_SET + " where id_ = ?")
@Where(clause = SOFT_DELETE_WHERE)
public class AppPermissionPolicyEntity extends LogicDeleteEntity<Long> {
public class PermissionPolicyEntity extends LogicDeleteEntity<Long> {
/**
* 应用id

4
eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/AppPermissionResourceEntity.java → eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/PermissionResourceEntity.java
View File

@ -52,7 +52,7 @@ import static jakarta.persistence.FetchType.LAZY;
@Table(name = "app_permission_resource")
@SQLDelete(sql = "update app_permission_resource set " + SOFT_DELETE_SET + " where id_ = ?")
@Where(clause = SOFT_DELETE_WHERE)
public class AppPermissionResourceEntity extends LogicDeleteEntity<Long> {
public class PermissionResourceEntity extends LogicDeleteEntity<Long> {
@Serial
private static final long serialVersionUID = 7342074686605139968L;
@ -93,5 +93,5 @@ public class AppPermissionResourceEntity extends LogicDeleteEntity<Long> {
@ToString.Exclude
@OneToMany(mappedBy = "resource", fetch = LAZY, cascade = { CascadeType.PERSIST,
CascadeType.REMOVE })
private List<AppPermissionActionEntity> actions;
private List<PermissionActionEntity> actions;
}

2
eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/AppPermissionRoleEntity.java → eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/PermissionRoleEntity.java
View File

@ -51,7 +51,7 @@ import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOF
@Table(name = "app_permission_role")
@SQLDelete(sql = "update app_permission_role set " + SOFT_DELETE_SET + " where id_ = ?")
@Where(clause = SOFT_DELETE_WHERE)
public class AppPermissionRoleEntity extends LogicDeleteEntity<Long> {
public class PermissionRoleEntity extends LogicDeleteEntity<Long> {
@Serial
private static final long serialVersionUID = -7761332532995424593L;

2
eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/po/AppPermissionPolicyPO.java → eiam-common/src/main/java/cn/topiam/employee/common/entity/permission/po/PermissionPolicyPO.java
View File

@ -38,7 +38,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Data
@Accessors(chain = true)
@Schema(description = "分页查询策略响应")
public class AppPermissionPolicyPO implements Serializable {
public class PermissionPolicyPO implements Serializable {
@Serial
private static final long serialVersionUID = 3320953184046791392L;

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppPermissionPolicyRepositoryCustomizedImpl.java
View File

@ -19,6 +19,7 @@ package cn.topiam.employee.common.repository.app.impl;
import java.util.List;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
@ -29,7 +30,6 @@ import org.springframework.util.ObjectUtils;
import com.google.common.collect.Lists;
import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.common.repository.app.impl.mapper.AppPermissionPolicyPoMapper;
import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepositoryCustomized;
@ -49,7 +49,7 @@ public class AppPermissionPolicyRepositoryCustomizedImpl implements
}
@Override
public Page<AppPermissionPolicyPO> findPage(AppPolicyQuery query, Pageable pageable) {
public Page<PermissionPolicyPO> findPage(AppPolicyQuery query, Pageable pageable) {
//查询条件
//@formatter:off
// 所属应用
@ -111,7 +111,7 @@ public class AppPermissionPolicyRepositoryCustomizedImpl implements
.append(" FROM app_permission_policy policy ").append(subjectJoin).append(objectJoin);
// @formatter:off
List<AppPermissionPolicyPO> list = jdbcTemplate
List<PermissionPolicyPO> list = jdbcTemplate
.query(
selectSql.append(" LIMIT ").append(pageable.getPageNumber() * pageable.getPageSize())
.append(",").append(pageable.getPageSize()).toString(),

26
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/mapper/AppPermissionPolicyPoMapper.java
View File

@ -20,9 +20,9 @@ package cn.topiam.employee.common.repository.app.impl.mapper;
import java.sql.ResultSet;
import java.sql.SQLException;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.springframework.jdbc.core.RowMapper;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.common.enums.app.AppPolicyEffect;
import cn.topiam.employee.common.enums.app.AppPolicyObjectType;
import cn.topiam.employee.common.enums.app.AppPolicySubjectType;
@ -31,7 +31,7 @@ import cn.topiam.employee.common.enums.app.AppPolicySubjectType;
* @author TopIAM
* Created by support@topiam.cn on 2022/2/13 23:25
*/
public class AppPermissionPolicyPoMapper implements RowMapper<AppPermissionPolicyPO> {
public class AppPermissionPolicyPoMapper implements RowMapper<PermissionPolicyPO> {
/**
* Implementations must implement this method to map each row of data
@ -46,18 +46,18 @@ public class AppPermissionPolicyPoMapper implements RowMapper<AppPermissionPolic
*/
@SuppressWarnings("DuplicatedCode")
@Override
public AppPermissionPolicyPO mapRow(ResultSet rs, int rowNum) throws SQLException {
AppPermissionPolicyPO appPermissionPolicyPo = new AppPermissionPolicyPO();
appPermissionPolicyPo.setId(rs.getLong("id_"));
appPermissionPolicyPo.setEffect(AppPolicyEffect.getType(rs.getString("effect")));
appPermissionPolicyPo.setSubjectId(rs.getString("subject_id"));
appPermissionPolicyPo
public PermissionPolicyPO mapRow(ResultSet rs, int rowNum) throws SQLException {
PermissionPolicyPO permissionPolicyPo = new PermissionPolicyPO();
permissionPolicyPo.setId(rs.getLong("id_"));
permissionPolicyPo.setEffect(AppPolicyEffect.getType(rs.getString("effect")));
permissionPolicyPo.setSubjectId(rs.getString("subject_id"));
permissionPolicyPo
.setSubjectType(AppPolicySubjectType.getType(rs.getString("subject_type")));
appPermissionPolicyPo.setSubjectName(rs.getString("subject_name"));
appPermissionPolicyPo.setObjectId(rs.getLong("object_id"));
appPermissionPolicyPo
permissionPolicyPo.setSubjectName(rs.getString("subject_name"));
permissionPolicyPo.setObjectId(rs.getLong("object_id"));
permissionPolicyPo
.setObjectType(AppPolicyObjectType.getType(rs.getString("object_type")));
appPermissionPolicyPo.setObjectName(rs.getString("object_name"));
return appPermissionPolicyPo;
permissionPolicyPo.setObjectName(rs.getString("object_name"));
return permissionPolicyPo;
}
}

12
eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/AppPermissionActionRepository.java
View File

@ -19,11 +19,11 @@ package cn.topiam.employee.common.repository.permission;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.stereotype.Repository;
import cn.topiam.employee.common.entity.permission.AppPermissionActionEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.support.repository.LogicDeleteRepository;
/**
@ -32,13 +32,13 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
*/
@Repository
public interface AppPermissionActionRepository extends
LogicDeleteRepository<AppPermissionActionEntity, Long>,
QuerydslPredicateExecutor<AppPermissionActionEntity> {
LogicDeleteRepository<PermissionActionEntity, Long>,
QuerydslPredicateExecutor<PermissionActionEntity> {
/**
* findAllByResource
*
* @param resource {@link AppPermissionResourceEntity}
* @param resource {@link PermissionResourceEntity}
* @return {@link List}
*/
List<AppPermissionActionEntity> findAllByResource(AppPermissionResourceEntity resource);
List<PermissionActionEntity> findAllByResource(PermissionResourceEntity resource);
}

8
eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/AppPermissionPolicyRepository.java
View File

@ -20,6 +20,7 @@ package cn.topiam.employee.common.repository.permission;
import java.io.Serializable;
import java.util.Collection;
import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
@ -27,7 +28,6 @@ import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import cn.topiam.employee.common.entity.permission.AppPermissionPolicyEntity;
import cn.topiam.employee.support.repository.LogicDeleteRepository;
import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOFT_DELETE_SET;
@ -37,8 +37,8 @@ import static cn.topiam.employee.support.repository.domain.LogicDeleteEntity.SOF
*/
@Repository
public interface AppPermissionPolicyRepository extends AppPermissionPolicyRepositoryCustomized,
LogicDeleteRepository<AppPermissionPolicyEntity, Long>,
QuerydslPredicateExecutor<AppPermissionPolicyEntity> {
LogicDeleteRepository<PermissionPolicyEntity, Long>,
QuerydslPredicateExecutor<PermissionPolicyEntity> {
/**
* 按主体 ID 删除所有
*
@ -81,6 +81,6 @@ public interface AppPermissionPolicyRepository extends AppPermissionPolicyReposi
*/
@Transactional(rollbackFor = Exception.class)
@Modifying
@Query(value = "UPDATE AppPermissionResourceEntity set enabled =:status WHERE id =:id")
@Query(value = "UPDATE PermissionResourceEntity set enabled =:status WHERE id =:id")
Integer updateStatus(@Param(value = "id") Long id, @Param(value = "status") Boolean status);
}

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/AppPermissionPolicyRepositoryCustomized.java
View File

@ -17,11 +17,11 @@
*/
package cn.topiam.employee.common.repository.permission;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
/**
* @author TopIAM
@ -33,7 +33,7 @@ public interface AppPermissionPolicyRepositoryCustomized {
*
* @param query {@link AppPolicyQuery}
* @param request {@link Pageable}
* @return {@link AppPermissionPolicyPO}
* @return {@link PermissionPolicyPO}
*/
Page<AppPermissionPolicyPO> findPage(AppPolicyQuery query, Pageable request);
Page<PermissionPolicyPO> findPage(AppPolicyQuery query, Pageable request);
}

10
eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/AppPermissionResourceRepository.java
View File

@ -19,13 +19,13 @@ package cn.topiam.employee.common.repository.permission;
import java.util.Optional;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.support.repository.LogicDeleteRepository;
/**
@ -38,16 +38,16 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
*/
@Repository
public interface AppPermissionResourceRepository extends
LogicDeleteRepository<AppPermissionResourceEntity, Long>,
QuerydslPredicateExecutor<AppPermissionResourceEntity> {
LogicDeleteRepository<PermissionResourceEntity, Long>,
QuerydslPredicateExecutor<PermissionResourceEntity> {
/**
* findByIdContainsDeleted
*
* @param id must not be {@literal null}.
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
@NotNull
@Query(value = "SELECT * FROM app_permission_resource WHERE id_ = :id", nativeQuery = true)
Optional<AppPermissionResourceEntity> findByIdContainsDeleted(@NotNull @Param(value = "id") Long id);
Optional<PermissionResourceEntity> findByIdContainsDeleted(@NotNull @Param(value = "id") Long id);
}

10
eiam-common/src/main/java/cn/topiam/employee/common/repository/permission/AppPermissionRoleRepository.java
View File

@ -19,6 +19,7 @@ package cn.topiam.employee.common.repository.permission;
import java.util.Optional;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import org.jetbrains.annotations.NotNull;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.jpa.repository.Modifying;
@ -28,7 +29,6 @@ import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import cn.topiam.employee.common.entity.permission.AppPermissionRoleEntity;
import cn.topiam.employee.support.repository.LogicDeleteRepository;
/**
@ -41,8 +41,8 @@ import cn.topiam.employee.support.repository.LogicDeleteRepository;
*/
@Repository
public interface AppPermissionRoleRepository extends
LogicDeleteRepository<AppPermissionRoleEntity, Long>,
QuerydslPredicateExecutor<AppPermissionRoleEntity> {
LogicDeleteRepository<PermissionRoleEntity, Long>,
QuerydslPredicateExecutor<PermissionRoleEntity> {
/**
* 更新角色状态
*
@ -58,10 +58,10 @@ public interface AppPermissionRoleRepository extends
* findByIdContainsDeleted
*
* @param id must not be {@literal null}.
* @return {@link AppPermissionRoleEntity}
* @return {@link PermissionRoleEntity}
*/
@NotNull
@Cacheable
@Query(value = "SELECT * FROM app_permission_role WHERE id_ = :id", nativeQuery = true)
Optional<AppPermissionRoleEntity> findByIdContainsDeleted(@NotNull @Param(value = "id") Long id);
Optional<PermissionRoleEntity> findByIdContainsDeleted(@NotNull @Param(value = "id") Long id);
}

16
eiam-console/src/main/java/cn/topiam/employee/console/converter/permission/PermissionActionConverter.java
View File

@ -20,6 +20,8 @@ package cn.topiam.employee.console.converter.permission;
import java.util.ArrayList;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import org.apache.commons.lang3.StringUtils;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@ -29,8 +31,6 @@ import com.querydsl.core.types.ExpressionUtils;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.app.QAppPermissionResourceEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionActionEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.common.enums.PermissionActionType;
import cn.topiam.employee.console.pojo.query.permission.PermissionActionListQuery;
import cn.topiam.employee.console.pojo.result.permission.PermissionActionListResult;
@ -68,18 +68,18 @@ public interface PermissionActionConverter {
/**
* 实体转资源权限结果返回
*
* @param list {@link AppPermissionResourceEntity}
* @param list {@link PermissionResourceEntity}
* @return {@link PermissionActionListResult}
*/
default List<PermissionActionListResult> entityConvertToResourceActionListResult(List<AppPermissionResourceEntity> list) {
default List<PermissionActionListResult> entityConvertToResourceActionListResult(List<PermissionResourceEntity> list) {
List<PermissionActionListResult> results = new ArrayList<>();
List<PermissionActionListResult.Action> menus = new ArrayList<>();
List<PermissionActionListResult.Action> apis = new ArrayList<>();
List<PermissionActionListResult.Action> buttons = new ArrayList<>();
List<PermissionActionListResult.Action> others = new ArrayList<>();
List<PermissionActionListResult.Action> datas = new ArrayList<>();
for (AppPermissionResourceEntity resource : list) {
for (AppPermissionActionEntity action : resource.getActions()) {
for (PermissionResourceEntity resource : list) {
for (PermissionActionEntity action : resource.getActions()) {
if (PermissionActionType.MENU.equals(action.getType())) {
menus.add(actionConvertToResourceActionResult(action));
}
@ -117,10 +117,10 @@ public interface PermissionActionConverter {
/**
* actionConvertToResourceActionResult
*
* @param action {@link AppPermissionActionEntity}
* @param action {@link PermissionActionEntity}
* @return {@link PermissionActionListResult.Action}
*/
@Mapping(target = "access", source = "value")
PermissionActionListResult.Action actionConvertToResourceActionResult(AppPermissionActionEntity action);
PermissionActionListResult.Action actionConvertToResourceActionResult(PermissionActionEntity action);
}

22
eiam-console/src/main/java/cn/topiam/employee/console/converter/permission/PermissionPolicyConverter.java
View File

@ -20,14 +20,14 @@ package cn.topiam.employee.console.converter.permission;
import java.util.ArrayList;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import cn.topiam.employee.console.pojo.result.permission.PermissionPolicyListResult;
import cn.topiam.employee.console.pojo.save.permission.PermissionPolicyCreateParam;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.springframework.util.CollectionUtils;
import cn.topiam.employee.common.entity.permission.AppPermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.console.pojo.update.permission.PermissionPolicyUpdateParam;
import cn.topiam.employee.support.repository.page.domain.Page;
@ -44,7 +44,7 @@ public interface PermissionPolicyConverter {
* 资源创建参数转实体类
*
* @param param {@link PermissionPolicyCreateParam}
* @return {@link AppPermissionPolicyEntity}
* @return {@link PermissionPolicyEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "id", ignore = true)
@ -53,13 +53,13 @@ public interface PermissionPolicyConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionPolicyEntity policyCreateParamConvertToEntity(PermissionPolicyCreateParam param);
PermissionPolicyEntity policyCreateParamConvertToEntity(PermissionPolicyCreateParam param);
/**
* 资源修改参数转实体类
*
* @param param {@link PermissionPolicyCreateParam}
* @return {@link AppPermissionPolicyEntity}
* @return {@link PermissionPolicyEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "updateTime", ignore = true)
@ -67,7 +67,7 @@ public interface PermissionPolicyConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionPolicyEntity policyUpdateParamConvertToEntity(PermissionPolicyUpdateParam param);
PermissionPolicyEntity policyUpdateParamConvertToEntity(PermissionPolicyUpdateParam param);
/**
* 资源转换为资源列表结果
@ -75,9 +75,9 @@ public interface PermissionPolicyConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<PermissionPolicyListResult> entityConvertToPolicyListResult(org.springframework.data.domain.Page<AppPermissionPolicyPO> page) {
default Page<PermissionPolicyListResult> entityConvertToPolicyListResult(org.springframework.data.domain.Page<PermissionPolicyPO> page) {
Page<PermissionPolicyListResult> result = new Page<>();
List<AppPermissionPolicyPO> pageList = page.getContent();
List<PermissionPolicyPO> pageList = page.getContent();
if (!CollectionUtils.isEmpty(pageList)) {
//@formatter:off
result.setPagination(Page.Pagination.builder()
@ -87,7 +87,7 @@ public interface PermissionPolicyConverter {
.build());
//@formatter:on
List<PermissionPolicyListResult> list = new ArrayList<>();
for (AppPermissionPolicyPO po : pageList) {
for (PermissionPolicyPO po : pageList) {
list.add(entityConvertToPolicyListResult(po));
}
result.setList(list);
@ -99,7 +99,7 @@ public interface PermissionPolicyConverter {
* entityConvertToPolicyListResult
*
* @param entity {@link PermissionPolicyListResult}
* @return {@link AppPermissionPolicyPO}
* @return {@link PermissionPolicyPO}
*/
PermissionPolicyListResult entityConvertToPolicyListResult(AppPermissionPolicyPO entity);
PermissionPolicyListResult entityConvertToPolicyListResult(PermissionPolicyPO entity);
}

24
eiam-console/src/main/java/cn/topiam/employee/console/converter/permission/PermissionResourceConverter.java
View File

@ -20,6 +20,7 @@ package cn.topiam.employee.console.converter.permission;
import java.util.ArrayList;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import cn.topiam.employee.console.pojo.result.permission.PermissionResourceGetResult;
import cn.topiam.employee.console.pojo.result.permission.PermissionResourceListResult;
import cn.topiam.employee.console.pojo.update.permission.PermissionResourceUpdateParam;
@ -33,7 +34,6 @@ import com.querydsl.core.types.ExpressionUtils;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.app.QAppPermissionResourceEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.console.pojo.query.permission.PermissionResourceListQuery;
import cn.topiam.employee.console.pojo.save.permission.PermissionResourceCreateParam;
import cn.topiam.employee.support.repository.page.domain.Page;
@ -71,7 +71,7 @@ public interface PermissionResourceConverter {
* 资源创建参数转实体类
*
* @param param {@link PermissionResourceCreateParam}
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "actions", ignore = true)
@ -81,13 +81,13 @@ public interface PermissionResourceConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionResourceEntity resourceCreateParamConvertToEntity(PermissionResourceCreateParam param);
PermissionResourceEntity resourceCreateParamConvertToEntity(PermissionResourceCreateParam param);
/**
* 资源修改参数转实体类
*
* @param param {@link PermissionResourceCreateParam}
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "actions", ignore = true)
@ -96,7 +96,7 @@ public interface PermissionResourceConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionResourceEntity resourceUpdateParamConvertToEntity(PermissionResourceUpdateParam param);
PermissionResourceEntity resourceUpdateParamConvertToEntity(PermissionResourceUpdateParam param);
/**
* 资源转换为资源列表结果
@ -104,12 +104,12 @@ public interface PermissionResourceConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<PermissionResourceListResult> entityConvertToResourceListResult(org.springframework.data.domain.Page<AppPermissionResourceEntity> page) {
default Page<PermissionResourceListResult> entityConvertToResourceListResult(org.springframework.data.domain.Page<PermissionResourceEntity> page) {
Page<PermissionResourceListResult> result = new Page<>();
List<AppPermissionResourceEntity> pageList = page.getContent();
List<PermissionResourceEntity> pageList = page.getContent();
if (!CollectionUtils.isEmpty(pageList)) {
List<PermissionResourceListResult> list = new ArrayList<>();
for (AppPermissionResourceEntity resource : pageList) {
for (PermissionResourceEntity resource : pageList) {
list.add(entityConvertToResourceListResult(resource));
}
//@formatter:off
@ -127,17 +127,17 @@ public interface PermissionResourceConverter {
/**
* 实体转换为资源列表结果
*
* @param data {@link AppPermissionResourceEntity}
* @param data {@link PermissionResourceEntity}
* @return {@link PermissionResourceListResult}
*/
PermissionResourceListResult entityConvertToResourceListResult(AppPermissionResourceEntity data);
PermissionResourceListResult entityConvertToResourceListResult(PermissionResourceEntity data);
/**
* 实体转获取详情返回
*
* @param resource {@link AppPermissionResourceEntity}
* @param resource {@link PermissionResourceEntity}
* @return {@link PermissionResourceGetResult}
*/
@Mapping(target = "actions", source = "actions")
PermissionResourceGetResult entityConvertToResourceGetResult(AppPermissionResourceEntity resource);
PermissionResourceGetResult entityConvertToResourceGetResult(PermissionResourceEntity resource);
}

24
eiam-console/src/main/java/cn/topiam/employee/console/converter/permission/PermissionRoleConverter.java
View File

@ -31,7 +31,7 @@ import com.querydsl.core.types.ExpressionUtils;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.app.QAppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import cn.topiam.employee.console.pojo.query.permission.PermissionRoleListQuery;
import cn.topiam.employee.console.pojo.result.permission.PermissionRoleListResult;
import cn.topiam.employee.console.pojo.result.permission.PermissionRoleResult;
@ -53,11 +53,11 @@ public interface PermissionRoleConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<PermissionRoleListResult> entityConvertToRolePaginationResult(org.springframework.data.domain.Page<AppPermissionRoleEntity> page) {
default Page<PermissionRoleListResult> entityConvertToRolePaginationResult(org.springframework.data.domain.Page<PermissionRoleEntity> page) {
Page<PermissionRoleListResult> result = new Page<>();
if (!CollectionUtils.isEmpty(page.getContent())) {
List<PermissionRoleListResult> list = new ArrayList<>();
for (AppPermissionRoleEntity user : page.getContent()) {
for (PermissionRoleEntity user : page.getContent()) {
list.add(entityConvertToRolePaginationResult(user));
}
//@formatter:off
@ -75,16 +75,16 @@ public interface PermissionRoleConverter {
/**
* 角色实体转换为角色分页结果
*
* @param page {@link AppPermissionRoleEntity}
* @param page {@link PermissionRoleEntity}
* @return {@link PermissionRoleListResult}
*/
PermissionRoleListResult entityConvertToRolePaginationResult(AppPermissionRoleEntity page);
PermissionRoleListResult entityConvertToRolePaginationResult(PermissionRoleEntity page);
/**
* 角色创建参数转换为角色实体
*
* @param param {@link PermissionRoleCreateParam}
* @return {@link AppPermissionRoleEntity}
* @return {@link PermissionRoleEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "id", ignore = true)
@ -93,13 +93,13 @@ public interface PermissionRoleConverter {
@Mapping(target = "updateBy", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionRoleEntity roleCreateParamConvertToEntity(PermissionRoleCreateParam param);
PermissionRoleEntity roleCreateParamConvertToEntity(PermissionRoleCreateParam param);
/**
* 角色更新参数转换为角色实体类
*
* @param param {@link PermissionRoleUpdateParam} 更新参数
* @return {@link AppPermissionRoleEntity} 角色实体
* @return {@link PermissionRoleEntity} 角色实体
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "appId", ignore = true)
@ -108,21 +108,21 @@ public interface PermissionRoleConverter {
@Mapping(target = "updateBy", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionRoleEntity roleUpdateParamConvertToEntity(PermissionRoleUpdateParam param);
PermissionRoleEntity roleUpdateParamConvertToEntity(PermissionRoleUpdateParam param);
/**
* 实体转系统详情结果
*
* @param role {@link AppPermissionRoleEntity}
* @param role {@link PermissionRoleEntity}
* @return {@link PermissionRoleResult}
*/
PermissionRoleResult entityConvertToRoleDetailResult(AppPermissionRoleEntity role);
PermissionRoleResult entityConvertToRoleDetailResult(PermissionRoleEntity role);
/**
* 角色分页查询参数转实体
*
* @param query {@link PermissionRoleListQuery}
* @return {@link AppPermissionRoleEntity}
* @return {@link PermissionRoleEntity}
*/
default Predicate rolePaginationParamConvertToPredicate(PermissionRoleListQuery query) {
QAppPermissionRoleEntity role = QAppPermissionRoleEntity.appPermissionRoleEntity;

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

@ -19,12 +19,12 @@ package cn.topiam.employee.console.service.permission.impl;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import cn.topiam.employee.console.converter.permission.PermissionActionConverter;
import org.springframework.stereotype.Service;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.common.repository.permission.AppPermissionResourceRepository;
import cn.topiam.employee.console.pojo.query.permission.PermissionActionListQuery;
import cn.topiam.employee.console.pojo.result.permission.PermissionActionListResult;
@ -54,7 +54,7 @@ public class PermissionActionServiceImpl implements PermissionActionService {
public List<PermissionActionListResult> getPermissionActionList(PermissionActionListQuery query) {
Predicate predicate = permissionActionConverter
.appPermissionActionListQueryConvertToPredicate(query);
List<AppPermissionResourceEntity> list = (List<AppPermissionResourceEntity>) appPermissionResourceRepository
List<PermissionResourceEntity> list = (List<PermissionResourceEntity>) appPermissionResourceRepository
.findAll(predicate);
return permissionActionConverter.entityConvertToResourceActionListResult(list);
}

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

@ -24,8 +24,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
import cn.topiam.employee.common.entity.permission.AppPermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
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.console.converter.permission.PermissionPolicyConverter;
@ -59,7 +59,7 @@ public class PermissionPolicyServiceImpl implements PermissionPolicyService {
@Override
public Page<PermissionPolicyListResult> getPermissionPolicyList(PageModel page,
AppPolicyQuery query) {
org.springframework.data.domain.Page<AppPermissionPolicyPO> data;
org.springframework.data.domain.Page<PermissionPolicyPO> data;
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
data = appPermissionPolicyRepository.findPage(query, request);
return permissionPolicyConverter.entityConvertToPolicyListResult(data);
@ -100,7 +100,7 @@ public class PermissionPolicyServiceImpl implements PermissionPolicyService {
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean createPermissionPolicy(PermissionPolicyCreateParam param) {
AppPermissionPolicyEntity resource = permissionPolicyConverter
PermissionPolicyEntity resource = permissionPolicyConverter
.policyCreateParamConvertToEntity(param);
// 新增策略
appPermissionPolicyRepository.save(resource);
@ -115,7 +115,7 @@ public class PermissionPolicyServiceImpl implements PermissionPolicyService {
*/
@Override
public Boolean updatePermissionPolicy(PermissionPolicyUpdateParam param) {
AppPermissionPolicyEntity resource = permissionPolicyConverter
PermissionPolicyEntity resource = permissionPolicyConverter
.policyUpdateParamConvertToEntity(param);
// 更新策略
appPermissionPolicyRepository.save(resource);

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

@ -23,6 +23,8 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import cn.topiam.employee.console.pojo.result.permission.PermissionResourceGetResult;
import cn.topiam.employee.console.pojo.result.permission.PermissionResourceListResult;
import cn.topiam.employee.console.pojo.save.permission.PermissionResourceCreateParam;
@ -39,8 +41,6 @@ import cn.topiam.employee.audit.context.AuditContext;
import cn.topiam.employee.audit.entity.Target;
import cn.topiam.employee.audit.enums.TargetType;
import cn.topiam.employee.common.entity.app.QAppPermissionResourceEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionActionEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.common.enums.CheckValidityType;
import cn.topiam.employee.common.exception.app.AppResourceNotExistException;
import cn.topiam.employee.common.repository.permission.AppPermissionActionRepository;
@ -81,7 +81,7 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
@Override
public Page<PermissionResourceListResult> getPermissionResourceList(PageModel page,
PermissionResourceListQuery query) {
org.springframework.data.domain.Page<AppPermissionResourceEntity> data;
org.springframework.data.domain.Page<PermissionResourceEntity> data;
Predicate predicate = permissionResourceConverter
.resourcePaginationParamConvertToPredicate(query);
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
@ -97,7 +97,7 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
*/
@Override
public PermissionResourceGetResult getPermissionResource(String id) {
AppPermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
PermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
.orElseThrow(AppResourceNotExistException::new);
return permissionResourceConverter.entityConvertToResourceGetResult(resource);
}
@ -112,12 +112,12 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
@Transactional(rollbackFor = Exception.class)
public Boolean deletePermissionResource(String id) {
Long resourceId = Long.valueOf(id);
AppPermissionResourceEntity resource = appResourceRepository.findById(resourceId)
PermissionResourceEntity resource = appResourceRepository.findById(resourceId)
.orElseThrow(AppResourceNotExistException::new);
List<AppPermissionActionEntity> actionList = appPermissionActionRepository
List<PermissionActionEntity> actionList = appPermissionActionRepository
.findAllByResource(resource);
List<Long> objectIdList = new ArrayList<>(
actionList.stream().map(AppPermissionActionEntity::getId).toList());
actionList.stream().map(PermissionActionEntity::getId).toList());
objectIdList.add(resourceId);
appPermissionPolicyRepository.deleteAllByObjectIdIn(objectIdList);
appResourceRepository.deleteById(resourceId);
@ -135,7 +135,7 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
*/
@Override
public Boolean updateStatus(Long id, boolean enabled) {
AppPermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
PermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
.orElseThrow(AppResourceNotExistException::new);
AuditContext.setTarget(
Target.builder().id(id.toString()).type(TargetType.APP_PERMISSION_RESOURCE).build());
@ -151,7 +151,7 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean createPermissionResource(PermissionResourceCreateParam param) {
AppPermissionResourceEntity resource = permissionResourceConverter
PermissionResourceEntity resource = permissionResourceConverter
.resourceCreateParamConvertToEntity(param);
buildActions(param.getActions(), resource);
// 新增资源
@ -170,22 +170,22 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updatePermissionResource(PermissionResourceUpdateParam param) {
AppPermissionResourceEntity resource = permissionResourceConverter
PermissionResourceEntity resource = permissionResourceConverter
.resourceUpdateParamConvertToEntity(param);
AppPermissionResourceEntity entity = getAppPermissionResourceEntity(
PermissionResourceEntity entity = getAppPermissionResourceEntity(
Long.valueOf(param.getId()));
buildActions(param.getActions(), resource);
BeanUtils.merge(resource, entity, LAST_MODIFIED_BY, LAST_MODIFIED_TIME);
// 查询资源下所有权限
List<AppPermissionActionEntity> actionList = appPermissionActionRepository
List<PermissionActionEntity> actionList = appPermissionActionRepository
.findAllByResource(resource);
// 取出未删除的权限id
Set<Long> reservedSet = resource.getActions().stream().map(AppPermissionActionEntity::getId)
Set<Long> reservedSet = resource.getActions().stream().map(PermissionActionEntity::getId)
.collect(Collectors.toSet());
// 过滤要删除的权限id
List<Long> removeActions = actionList.stream()
.filter(item -> !reservedSet.contains(item.getId()))
.map(AppPermissionActionEntity::getId).toList();
.map(PermissionActionEntity::getId).toList();
appPermissionActionRepository.deleteAllById(removeActions);
// 更新资源
appResourceRepository.save(entity);
@ -198,9 +198,9 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
* 获取应用权限资源
*
* @param id {@link Long}
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
private AppPermissionResourceEntity getAppPermissionResourceEntity(Long id) {
private PermissionResourceEntity getAppPermissionResourceEntity(Long id) {
return appResourceRepository.findById(id)
.orElseThrow(() -> new BadParamsException("应用权限资源不存在"));
}
@ -219,7 +219,7 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
public Boolean permissionResourceParamCheck(CheckValidityType type, String value, Long appId,
Long id) {
QAppPermissionResourceEntity role = QAppPermissionResourceEntity.appPermissionResourceEntity;
AppPermissionResourceEntity entity = new AppPermissionResourceEntity();
PermissionResourceEntity entity = new PermissionResourceEntity();
boolean result = false;
// ID存在说明是修改操作，查询一下当前数据
if (Objects.nonNull(id)) {
@ -249,14 +249,14 @@ public class PermissionResourceServiceImpl implements PermissionResourceService
* 批量处理actions
*
* @param permissions {@link List< PermissionsActionParam >}
* @param resource {@link AppPermissionResourceEntity>}
* @param resource {@link PermissionResourceEntity >}
*/
private void buildActions(List<PermissionsActionParam> permissions,
AppPermissionResourceEntity resource) {
PermissionResourceEntity resource) {
// 权限
List<AppPermissionActionEntity> list = new ArrayList<>();
List<PermissionActionEntity> list = new ArrayList<>();
for (PermissionsActionParam p : permissions) {
AppPermissionActionEntity entity = new AppPermissionActionEntity();
PermissionActionEntity entity = new PermissionActionEntity();
entity.setResource(resource);
entity.setType(p.getType());
entity.setName(p.getName());

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

@ -38,7 +38,7 @@ import cn.topiam.employee.audit.context.AuditContext;
import cn.topiam.employee.audit.entity.Target;
import cn.topiam.employee.audit.enums.TargetType;
import cn.topiam.employee.common.entity.app.QAppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import cn.topiam.employee.common.enums.CheckValidityType;
import cn.topiam.employee.common.exception.app.AppRoleNotExistException;
import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
@ -75,7 +75,7 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
@Override
public Page<PermissionRoleListResult> getPermissionRoleList(PageModel page,
PermissionRoleListQuery query) {
org.springframework.data.domain.Page<AppPermissionRoleEntity> data;
org.springframework.data.domain.Page<PermissionRoleEntity> data;
Predicate predicate = permissionRoleConverter
.rolePaginationParamConvertToPredicate(query);
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
@ -91,7 +91,7 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
*/
@Override
public boolean createPermissionRole(PermissionRoleCreateParam param) {
AppPermissionRoleEntity entity = permissionRoleConverter
PermissionRoleEntity entity = permissionRoleConverter
.roleCreateParamConvertToEntity(param);
appPermissionRoleRepository.save(entity);
AuditContext.setTarget(Target.builder().id(entity.getId().toString())
@ -105,9 +105,9 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
*/
@Override
public boolean updatePermissionRole(PermissionRoleUpdateParam param) {
AppPermissionRoleEntity source = permissionRoleConverter
PermissionRoleEntity source = permissionRoleConverter
.roleUpdateParamConvertToEntity(param);
AppPermissionRoleEntity target = appPermissionRoleRepository
PermissionRoleEntity target = appPermissionRoleRepository
.findById(Long.valueOf(param.getId())).orElseThrow(AppRoleNotExistException::new);
BeanUtils.merge(source, target, LAST_MODIFIED_TIME, LAST_MODIFIED_BY);
appPermissionRoleRepository.save(target);
@ -145,7 +145,7 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
@Override
public PermissionRoleResult getPermissionRole(Long id) {
//查询
Optional<AppPermissionRoleEntity> entity = appPermissionRoleRepository.findById(id);
Optional<PermissionRoleEntity> entity = appPermissionRoleRepository.findById(id);
//映射
return permissionRoleConverter.entityConvertToRoleDetailResult(entity.orElse(null));
}
@ -164,7 +164,7 @@ public class PermissionRoleServiceImpl implements PermissionRoleService {
public Boolean permissionRoleParamCheck(CheckValidityType type, String value, Long appId,
Long id) {
QAppPermissionRoleEntity role = QAppPermissionRoleEntity.appPermissionRoleEntity;
AppPermissionRoleEntity entity = new AppPermissionRoleEntity();
PermissionRoleEntity entity = new PermissionRoleEntity();
boolean result = false;
// ID存在说明是修改操作，查询一下当前数据
if (Objects.nonNull(id)) {

8
eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/AppPermissionActionConverter.java → eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/PermissionActionConverter.java
View File

@ -17,10 +17,10 @@
*/
package cn.topiam.employee.openapi.converter.app;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import cn.topiam.employee.common.entity.permission.AppPermissionActionEntity;
import cn.topiam.employee.openapi.pojo.request.app.AppPermissionsActionParam;
/**
@ -31,7 +31,7 @@ import cn.topiam.employee.openapi.pojo.request.app.AppPermissionsActionParam;
*/
@SuppressWarnings("AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc")
@Mapper(componentModel = "spring")
public interface AppPermissionActionConverter {
public interface PermissionActionConverter {
@Mapping(target = "updateTime", ignore = true)
@Mapping(target = "updateBy", ignore = true)
@Mapping(target = "resource", ignore = true)
@ -40,7 +40,7 @@ public interface AppPermissionActionConverter {
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionActionEntity toEntity(AppPermissionsActionParam dto);
PermissionActionEntity toEntity(AppPermissionsActionParam dto);
AppPermissionsActionParam toDTO(AppPermissionActionEntity entities);
AppPermissionsActionParam toDTO(PermissionActionEntity entities);
}

22
eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/AppPermissionPolicyConverter.java → eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/PermissionPolicyConverter.java
View File

@ -19,12 +19,12 @@ package cn.topiam.employee.openapi.converter.app;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.springframework.util.CollectionUtils;
import cn.topiam.employee.common.entity.permission.AppPermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionPolicyCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionPolicyUpdateParam;
import cn.topiam.employee.support.repository.page.domain.Page;
@ -35,14 +35,14 @@ import cn.topiam.employee.support.repository.page.domain.Page;
* @author TopIAM
* Created by support@topiam.cn on 2020/8/14 22:45
*/
@Mapper(componentModel = "spring", uses = AppPermissionActionConverter.class)
public interface AppPermissionPolicyConverter {
@Mapper(componentModel = "spring", uses = PermissionActionConverter.class)
public interface PermissionPolicyConverter {
/**
* 资源创建参数转实体类
*
* @param param {@link AppPermissionPolicyCreateParam}
* @return {@link AppPermissionPolicyEntity}
* @return {@link PermissionPolicyEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "id", ignore = true)
@ -51,13 +51,13 @@ public interface AppPermissionPolicyConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionPolicyEntity policyCreateParamConvertToEntity(AppPermissionPolicyCreateParam param);
PermissionPolicyEntity policyCreateParamConvertToEntity(AppPermissionPolicyCreateParam param);
/**
* 资源修改参数转实体类
*
* @param param {@link AppPermissionPolicyCreateParam}
* @return {@link AppPermissionPolicyEntity}
* @return {@link PermissionPolicyEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "updateTime", ignore = true)
@ -65,7 +65,7 @@ public interface AppPermissionPolicyConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionPolicyEntity policyUpdateParamConvertToEntity(AppPermissionPolicyUpdateParam param);
PermissionPolicyEntity policyUpdateParamConvertToEntity(AppPermissionPolicyUpdateParam param);
/**
* 资源转换为资源列表结果
@ -73,9 +73,9 @@ public interface AppPermissionPolicyConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<AppPermissionPolicyPO> entityConvertToPolicyListResult(org.springframework.data.domain.Page<AppPermissionPolicyPO> page) {
Page<AppPermissionPolicyPO> result = new Page<>();
List<AppPermissionPolicyPO> pageList = page.getContent();
default Page<PermissionPolicyPO> entityConvertToPolicyListResult(org.springframework.data.domain.Page<PermissionPolicyPO> page) {
Page<PermissionPolicyPO> result = new Page<>();
List<PermissionPolicyPO> pageList = page.getContent();
if (!CollectionUtils.isEmpty(pageList)) {
//@formatter:off
result.setPagination(Page.Pagination.builder()

28
eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/AppPermissionResourceConverter.java → eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/PermissionResourceConverter.java
View File

@ -20,6 +20,7 @@ package cn.topiam.employee.openapi.converter.app;
import java.util.ArrayList;
import java.util.List;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import org.apache.commons.lang3.StringUtils;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@ -29,7 +30,6 @@ import com.querydsl.core.types.ExpressionUtils;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.app.QAppPermissionResourceEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
import cn.topiam.employee.openapi.pojo.request.app.query.AppResourceListQuery;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionResourceCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionResourceUpdateParam;
@ -43,8 +43,8 @@ import cn.topiam.employee.support.repository.page.domain.Page;
* @author TopIAM
* Created by support@topiam.cn on 2020/8/14 22:45
*/
@Mapper(componentModel = "spring", uses = AppPermissionActionConverter.class)
public interface AppPermissionResourceConverter {
@Mapper(componentModel = "spring", uses = PermissionActionConverter.class)
public interface PermissionResourceConverter {
/**
* 资源分页查询参数转实体
@ -70,7 +70,7 @@ public interface AppPermissionResourceConverter {
* 资源创建参数转实体类
*
* @param param {@link AppPermissionResourceCreateParam}
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "actions", ignore = true)
@ -80,13 +80,13 @@ public interface AppPermissionResourceConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionResourceEntity resourceCreateParamConvertToEntity(AppPermissionResourceCreateParam param);
PermissionResourceEntity resourceCreateParamConvertToEntity(AppPermissionResourceCreateParam param);
/**
* 资源修改参数转实体类
*
* @param param {@link AppPermissionResourceCreateParam}
* @return {@link AppPermissionResourceEntity}
* @return {@link PermissionResourceEntity}
*/
@Mapping(target = "enabled", expression = "java(Boolean.TRUE)")
@Mapping(target = "deleted", ignore = true)
@ -98,7 +98,7 @@ public interface AppPermissionResourceConverter {
@Mapping(target = "remark", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionResourceEntity resourceUpdateParamConvertToEntity(AppPermissionResourceUpdateParam param);
PermissionResourceEntity resourceUpdateParamConvertToEntity(AppPermissionResourceUpdateParam param);
/**
* 资源转换为资源列表结果
@ -106,12 +106,12 @@ public interface AppPermissionResourceConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<AppPermissionResourceListResult> entityConvertToResourceListResult(org.springframework.data.domain.Page<AppPermissionResourceEntity> page) {
default Page<AppPermissionResourceListResult> entityConvertToResourceListResult(org.springframework.data.domain.Page<PermissionResourceEntity> page) {
Page<AppPermissionResourceListResult> result = new Page<>();
List<AppPermissionResourceEntity> pageList = page.getContent();
List<PermissionResourceEntity> pageList = page.getContent();
if (!CollectionUtils.isEmpty(pageList)) {
List<AppPermissionResourceListResult> list = new ArrayList<>();
for (AppPermissionResourceEntity resource : pageList) {
for (PermissionResourceEntity resource : pageList) {
list.add(entityConvertToResourceListResult(resource));
}
//@formatter:off
@ -129,17 +129,17 @@ public interface AppPermissionResourceConverter {
/**
* 实体转换为资源列表结果
*
* @param data {@link AppPermissionResourceEntity}
* @param data {@link PermissionResourceEntity}
* @return {@link AppPermissionResourceListResult}
*/
AppPermissionResourceListResult entityConvertToResourceListResult(AppPermissionResourceEntity data);
AppPermissionResourceListResult entityConvertToResourceListResult(PermissionResourceEntity data);
/**
* 实体转获取详情返回
*
* @param resource {@link AppPermissionResourceEntity}
* @param resource {@link PermissionResourceEntity}
* @return {@link AppPermissionResourceGetResult}
*/
@Mapping(target = "actions", source = "actions")
AppPermissionResourceGetResult entityConvertToResourceGetResult(AppPermissionResourceEntity resource);
AppPermissionResourceGetResult entityConvertToResourceGetResult(PermissionResourceEntity resource);
}

26
eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/AppPermissionRoleConverter.java → eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/app/PermissionRoleConverter.java
View File

@ -30,7 +30,7 @@ import com.querydsl.core.types.ExpressionUtils;
import com.querydsl.core.types.Predicate;
import cn.topiam.employee.common.entity.app.QAppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import cn.topiam.employee.openapi.pojo.request.app.query.AppPermissionRoleListQuery;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionRoleCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.PermissionRoleUpdateParam;
@ -45,7 +45,7 @@ import cn.topiam.employee.support.repository.page.domain.Page;
* Created by support@topiam.cn on 2020/8/14 22:45
*/
@Mapper(componentModel = "spring")
public interface AppPermissionRoleConverter {
public interface PermissionRoleConverter {
/**
* 角色实体转换为角色分页结果
@ -53,11 +53,11 @@ public interface AppPermissionRoleConverter {
* @param page {@link Page}
* @return {@link Page}
*/
default Page<AppPermissionRoleListResult> entityConvertToRolePaginationResult(org.springframework.data.domain.Page<AppPermissionRoleEntity> page) {
default Page<AppPermissionRoleListResult> entityConvertToRolePaginationResult(org.springframework.data.domain.Page<PermissionRoleEntity> page) {
Page<AppPermissionRoleListResult> result = new Page<>();
if (!CollectionUtils.isEmpty(page.getContent())) {
List<AppPermissionRoleListResult> list = new ArrayList<>();
for (AppPermissionRoleEntity user : page.getContent()) {
for (PermissionRoleEntity user : page.getContent()) {
list.add(entityConvertToRolePaginationResult(user));
}
//@formatter:off
@ -75,16 +75,16 @@ public interface AppPermissionRoleConverter {
/**
* 角色实体转换为角色分页结果
*
* @param page {@link AppPermissionRoleEntity}
* @param page {@link PermissionRoleEntity}
* @return {@link AppPermissionRoleListResult}
*/
AppPermissionRoleListResult entityConvertToRolePaginationResult(AppPermissionRoleEntity page);
AppPermissionRoleListResult entityConvertToRolePaginationResult(PermissionRoleEntity page);
/**
* 角色创建参数转换为角色实体
*
* @param param {@link AppPermissionRoleCreateParam}
* @return {@link AppPermissionRoleEntity}
* @return {@link PermissionRoleEntity}
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "id", ignore = true)
@ -93,13 +93,13 @@ public interface AppPermissionRoleConverter {
@Mapping(target = "updateBy", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionRoleEntity roleCreateParamConvertToEntity(AppPermissionRoleCreateParam param);
PermissionRoleEntity roleCreateParamConvertToEntity(AppPermissionRoleCreateParam param);
/**
* 角色更新参数转换为角色实体类
*
* @param param {@link PermissionRoleUpdateParam} 更新参数
* @return {@link AppPermissionRoleEntity} 角色实体
* @return {@link PermissionRoleEntity} 角色实体
*/
@Mapping(target = "deleted", ignore = true)
@Mapping(target = "appId", ignore = true)
@ -108,21 +108,21 @@ public interface AppPermissionRoleConverter {
@Mapping(target = "updateBy", ignore = true)
@Mapping(target = "createTime", ignore = true)
@Mapping(target = "createBy", ignore = true)
AppPermissionRoleEntity roleUpdateParamConvertToEntity(PermissionRoleUpdateParam param);
PermissionRoleEntity roleUpdateParamConvertToEntity(PermissionRoleUpdateParam param);
/**
* 实体转系统详情结果
*
* @param role {@link AppPermissionRoleEntity}
* @param role {@link PermissionRoleEntity}
* @return {@link AppPermissionRoleResult}
*/
AppPermissionRoleResult entityConvertToRoleDetailResult(AppPermissionRoleEntity role);
AppPermissionRoleResult entityConvertToRoleDetailResult(PermissionRoleEntity role);
/**
* 角色分页查询参数转实体
*
* @param query {@link AppPermissionRoleListQuery}
* @return {@link AppPermissionRoleEntity}
* @return {@link PermissionRoleEntity}
*/
default Predicate rolePaginationParamConvertToPredicate(AppPermissionRoleListQuery query) {
QAppPermissionRoleEntity role = QAppPermissionRoleEntity.appPermissionRoleEntity;

12
eiam-openapi/src/main/java/cn/topiam/employee/openapi/endpoint/permission/AppPermissionPolicyEndpoint.java
View File

@ -17,12 +17,12 @@
*/
package cn.topiam.employee.openapi.endpoint.permission;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
import cn.topiam.employee.openapi.service.AppPermissionPolicyService;
import cn.topiam.employee.support.repository.page.domain.Page;
@ -48,15 +48,15 @@ public class AppPermissionPolicyEndpoint {
* 获取所有策略（分页）
*
* @param page {@link PageModel}
* @return {@link AppPermissionPolicyPO}
* @return {@link PermissionPolicyPO}
*/
@Operation(summary = "获取策略列表")
@GetMapping(value = "/list")
public ApiRestResult<Page<AppPermissionPolicyPO>> getPermissionPolicyList(PageModel page,
@Validated OpenApiPolicyQuery query) {
Page<AppPermissionPolicyPO> result = permissionPolicyService.getPermissionPolicyList(page,
public ApiRestResult<Page<PermissionPolicyPO>> getPermissionPolicyList(PageModel page,
@Validated OpenApiPolicyQuery query) {
Page<PermissionPolicyPO> result = permissionPolicyService.getPermissionPolicyList(page,
query);
return ApiRestResult.<Page<AppPermissionPolicyPO>> builder().result(result).build();
return ApiRestResult.<Page<PermissionPolicyPO>> builder().result(result).build();
}
private final AppPermissionPolicyService permissionPolicyService;

6
eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/AppPermissionPolicyService.java
View File

@ -17,7 +17,7 @@
*/
package cn.topiam.employee.openapi.service;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionPolicyCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionPolicyUpdateParam;
@ -39,9 +39,9 @@ public interface AppPermissionPolicyService {
*
* @param page {@link PageModel}
* @param query {@link OpenApiPolicyQuery}
* @return {@link AppPermissionPolicyPO}
* @return {@link PermissionPolicyPO}
*/
Page<AppPermissionPolicyPO> getPermissionPolicyList(PageModel page, OpenApiPolicyQuery query);
Page<PermissionPolicyPO> getPermissionPolicyList(PageModel page, OpenApiPolicyQuery query);
/**
* 获取资源

22
eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/AppPermissionPolicyServiceImpl.java
View File

@ -17,16 +17,16 @@
*/
package cn.topiam.employee.openapi.service.impl;
import cn.topiam.employee.common.entity.permission.po.PermissionPolicyPO;
import org.springframework.data.querydsl.QPageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
import cn.topiam.employee.common.entity.permission.AppPermissionPolicyEntity;
import cn.topiam.employee.common.entity.permission.po.AppPermissionPolicyPO;
import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
import cn.topiam.employee.common.exception.app.AppPolicyNotExistException;
import cn.topiam.employee.common.repository.permission.AppPermissionPolicyRepository;
import cn.topiam.employee.openapi.converter.app.AppPermissionPolicyConverter;
import cn.topiam.employee.openapi.converter.app.PermissionPolicyConverter;
import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionPolicyCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionPolicyUpdateParam;
@ -54,11 +54,11 @@ public class AppPermissionPolicyServiceImpl implements AppPermissionPolicyServic
*
* @param page {@link PageModel}
* @param query {@link OpenApiPolicyQuery}
* @return {@link AppPermissionPolicyPO}
* @return {@link PermissionPolicyPO}
*/
@Override
public Page<AppPermissionPolicyPO> getPermissionPolicyList(PageModel page,
OpenApiPolicyQuery query) {
public Page<PermissionPolicyPO> getPermissionPolicyList(PageModel page,
OpenApiPolicyQuery query) {
AppPolicyQuery appPolicyQuery = new AppPolicyQuery();
// TODO token获取所属应用
// appPolicyQuery.setAppId(0L);
@ -68,9 +68,9 @@ public class AppPermissionPolicyServiceImpl implements AppPermissionPolicyServic
appPolicyQuery.setSubjectType(query.getSubjectType());
appPolicyQuery.setObjectType(query.getObjectType());
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
org.springframework.data.domain.Page<AppPermissionPolicyPO> data = appPermissionPolicyRepository
org.springframework.data.domain.Page<PermissionPolicyPO> data = appPermissionPolicyRepository
.findPage(appPolicyQuery, request);
return appPermissionPolicyConverter.entityConvertToPolicyListResult(data);
return permissionPolicyConverter.entityConvertToPolicyListResult(data);
}
/**
@ -108,7 +108,7 @@ public class AppPermissionPolicyServiceImpl implements AppPermissionPolicyServic
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean createPermissionPolicy(AppPermissionPolicyCreateParam param) {
AppPermissionPolicyEntity resource = appPermissionPolicyConverter
PermissionPolicyEntity resource = permissionPolicyConverter
.policyCreateParamConvertToEntity(param);
// 新增策略
appPermissionPolicyRepository.save(resource);
@ -123,14 +123,14 @@ public class AppPermissionPolicyServiceImpl implements AppPermissionPolicyServic
*/
@Override
public Boolean updatePermissionPolicy(AppPermissionPolicyUpdateParam param) {
AppPermissionPolicyEntity resource = appPermissionPolicyConverter
PermissionPolicyEntity resource = permissionPolicyConverter
.policyUpdateParamConvertToEntity(param);
// 更新策略
appPermissionPolicyRepository.save(resource);
return null;
}
private final AppPermissionPolicyConverter appPermissionPolicyConverter;
private final PermissionPolicyConverter permissionPolicyConverter;
private final AppPermissionPolicyRepository appPermissionPolicyRepository;
}

44
eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/AppPermissionResourceServiceImpl.java
View File

@ -23,6 +23,9 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import cn.topiam.employee.openapi.converter.app.PermissionResourceConverter;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.querydsl.QPageRequest;
import org.springframework.stereotype.Service;
@ -32,14 +35,11 @@ import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import cn.topiam.employee.common.entity.app.QAppPermissionResourceEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionActionEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionResourceEntity;
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.AppPermissionPolicyRepository;
import cn.topiam.employee.common.repository.permission.AppPermissionResourceRepository;
import cn.topiam.employee.openapi.converter.app.AppPermissionResourceConverter;
import cn.topiam.employee.openapi.pojo.request.app.AppPermissionsActionParam;
import cn.topiam.employee.openapi.pojo.request.app.query.AppResourceListQuery;
import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
@ -75,12 +75,12 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
@Override
public Page<AppPermissionResourceListResult> getPermissionResourceList(PageModel page,
AppResourceListQuery query) {
org.springframework.data.domain.Page<AppPermissionResourceEntity> data;
Predicate predicate = appPermissionResourceConverter
org.springframework.data.domain.Page<PermissionResourceEntity> data;
Predicate predicate = permissionResourceConverter
.resourcePaginationParamConvertToPredicate(query);
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
data = appResourceRepository.findAll(predicate, request);
return appPermissionResourceConverter.entityConvertToResourceListResult(data);
return permissionResourceConverter.entityConvertToResourceListResult(data);
}
/**
@ -91,9 +91,9 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
*/
@Override
public AppPermissionResourceGetResult getPermissionResource(String id) {
AppPermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
PermissionResourceEntity resource = appResourceRepository.findById(Long.valueOf(id))
.orElseThrow(AppResourceNotExistException::new);
return appPermissionResourceConverter.entityConvertToResourceGetResult(resource);
return permissionResourceConverter.entityConvertToResourceGetResult(resource);
}
/**
@ -106,12 +106,12 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
@Transactional(rollbackFor = Exception.class)
public Boolean deletePermissionResource(String id) {
Long resourceId = Long.valueOf(id);
AppPermissionResourceEntity resource = appResourceRepository.findById(resourceId)
PermissionResourceEntity resource = appResourceRepository.findById(resourceId)
.orElseThrow(AppResourceNotExistException::new);
List<AppPermissionActionEntity> actionList = appPermissionActionRepository
List<PermissionActionEntity> actionList = appPermissionActionRepository
.findAllByResource(resource);
List<Long> objectIdList = new ArrayList<>(
actionList.stream().map(AppPermissionActionEntity::getId).toList());
actionList.stream().map(PermissionActionEntity::getId).toList());
objectIdList.add(resourceId);
appPermissionPolicyRepository.deleteAllByObjectIdIn(objectIdList);
appResourceRepository.deleteById(resourceId);
@ -127,7 +127,7 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean createPermissionResource(AppPermissionResourceCreateParam param) {
AppPermissionResourceEntity resource = appPermissionResourceConverter
PermissionResourceEntity resource = permissionResourceConverter
.resourceCreateParamConvertToEntity(param);
buildActions(param.getActions(), resource);
// 新增资源
@ -144,19 +144,19 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updatePermissionResource(AppPermissionResourceUpdateParam param) {
AppPermissionResourceEntity resource = appPermissionResourceConverter
PermissionResourceEntity resource = permissionResourceConverter
.resourceUpdateParamConvertToEntity(param);
buildActions(param.getActions(), resource);
// 查询资源下所有权限
List<AppPermissionActionEntity> actionList = appPermissionActionRepository
List<PermissionActionEntity> actionList = appPermissionActionRepository
.findAllByResource(resource);
// 取出未删除的权限id
Set<Long> reservedSet = resource.getActions().stream().map(AppPermissionActionEntity::getId)
Set<Long> reservedSet = resource.getActions().stream().map(PermissionActionEntity::getId)
.collect(Collectors.toSet());
// 过滤要删除的权限id
List<Long> removeActions = actionList.stream()
.filter(item -> reservedSet.contains(item.getId()))
.map(AppPermissionActionEntity::getId).toList();
.map(PermissionActionEntity::getId).toList();
appPermissionPolicyRepository.deleteAllByObjectIdIn(removeActions);
// 更新资源
appResourceRepository.save(resource);
@ -177,7 +177,7 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
public Boolean permissionResourceParamCheck(CheckValidityType type, String value, Long appId,
Long id) {
QAppPermissionResourceEntity role = QAppPermissionResourceEntity.appPermissionResourceEntity;
AppPermissionResourceEntity entity = new AppPermissionResourceEntity();
PermissionResourceEntity entity = new PermissionResourceEntity();
boolean result = false;
// ID存在说明是修改操作，查询一下当前数据
if (Objects.nonNull(id)) {
@ -209,14 +209,14 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
* 批量处理actions
*
* @param permissions {@link List<AppPermissionsActionParam>}
* @param resource {@link AppPermissionResourceEntity>}
* @param resource {@link PermissionResourceEntity >}
*/
private void buildActions(List<AppPermissionsActionParam> permissions,
AppPermissionResourceEntity resource) {
PermissionResourceEntity resource) {
// 权限
List<AppPermissionActionEntity> list = new ArrayList<>();
List<PermissionActionEntity> list = new ArrayList<>();
for (AppPermissionsActionParam p : permissions) {
AppPermissionActionEntity entity = new AppPermissionActionEntity();
PermissionActionEntity entity = new PermissionActionEntity();
entity.setResource(resource);
entity.setType(p.getType());
entity.setName(p.getName());
@ -227,7 +227,7 @@ public class AppPermissionResourceServiceImpl implements AppPermissionResourceSe
resource.setActions(list);
}
private final AppPermissionResourceConverter appPermissionResourceConverter;
private final PermissionResourceConverter permissionResourceConverter;
private final AppPermissionResourceRepository appResourceRepository;
/**

24
eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/impl/AppPermissionRoleServiceImpl.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.querydsl.QPageRequest;
import org.springframework.stereotype.Service;
@ -31,12 +32,11 @@ import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import cn.topiam.employee.common.entity.app.QAppPermissionRoleEntity;
import cn.topiam.employee.common.entity.permission.AppPermissionRoleEntity;
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.AppPermissionRoleRepository;
import cn.topiam.employee.openapi.converter.app.AppPermissionRoleConverter;
import cn.topiam.employee.openapi.converter.app.PermissionRoleConverter;
import cn.topiam.employee.openapi.pojo.request.app.query.AppPermissionRoleListQuery;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionRoleCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.PermissionRoleUpdateParam;
@ -72,12 +72,12 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
@Override
public Page<AppPermissionRoleListResult> getPermissionRoleList(PageModel page,
AppPermissionRoleListQuery query) {
org.springframework.data.domain.Page<AppPermissionRoleEntity> data;
Predicate predicate = appPermissionRoleConverter
org.springframework.data.domain.Page<PermissionRoleEntity> data;
Predicate predicate = permissionRoleConverter
.rolePaginationParamConvertToPredicate(query);
QPageRequest request = QPageRequest.of(page.getCurrent(), page.getPageSize());
data = appPermissionRoleRepository.findAll(predicate, request);
return appPermissionRoleConverter.entityConvertToRolePaginationResult(data);
return permissionRoleConverter.entityConvertToRolePaginationResult(data);
}
/**
@ -88,7 +88,7 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
*/
@Override
public boolean createPermissionRole(AppPermissionRoleCreateParam param) {
AppPermissionRoleEntity entity = appPermissionRoleConverter
PermissionRoleEntity entity = permissionRoleConverter
.roleCreateParamConvertToEntity(param);
appPermissionRoleRepository.save(entity);
return true;
@ -100,9 +100,9 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
*/
@Override
public boolean updatePermissionRole(PermissionRoleUpdateParam param) {
AppPermissionRoleEntity source = appPermissionRoleConverter
PermissionRoleEntity source = permissionRoleConverter
.roleUpdateParamConvertToEntity(param);
AppPermissionRoleEntity target = appPermissionRoleRepository
PermissionRoleEntity target = appPermissionRoleRepository
.findById(Long.valueOf(param.getId())).orElseThrow(AppRoleNotExistException::new);
BeanUtils.merge(source, target, LAST_MODIFIED_TIME, LAST_MODIFIED_BY);
appPermissionRoleRepository.save(target);
@ -136,9 +136,9 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
@Override
public AppPermissionRoleResult getPermissionRole(Long id) {
//查询
Optional<AppPermissionRoleEntity> entity = appPermissionRoleRepository.findById(id);
Optional<PermissionRoleEntity> entity = appPermissionRoleRepository.findById(id);
//映射
return appPermissionRoleConverter.entityConvertToRoleDetailResult(entity.orElse(null));
return permissionRoleConverter.entityConvertToRoleDetailResult(entity.orElse(null));
}
/**
@ -155,7 +155,7 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
public Boolean permissionRoleParamCheck(CheckValidityType type, String value, Long appId,
Long id) {
QAppPermissionRoleEntity role = QAppPermissionRoleEntity.appPermissionRoleEntity;
AppPermissionRoleEntity entity = new AppPermissionRoleEntity();
PermissionRoleEntity entity = new PermissionRoleEntity();
boolean result = false;
// ID存在说明是修改操作，查询一下当前数据
if (Objects.nonNull(id)) {
@ -199,7 +199,7 @@ public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
/**
* 用户数据映射器
*/
private final AppPermissionRoleConverter appPermissionRoleConverter;
private final PermissionRoleConverter permissionRoleConverter;
/**
* RoleRepository
*/

45
eiam-openapi/target/generated-sources/annotations/cn/topiam/employee/openapi/converter/app/PermissionActionConverterImpl.java Normal file
View File

@ -0,0 +1,45 @@
package cn.topiam.employee.openapi.converter.app;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.openapi.pojo.request.app.AppPermissionsActionParam;
import javax.annotation.processing.Generated;
import org.springframework.stereotype.Component;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-09-18T13:28:50+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.8 (Azul Systems, Inc.)"
)
@Component
public class PermissionActionConverterImpl implements PermissionActionConverter {
@Override
public PermissionActionEntity toEntity(AppPermissionsActionParam dto) {
if ( dto == null ) {
return null;
}
PermissionActionEntity permissionActionEntity = new PermissionActionEntity();
permissionActionEntity.setValue( dto.getValue() );
permissionActionEntity.setName( dto.getName() );
permissionActionEntity.setType( dto.getType() );
return permissionActionEntity;
}
@Override
public AppPermissionsActionParam toDTO(PermissionActionEntity entities) {
if ( entities == null ) {
return null;
}
AppPermissionsActionParam appPermissionsActionParam = new AppPermissionsActionParam();
appPermissionsActionParam.setType( entities.getType() );
appPermissionsActionParam.setValue( entities.getValue() );
appPermissionsActionParam.setName( entities.getName() );
return appPermissionsActionParam;
}
}

53
eiam-openapi/target/generated-sources/annotations/cn/topiam/employee/openapi/converter/app/PermissionPolicyConverterImpl.java Normal file
View File

@ -0,0 +1,53 @@
package cn.topiam.employee.openapi.converter.app;
import cn.topiam.employee.common.entity.permission.PermissionPolicyEntity;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionPolicyCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionPolicyUpdateParam;
import javax.annotation.processing.Generated;
import org.springframework.stereotype.Component;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-09-18T13:28:50+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.8 (Azul Systems, Inc.)"
)
@Component
public class PermissionPolicyConverterImpl implements PermissionPolicyConverter {
@Override
public PermissionPolicyEntity policyCreateParamConvertToEntity(AppPermissionPolicyCreateParam param) {
if ( param == null ) {
return null;
}
PermissionPolicyEntity permissionPolicyEntity = new PermissionPolicyEntity();
permissionPolicyEntity.setAppId( param.getAppId() );
permissionPolicyEntity.setSubjectId( param.getSubjectId() );
permissionPolicyEntity.setSubjectType( param.getSubjectType() );
permissionPolicyEntity.setObjectId( param.getObjectId() );
permissionPolicyEntity.setObjectType( param.getObjectType() );
permissionPolicyEntity.setEffect( param.getEffect() );
return permissionPolicyEntity;
}
@Override
public PermissionPolicyEntity policyUpdateParamConvertToEntity(AppPermissionPolicyUpdateParam param) {
if ( param == null ) {
return null;
}
PermissionPolicyEntity permissionPolicyEntity = new PermissionPolicyEntity();
permissionPolicyEntity.setId( param.getId() );
permissionPolicyEntity.setAppId( param.getAppId() );
permissionPolicyEntity.setSubjectId( param.getSubjectId() );
permissionPolicyEntity.setSubjectType( param.getSubjectType() );
permissionPolicyEntity.setObjectId( param.getObjectId() );
permissionPolicyEntity.setObjectType( param.getObjectType() );
permissionPolicyEntity.setEffect( param.getEffect() );
return permissionPolicyEntity;
}
}

125
eiam-openapi/target/generated-sources/annotations/cn/topiam/employee/openapi/converter/app/PermissionResourceConverterImpl.java Normal file
View File

@ -0,0 +1,125 @@
package cn.topiam.employee.openapi.converter.app;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import cn.topiam.employee.common.entity.permission.PermissionResourceEntity;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionResourceCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionResourceUpdateParam;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionResourceGetResult;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionResourceListResult;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.processing.Generated;
import org.springframework.stereotype.Component;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-09-18T13:44:04+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.8 (Azul Systems, Inc.)"
)
@Component
public class PermissionResourceConverterImpl implements PermissionResourceConverter {
@Override
public PermissionResourceEntity resourceCreateParamConvertToEntity(AppPermissionResourceCreateParam param) {
if ( param == null ) {
return null;
}
PermissionResourceEntity permissionResourceEntity = new PermissionResourceEntity();
permissionResourceEntity.setCode( param.getCode() );
permissionResourceEntity.setName( param.getName() );
permissionResourceEntity.setAppId( param.getAppId() );
permissionResourceEntity.setDesc( param.getDesc() );
permissionResourceEntity.setEnabled( param.getEnabled() );
return permissionResourceEntity;
}
@Override
public PermissionResourceEntity resourceUpdateParamConvertToEntity(AppPermissionResourceUpdateParam param) {
if ( param == null ) {
return null;
}
PermissionResourceEntity permissionResourceEntity = new PermissionResourceEntity();
if ( param.getId() != null ) {
permissionResourceEntity.setId( Long.parseLong( param.getId() ) );
}
permissionResourceEntity.setName( param.getName() );
permissionResourceEntity.setDesc( param.getDesc() );
permissionResourceEntity.setEnabled( Boolean.TRUE );
return permissionResourceEntity;
}
@Override
public AppPermissionResourceListResult entityConvertToResourceListResult(PermissionResourceEntity data) {
if ( data == null ) {
return null;
}
AppPermissionResourceListResult appPermissionResourceListResult = new AppPermissionResourceListResult();
if ( data.getId() != null ) {
appPermissionResourceListResult.setId( String.valueOf( data.getId() ) );
}
appPermissionResourceListResult.setName( data.getName() );
appPermissionResourceListResult.setCode( data.getCode() );
if ( data.getAppId() != null ) {
appPermissionResourceListResult.setAppId( String.valueOf( data.getAppId() ) );
}
appPermissionResourceListResult.setDesc( data.getDesc() );
return appPermissionResourceListResult;
}
@Override
public AppPermissionResourceGetResult entityConvertToResourceGetResult(PermissionResourceEntity resource) {
if ( resource == null ) {
return null;
}
AppPermissionResourceGetResult appPermissionResourceGetResult = new AppPermissionResourceGetResult();
appPermissionResourceGetResult.setActions( appPermissionActionEntityListToAppPermissionsActionList( resource.getActions() ) );
appPermissionResourceGetResult.setName( resource.getName() );
appPermissionResourceGetResult.setCode( resource.getCode() );
appPermissionResourceGetResult.setDesc( resource.getDesc() );
appPermissionResourceGetResult.setAppId( resource.getAppId() );
return appPermissionResourceGetResult;
}
protected AppPermissionResourceGetResult.AppPermissionsAction appPermissionActionEntityToAppPermissionsAction(PermissionActionEntity permissionActionEntity) {
if ( permissionActionEntity == null ) {
return null;
}
AppPermissionResourceGetResult.AppPermissionsAction appPermissionsAction = new AppPermissionResourceGetResult.AppPermissionsAction();
if ( permissionActionEntity.getId() != null ) {
appPermissionsAction.setId( String.valueOf( permissionActionEntity.getId() ) );
}
appPermissionsAction.setType( permissionActionEntity.getType() );
appPermissionsAction.setValue( permissionActionEntity.getValue() );
appPermissionsAction.setName( permissionActionEntity.getName() );
return appPermissionsAction;
}
protected List<AppPermissionResourceGetResult.AppPermissionsAction> appPermissionActionEntityListToAppPermissionsActionList(List<PermissionActionEntity> list) {
if ( list == null ) {
return null;
}
List<AppPermissionResourceGetResult.AppPermissionsAction> list1 = new ArrayList<AppPermissionResourceGetResult.AppPermissionsAction>( list.size() );
for ( PermissionActionEntity permissionActionEntity : list ) {
list1.add( appPermissionActionEntityToAppPermissionsAction(permissionActionEntity) );
}
return list1;
}
}

98
eiam-openapi/target/generated-sources/annotations/cn/topiam/employee/openapi/converter/app/PermissionRoleConverterImpl.java Normal file
View File

@ -0,0 +1,98 @@
package cn.topiam.employee.openapi.converter.app;
import cn.topiam.employee.common.entity.permission.PermissionRoleEntity;
import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionRoleCreateParam;
import cn.topiam.employee.openapi.pojo.request.app.update.PermissionRoleUpdateParam;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionRoleListResult;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionRoleResult;
import javax.annotation.processing.Generated;
import org.springframework.stereotype.Component;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-09-18T13:44:04+0800",
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.8 (Azul Systems, Inc.)"
)
@Component
public class PermissionRoleConverterImpl implements PermissionRoleConverter {
@Override
public AppPermissionRoleListResult entityConvertToRolePaginationResult(PermissionRoleEntity page) {
if ( page == null ) {
return null;
}
AppPermissionRoleListResult appPermissionRoleListResult = new AppPermissionRoleListResult();
if ( page.getId() != null ) {
appPermissionRoleListResult.setId( String.valueOf( page.getId() ) );
}
appPermissionRoleListResult.setName( page.getName() );
appPermissionRoleListResult.setCode( page.getCode() );
if ( page.getAppId() != null ) {
appPermissionRoleListResult.setAppId( String.valueOf( page.getAppId() ) );
}
appPermissionRoleListResult.setEnabled( page.getEnabled() );
appPermissionRoleListResult.setRemark( page.getRemark() );
return appPermissionRoleListResult;
}
@Override
public PermissionRoleEntity roleCreateParamConvertToEntity(AppPermissionRoleCreateParam param) {
if ( param == null ) {
return null;
}
PermissionRoleEntity permissionRoleEntity = new PermissionRoleEntity();
permissionRoleEntity.setRemark( param.getRemark() );
permissionRoleEntity.setName( param.getName() );
permissionRoleEntity.setCode( param.getCode() );
permissionRoleEntity.setAppId( param.getAppId() );
permissionRoleEntity.setEnabled( Boolean.TRUE );
return permissionRoleEntity;
}
@Override
public PermissionRoleEntity roleUpdateParamConvertToEntity(PermissionRoleUpdateParam param) {
if ( param == null ) {
return null;
}
PermissionRoleEntity permissionRoleEntity = new PermissionRoleEntity();
if ( param.getId() != null ) {
permissionRoleEntity.setId( Long.parseLong( param.getId() ) );
}
permissionRoleEntity.setRemark( param.getRemark() );
permissionRoleEntity.setName( param.getName() );
permissionRoleEntity.setCode( param.getCode() );
return permissionRoleEntity;
}
@Override
public AppPermissionRoleResult entityConvertToRoleDetailResult(PermissionRoleEntity role) {
if ( role == null ) {
return null;
}
AppPermissionRoleResult appPermissionRoleResult = new AppPermissionRoleResult();
if ( role.getId() != null ) {
appPermissionRoleResult.setId( String.valueOf( role.getId() ) );
}
if ( role.getAppId() != null ) {
appPermissionRoleResult.setAppId( String.valueOf( role.getAppId() ) );
}
appPermissionRoleResult.setName( role.getName() );
appPermissionRoleResult.setCode( role.getCode() );
appPermissionRoleResult.setEnabled( role.getEnabled() );
appPermissionRoleResult.setRemark( role.getRemark() );
return appPermissionRoleResult;
}
}