优化代码

pull/54/head^2
smallbun 2023-09-18 23:43:49 +08:00
parent 54ac2665ce
commit dfd899914d
19 changed files with 30 additions and 351 deletions

View File

@ -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.openapi.converter.app;
package cn.topiam.employee.openapi.converter.permission;
import cn.topiam.employee.common.entity.permission.PermissionActionEntity;
import org.mapstruct.Mapper;

View File

@ -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.openapi.converter.app;
package cn.topiam.employee.openapi.converter.permission;
import java.util.List;

View File

@ -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.openapi.converter.app;
package cn.topiam.employee.openapi.converter.permission;
import java.util.ArrayList;
import java.util.List;

View File

@ -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.openapi.converter.app;
package cn.topiam.employee.openapi.converter.permission;
import java.util.ArrayList;
import java.util.List;

View File

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.topiam.employee.openapi.pojo.request.app.query.OpenApiPolicyQuery;
import cn.topiam.employee.openapi.service.AppPermissionPolicyService;
import cn.topiam.employee.openapi.service.PermissionPolicyService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
import cn.topiam.employee.support.result.ApiRestResult;
@ -43,7 +43,7 @@ import static cn.topiam.employee.openapi.constants.OpenApiV1Constants.OPEN_API_P
@RestController
@RequestMapping(value = OPEN_API_PERMISSION_PATH + "/policy")
@RequiredArgsConstructor
public class AppPermissionPolicyEndpoint {
public class PermissionPolicyEndpoint {
/**
*
*
@ -59,5 +59,5 @@ public class AppPermissionPolicyEndpoint {
return ApiRestResult.<Page<PermissionPolicyPO>> builder().result(result).build();
}
private final AppPermissionPolicyService permissionPolicyService;
private final PermissionPolicyService permissionPolicyService;
}

View File

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
import cn.topiam.employee.openapi.pojo.request.app.query.AppResourceListQuery;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionResourceListResult;
import cn.topiam.employee.openapi.service.AppPermissionResourceService;
import cn.topiam.employee.openapi.service.PermissionResourceService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
import cn.topiam.employee.support.result.ApiRestResult;
@ -43,7 +43,7 @@ import static cn.topiam.employee.openapi.constants.OpenApiV1Constants.OPEN_API_P
@RestController
@RequestMapping(value = OPEN_API_PERMISSION_PATH + "/resource")
@RequiredArgsConstructor
public class AppPermissionResourceEndpoint {
public class PermissionResourceEndpoint {
/**
*
*
@ -54,7 +54,7 @@ public class AppPermissionResourceEndpoint {
@GetMapping(value = "/list")
public ApiRestResult<Page<AppPermissionResourceListResult>> getPermissionResourceList(PageModel page,
@Validated AppResourceListQuery query) {
Page<AppPermissionResourceListResult> result = appPermissionResourceService
Page<AppPermissionResourceListResult> result = permissionResourceService
.getPermissionResourceList(page, query);
return ApiRestResult.<Page<AppPermissionResourceListResult>> builder().result(result)
.build();
@ -68,5 +68,5 @@ public class AppPermissionResourceEndpoint {
/**
*
*/
private final AppPermissionResourceService appPermissionResourceService;
private final PermissionResourceService permissionResourceService;
}

View File

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
import cn.topiam.employee.openapi.pojo.request.app.query.AppPermissionRoleListQuery;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionRoleListResult;
import cn.topiam.employee.openapi.service.AppPermissionRoleService;
import cn.topiam.employee.openapi.service.PermissionRoleService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
import cn.topiam.employee.support.result.ApiRestResult;
@ -43,7 +43,7 @@ import static cn.topiam.employee.openapi.constants.OpenApiV1Constants.OPEN_API_P
@RestController
@RequestMapping(value = OPEN_API_PERMISSION_PATH + "/role")
@RequiredArgsConstructor
public class AppPermissionRoleEndpoint {
public class PermissionRoleEndpoint {
//1、获取应用的所有角色分页
/**
*
@ -55,7 +55,7 @@ public class AppPermissionRoleEndpoint {
@GetMapping(value = "/list")
public ApiRestResult<Page<AppPermissionRoleListResult>> getPermissionRoleList(PageModel page,
@Validated AppPermissionRoleListQuery query) {
Page<AppPermissionRoleListResult> result = appPermissionRoleService
Page<AppPermissionRoleListResult> result = permissionRoleService
.getPermissionRoleList(page, query);
return ApiRestResult.<Page<AppPermissionRoleListResult>> builder().result(result).build();
}
@ -68,5 +68,5 @@ public class AppPermissionRoleEndpoint {
/**
*
*/
private final AppPermissionRoleService appPermissionRoleService;
private final PermissionRoleService permissionRoleService;
}

View File

@ -33,7 +33,7 @@ import cn.topiam.employee.openapi.pojo.response.app.AppPermissionActionListResul
* @author TopIAM
* Created by support@topiam.cn on 2020-08-10
*/
public interface AppPermissionActionService {
public interface PermissionActionService {
/**
*
*

View File

@ -33,7 +33,7 @@ import cn.topiam.employee.support.repository.page.domain.PageModel;
* @author TopIAM
* Created by support@topiam.cn on 2020-08-10
*/
public interface AppPermissionPolicyService {
public interface PermissionPolicyService {
/**
*
*

View File

@ -34,7 +34,7 @@ import cn.topiam.employee.support.repository.page.domain.PageModel;
* @author TopIAM
* Created by support@topiam.cn on 2020-08-10
*/
public interface AppPermissionResourceService {
public interface PermissionResourceService {
/**
*
*

View File

@ -34,7 +34,7 @@ import cn.topiam.employee.support.repository.page.domain.PageModel;
* @author TopIAM
* Created by support@topiam.cn on 2020-08-10
*/
public interface AppPermissionRoleService {
public interface PermissionRoleService {
/**
*

View File

@ -26,7 +26,7 @@ import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionActionCreat
import cn.topiam.employee.openapi.pojo.request.app.update.ResourceActionUpdateParam;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionActionGetResult;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionActionListResult;
import cn.topiam.employee.openapi.service.AppPermissionActionService;
import cn.topiam.employee.openapi.service.PermissionActionService;
import lombok.RequiredArgsConstructor;
@ -40,7 +40,7 @@ import lombok.RequiredArgsConstructor;
*/
@Service
@RequiredArgsConstructor
public class AppPermissionActionServiceImpl implements AppPermissionActionService {
public class PermissionActionServiceImpl implements PermissionActionService {
/**
*

View File

@ -26,12 +26,12 @@ import cn.topiam.employee.common.entity.app.query.AppPolicyQuery;
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.PermissionPolicyConverter;
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;
import cn.topiam.employee.openapi.pojo.request.app.update.AppPermissionPolicyUpdateParam;
import cn.topiam.employee.openapi.pojo.response.app.AppPermissionPolicyGetResult;
import cn.topiam.employee.openapi.service.AppPermissionPolicyService;
import cn.topiam.employee.openapi.service.PermissionPolicyService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
*/
@Service
@RequiredArgsConstructor
public class AppPermissionPolicyServiceImpl implements AppPermissionPolicyService {
public class PermissionPolicyServiceImpl implements PermissionPolicyService {
/**
*

View File

@ -25,7 +25,7 @@ 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 cn.topiam.employee.openapi.converter.permission.PermissionResourceConverter;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.querydsl.QPageRequest;
import org.springframework.stereotype.Service;
@ -47,7 +47,7 @@ import cn.topiam.employee.openapi.pojo.request.app.save.AppPermissionResourceCre
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 cn.topiam.employee.openapi.service.AppPermissionResourceService;
import cn.topiam.employee.openapi.service.PermissionResourceService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
@ -63,7 +63,7 @@ import lombok.RequiredArgsConstructor;
*/
@Service
@RequiredArgsConstructor
public class AppPermissionResourceServiceImpl implements AppPermissionResourceService {
public class PermissionResourceServiceImpl implements PermissionResourceService {
/**
*

View File

@ -36,13 +36,13 @@ 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.PermissionRoleConverter;
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;
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 cn.topiam.employee.openapi.service.AppPermissionRoleService;
import cn.topiam.employee.openapi.service.PermissionRoleService;
import cn.topiam.employee.support.repository.page.domain.Page;
import cn.topiam.employee.support.repository.page.domain.PageModel;
import cn.topiam.employee.support.util.BeanUtils;
@ -61,7 +61,7 @@ import static cn.topiam.employee.support.repository.domain.BaseEntity.LAST_MODIF
*/
@Service
@RequiredArgsConstructor
public class AppPermissionRoleServiceImpl implements AppPermissionRoleService {
public class PermissionRoleServiceImpl implements PermissionRoleService {
/**
*

View File

@ -1,45 +0,0 @@
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;
}
}

View File

@ -1,53 +0,0 @@
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;
}
}

View File

@ -1,125 +0,0 @@
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;
}
}

View File

@ -1,98 +0,0 @@
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;
}
}