msb_6557
/
opsli-boot
mirror of https://github.com/hiparker/opsli-boot.git
1
1
Code Issues Projects Releases Wiki Activity

perf: 代码优化

Browse Source
pull/9/head
Carina 4 years ago
parent 0812c9f143
commit 9ce8a166ea
3 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File

55
opsli-base-support/opsli-core/src/main/java/org/opsli/core/base/service/impl/CrudServiceImpl.java
Unescape View File

@ -34,6 +34,7 @@ import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
import org.opsli.core.persistence.querybuilder.QueryBuilder;
import org.opsli.core.persistence.querybuilder.chain.QueryDataPermsHandler;
import org.opsli.core.persistence.querybuilder.chain.QueryTenantHandler;
import org.opsli.core.persistence.querybuilder.conf.WebQueryConf;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
@ -212,23 +213,17 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
@Override
public List<T> findList(QueryWrapper<T> queryWrapper) {
// 数据处理责任链
queryWrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, queryWrapper);
QueryWrapper<T> qWrapper = this.addHandler(entityClazz, queryWrapper);
return super.list(queryWrapper);
return super.list(qWrapper);
}
@Override
public List<T> findAllList() {
QueryBuilder<T> queryBuilder = new GenQueryBuilder<>();
QueryWrapper<T> queryWrapper = queryBuilder.build();
// 数据处理责任链
queryWrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, queryWrapper);
QueryWrapper<T> qWrapper = this.addHandler(entityClazz);
return super.list(queryWrapper);
return super.list(qWrapper);
}
@Override
@ -300,6 +295,46 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
return WrapperUtil.transformInstance(models, entityClazz);
}
/**
* 增加处理器
* @param qClass 处理对象Class
* @param <Q> 泛型
* @return 查询对象包装器
*/
protected <Q extends BaseEntity> QueryWrapper<Q> addHandler(Class<Q> qClass){
QueryWrapper<Q> qQueryWrapper = new QueryWrapper<>();
return addHandler(qClass, qQueryWrapper);
}
/**
* 增加处理器
* @param qClass 处理对象Class
* @param qQueryWrapper 查询对象包装器
* @param <Q> 泛型
* @return 查询对象包装器
*/
protected <Q extends BaseEntity> QueryWrapper<Q> addHandler(Class<Q> qClass, QueryWrapper<Q> qQueryWrapper){
// 数据处理责任链
return new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(qClass, qQueryWrapper);
}
/**
* 增加处理器
* @param qClass 处理对象Class
* @param qQueryWrapper 查询对象包装器
* @param <Q> 泛型
* @return 查询对象包装器
*/
protected <Q extends BaseEntity> QueryWrapper<Q> addHandler(Class<Q> qClass,
WebQueryConf conf,
QueryWrapper<Q> qQueryWrapper){
// 数据处理责任链
return new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(qClass, conf, qQueryWrapper);
}
// ======================== 初始化 ========================

14
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleServiceImpl.java
Unescape View File

@ -17,21 +17,15 @@ package org.opsli.modulars.system.role.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.opsli.api.wrapper.system.role.RoleModel;
import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.constants.MyBatisConstants;
import org.opsli.common.exception.ServiceException;
import org.opsli.common.utils.FieldUtil;
import org.opsli.core.base.service.impl.CrudServiceImpl;
import org.opsli.core.msg.CoreMsg;
import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
import org.opsli.core.persistence.querybuilder.QueryBuilder;
import org.opsli.core.persistence.querybuilder.chain.QueryDataPermsHandler;
import org.opsli.core.persistence.querybuilder.chain.QueryTenantHandler;
import org.opsli.core.utils.UserUtil;
import org.opsli.modulars.system.SystemMsg;
import org.opsli.modulars.system.role.entity.SysRole;
@ -205,9 +199,7 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
}else {
// 租户检测
// 数据处理责任链
wrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, wrapper);
wrapper = super.addHandler(entityClazz, wrapper);
}
return super.count(wrapper) == 0;
@ -240,9 +232,7 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
}else {
// 租户检测
// 数据处理责任链
wrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, wrapper);
wrapper = super.addHandler(entityClazz, wrapper);
}
return super.count(wrapper) == 0;

25
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java
Unescape View File

@ -16,7 +16,6 @@
package org.opsli.modulars.system.user.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -24,10 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.warpper.ApiWrapper;
import org.opsli.api.wrapper.system.menu.MenuModel;
import org.opsli.api.wrapper.system.options.OptionsModel;
import org.opsli.api.wrapper.system.role.RoleModel;
import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.api.wrapper.system.user.UserPassword;
import org.opsli.api.wrapper.system.user.UserRoleRefModel;
@ -37,19 +33,15 @@ import org.opsli.common.enums.DictType;
import org.opsli.common.exception.ServiceException;
import org.opsli.common.utils.CheckStrength;
import org.opsli.common.utils.FieldUtil;
import org.opsli.common.utils.ListDistinctUtil;
import org.opsli.common.utils.WrapperUtil;
import org.opsli.core.base.service.impl.CrudServiceImpl;
import org.opsli.core.msg.CoreMsg;
import org.opsli.core.persistence.Page;
import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
import org.opsli.core.persistence.querybuilder.QueryBuilder;
import org.opsli.core.persistence.querybuilder.chain.QueryDataPermsHandler;
import org.opsli.core.persistence.querybuilder.chain.QueryTenantHandler;
import org.opsli.core.utils.OptionsUtil;
import org.opsli.core.utils.UserUtil;
import org.opsli.modulars.system.SystemMsg;
import org.opsli.modulars.system.menu.entity.SysMenu;
import org.opsli.modulars.system.menu.service.IMenuService;
import org.opsli.modulars.system.role.entity.SysRole;
import org.opsli.modulars.system.role.service.IRoleService;
@ -64,7 +56,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@ -457,9 +448,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
// 如果没有租户修改能力 则默认增加租户限制
if(!UserUtil.isHasUpdateTenantPerms(UserUtil.getUser())){
// 数据处理责任链
queryWrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, queryWrapper);
queryWrapper = super.addHandler(entityClazz, queryWrapper);
}
return super.list(queryWrapper);
@ -472,9 +461,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
// 如果没有租户修改能力 则默认增加租户限制
if(!UserUtil.isHasUpdateTenantPerms(UserUtil.getUser())){
// 数据处理责任链
queryWrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, queryWrapper);
queryWrapper = super.addHandler(entityClazz, queryWrapper);
}
return super.list(queryWrapper);
}
@ -606,9 +593,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
// 如果没有租户修改能力 则默认增加租户限制
if(!UserUtil.isHasUpdateTenantPerms(UserUtil.getUser())){
// 数据处理责任链
queryWrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(SysUserWeb.class, queryWrapper);
queryWrapper = super.addHandler(SysUserWeb.class, queryWrapper);
}
@ -671,9 +656,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
// 租户检测
// 数据处理责任链
wrapper = new QueryTenantHandler(
new QueryDataPermsHandler()
).handler(entityClazz, wrapper);
wrapper = super.addHandler(entityClazz, wrapper);
return super.count(wrapper) == 0;
}

Write Preview
Loading…
Cancel
Save